You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2024/08/12 07:56:21 UTC
(spark) branch branch-3.4 updated: [SPARK-48204][INFRA][FOLLOW] fix release scripts for the "finalize" step
This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 917c45e2af01 [SPARK-48204][INFRA][FOLLOW] fix release scripts for the "finalize" step
917c45e2af01 is described below
commit 917c45e2af01b385c2123c90607cf1bf90e82b94
Author: Wenchen Fan <we...@databricks.com>
AuthorDate: Mon Jun 3 12:37:24 2024 +0900
[SPARK-48204][INFRA][FOLLOW] fix release scripts for the "finalize" step
Necessary fixes to finalize the spark 4.0 preview release. The major one is that pypi now requires API token instead of username/password for authentication.
release
no
manual
no
Closes #46840 from cloud-fan/script.
Authored-by: Wenchen Fan <we...@databricks.com>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
dev/create-release/do-release-docker.sh | 6 +++---
dev/create-release/release-build.sh | 31 ++++++++++++++++++-------------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/dev/create-release/do-release-docker.sh b/dev/create-release/do-release-docker.sh
index 88398bc14dd0..ea3105b3d0a7 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -84,8 +84,8 @@ if [ ! -z "$RELEASE_STEP" ] && [ "$RELEASE_STEP" = "finalize" ]; then
error "Exiting."
fi
- if [ -z "$PYPI_PASSWORD" ]; then
- stty -echo && printf "PyPi password: " && read PYPI_PASSWORD && printf '\n' && stty echo
+ if [ -z "$PYPI_API_TOKEN" ]; then
+ stty -echo && printf "PyPi API token: " && read PYPI_API_TOKEN && printf '\n' && stty echo
fi
fi
@@ -142,7 +142,7 @@ GIT_NAME=$GIT_NAME
GIT_EMAIL=$GIT_EMAIL
GPG_KEY=$GPG_KEY
ASF_PASSWORD=$ASF_PASSWORD
-PYPI_PASSWORD=$PYPI_PASSWORD
+PYPI_API_TOKEN=$PYPI_API_TOKEN
GPG_PASSPHRASE=$GPG_PASSPHRASE
RELEASE_STEP=$RELEASE_STEP
USER=$USER
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index e0588ae934cd..99841916cf29 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -95,8 +95,8 @@ init_java
init_maven_sbt
if [[ "$1" == "finalize" ]]; then
- if [[ -z "$PYPI_PASSWORD" ]]; then
- error 'The environment variable PYPI_PASSWORD is not set. Exiting.'
+ if [[ -z "$PYPI_API_TOKEN" ]]; then
+ error 'The environment variable PYPI_API_TOKEN is not set. Exiting.'
fi
git config --global user.name "$GIT_NAME"
@@ -104,22 +104,27 @@ if [[ "$1" == "finalize" ]]; then
# Create the git tag for the new release
echo "Creating the git tag for the new release"
- rm -rf spark
- git clone "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_SPARK_REPO" -b master
- cd spark
- git tag "v$RELEASE_VERSION" "$RELEASE_TAG"
- git push origin "v$RELEASE_VERSION"
- cd ..
- rm -rf spark
- echo "git tag v$RELEASE_VERSION created"
+ if check_for_tag "v$RELEASE_VERSION"; then
+ echo "v$RELEASE_VERSION already exists. Skip creating it."
+ else
+ rm -rf spark
+ git clone "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_SPARK_REPO" -b master
+ cd spark
+ git tag "v$RELEASE_VERSION" "$RELEASE_TAG"
+ git push origin "v$RELEASE_VERSION"
+ cd ..
+ rm -rf spark
+ echo "git tag v$RELEASE_VERSION created"
+ fi
# download PySpark binary from the dev directory and upload to PyPi.
echo "Uploading PySpark to PyPi"
svn co --depth=empty "$RELEASE_STAGING_LOCATION/$RELEASE_TAG-bin" svn-spark
cd svn-spark
- svn update "pyspark-$RELEASE_VERSION.tar.gz"
- svn update "pyspark-$RELEASE_VERSION.tar.gz.asc"
- TWINE_USERNAME=spark-upload TWINE_PASSWORD="$PYPI_PASSWORD" twine upload \
+ PYSPARK_VERSION=`echo "$RELEASE_VERSION" | sed -e "s/-/./" -e "s/preview/dev/"`
+ svn update "pyspark-$PYSPARK_VERSION.tar.gz"
+ svn update "pyspark-$PYSPARK_VERSION.tar.gz.asc"
+ twine upload -u __token__ -p $PYPI_API_TOKEN \
--repository-url https://upload.pypi.org/legacy/ \
"pyspark-$RELEASE_VERSION.tar.gz" \
"pyspark-$RELEASE_VERSION.tar.gz.asc"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org