You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ho...@apache.org on 2017/05/09 18:25:35 UTC
spark git commit: [SPARK-20627][PYSPARK] Drop the hadoop distirbution
name from the Python version
Repository: spark
Updated Branches:
refs/heads/master 25ee816e0 -> 1b85bcd92
[SPARK-20627][PYSPARK] Drop the hadoop distirbution name from the Python version
## What changes were proposed in this pull request?
Drop the hadoop distirbution name from the Python version (PEP440 - https://www.python.org/dev/peps/pep-0440/). We've been using the local version string to disambiguate between different hadoop versions packaged with PySpark, but PEP0440 states that local versions should not be used when publishing up-stream. Since we no longer make PySpark pip packages for different hadoop versions, we can simply drop the hadoop information. If at a later point we need to start publishing different hadoop versions we can look at make different packages or similar.
## How was this patch tested?
Ran `make-distribution` locally
Author: Holden Karau <ho...@us.ibm.com>
Closes #17885 from holdenk/SPARK-20627-remove-pip-local-version-string.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1b85bcd9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1b85bcd9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1b85bcd9
Branch: refs/heads/master
Commit: 1b85bcd9298cf84dd746fe8e91ab0b0df69ef17e
Parents: 25ee816
Author: Holden Karau <ho...@us.ibm.com>
Authored: Tue May 9 11:25:29 2017 -0700
Committer: Holden Karau <ho...@us.ibm.com>
Committed: Tue May 9 11:25:29 2017 -0700
----------------------------------------------------------------------
dev/create-release/release-build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1b85bcd9/dev/create-release/release-build.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index 7976d8a..a72307a 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -163,9 +163,9 @@ 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".
- PYSPARK_VERSION=`echo "$SPARK_VERSION+$NAME" | sed -r "s/-/./" | sed -r "s/SNAPSHOT/dev0/"`
+ # 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
# Get maven home set by MVN
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org