From ca765d54dda6114da55ece8d876c042eca3ea870 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Mon, 14 Feb 2022 09:36:51 -0500
Subject: [PATCH] Fix verification scripts for 7.0.0 release (#1830)

* Update release and verify scripts

* fixup

* Fix publish check

* remove python check
---
 dev/release/create-tarball.sh           |  7 -------
 dev/release/verify-release-candidate.sh | 14 +++++---------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/dev/release/create-tarball.sh b/dev/release/create-tarball.sh
index 59214a56cd04..c668ea8708a5 100755
--- a/dev/release/create-tarball.sh
+++ b/dev/release/create-tarball.sh
@@ -125,13 +125,6 @@ gpg --armor --output ${tarball}.asc --detach-sig ${tarball}
 (cd ${distdir} && shasum -a 256 ${tarname}) > ${tarball}.sha256
 (cd ${distdir} && shasum -a 512 ${tarname}) > ${tarball}.sha512
 
-# download python binary releases from Github Action
-python_distdir=${distdir}/python
-echo "Preparing python release artifacts"
-test -d ${python_distdir} || mkdir -p ${python_distdir}
-pushd "${python_distdir}"
-    python ${SOURCE_DIR}/download-python-wheels.py "${tag}"
-popd
 
 echo "Uploading to apache dist/dev to ${url}"
 svn co --depth=empty https://dist.apache.org/repos/dist/dev/arrow ${SOURCE_TOP_DIR}/dev/dist
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index 9a0c9d3d0b4b..8d107b903faf 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -72,7 +72,7 @@ fetch_archive() {
 
 verify_dir_artifact_signatures() {
   # verify the signature and the checksums of each artifact
-  find $1 -name '*.asc' | while read sigfile; do
+  find . -name '*.asc' | while read sigfile; do
     artifact=${sigfile/.asc/}
     gpg --verify $sigfile $artifact || exit 1
 
@@ -135,7 +135,10 @@ test_source_distribution() {
     exit 1
   fi
 
-  pushd datafusion
+
+  # Note can't verify datafusion or datafusion-expr as they depend
+  # on datafusion-common which isn't published yet
+  pushd datafusion-common
     cargo publish --dry-run
   popd
 }
@@ -154,13 +157,6 @@ pushd ${dist_name}
     test_source_distribution
 popd
 
-echo "Verifying python artifacts..."
-svn co $ARROW_DIST_URL/apache-arrow-datafusion-${VERSION}-rc${RC_NUMBER}/python python-artifacts
-pushd python-artifacts
-    verify_dir_artifact_signatures
-    twine check *.{whl,tar.gz}
-popd
-
 TEST_SUCCESS=yes
 echo 'Release candidate looks good!'
 exit 0