From 4e30ba90a7f14627d098d676f1ee8bf02d62eb9e Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Sat, 6 May 2017 19:40:40 -0700 Subject: [PATCH 1/2] Drop the hadoop distirbution name from the Python version packaging string --- dev/create-release/release-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 7976d8a03954..85987a9e8428 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -165,7 +165,7 @@ if [[ "$1" == "package" ]]; then # Write out the NAME and VERSION to PySpark version info we rewrite the - into a . and SNAPSHOT # to dev0 to be closer to PEP440. We use the NAME as a "local version". - PYSPARK_VERSION=`echo "$SPARK_VERSION+$NAME" | sed -r "s/-/./" | sed -r "s/SNAPSHOT/dev0/"` + PYSPARK_VERSION=`echo "$SPARK_VERSION" | sed -r "s/-/./" | sed -r "s/SNAPSHOT/dev0/"` echo "__version__='$PYSPARK_VERSION'" > python/pyspark/version.py # Get maven home set by MVN From 99414d7ce352d7d4dd32a9ad4eda93c11d360cac Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Sat, 6 May 2017 20:22:02 -0700 Subject: [PATCH 2/2] Update comment since we don't have name --- dev/create-release/release-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 85987a9e8428..a72307a28ad7 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -163,8 +163,8 @@ if [[ "$1" == "package" ]]; then export ZINC_PORT=$ZINC_PORT echo "Creating distribution: $NAME ($FLAGS)" - # Write out the NAME and VERSION to PySpark version info we rewrite the - into a . and SNAPSHOT - # to dev0 to be closer to PEP440. We use the NAME as a "local version". + # Write out the VERSION to PySpark version info we rewrite the - into a . and SNAPSHOT + # to dev0 to be closer to PEP440. PYSPARK_VERSION=`echo "$SPARK_VERSION" | sed -r "s/-/./" | sed -r "s/SNAPSHOT/dev0/"` echo "__version__='$PYSPARK_VERSION'" > python/pyspark/version.py