Repository: spark Updated Branches: refs/heads/master 7b4e94f16 -> d6be46eb9
[SPARK-24530][FOLLOWUP] run Sphinx with python 3 in docker ## What changes were proposed in this pull request? SPARK-24530 discovered a problem of generation python doc, and provided a fix: setting SPHINXPYTHON to python 3. This PR makes this fix automatic in the release script using docker. ## How was this patch tested? verified by the 2.4.0 rc2 Closes #22607 from cloud-fan/python. Authored-by: Wenchen Fan <[email protected]> Signed-off-by: Marcelo Vanzin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d6be46eb Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d6be46eb Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d6be46eb Branch: refs/heads/master Commit: d6be46eb9c68e48f6c0ed1e461649ee9575b2426 Parents: 7b4e94f Author: Wenchen Fan <[email protected]> Authored: Tue Oct 2 10:10:22 2018 -0700 Committer: Marcelo Vanzin <[email protected]> Committed: Tue Oct 2 10:10:22 2018 -0700 ---------------------------------------------------------------------- dev/create-release/do-release-docker.sh | 3 +++ dev/create-release/spark-rm/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d6be46eb/dev/create-release/do-release-docker.sh ---------------------------------------------------------------------- diff --git a/dev/create-release/do-release-docker.sh b/dev/create-release/do-release-docker.sh index fa7b73c..c1a122e 100755 --- a/dev/create-release/do-release-docker.sh +++ b/dev/create-release/do-release-docker.sh @@ -135,6 +135,9 @@ if [ -n "$JAVA" ]; then JAVA_VOL="--volume $JAVA:/opt/spark-java" fi +# SPARK-24530: Sphinx must work with python 3 to generate doc correctly. +echo "SPHINXPYTHON=/opt/p35/bin/python" >> $ENVFILE + echo "Building $RELEASE_TAG; output will be at $WORKDIR/output" docker run -ti \ --env-file "$ENVFILE" \ http://git-wip-us.apache.org/repos/asf/spark/blob/d6be46eb/dev/create-release/spark-rm/Dockerfile ---------------------------------------------------------------------- diff --git a/dev/create-release/spark-rm/Dockerfile b/dev/create-release/spark-rm/Dockerfile index 15f831c..4231544 100644 --- a/dev/create-release/spark-rm/Dockerfile +++ b/dev/create-release/spark-rm/Dockerfile @@ -62,8 +62,8 @@ RUN echo 'deb http://cran.cnr.Berkeley.edu/bin/linux/ubuntu xenial/' >> /etc/apt pip install $BASE_PIP_PKGS && \ pip install $PIP_PKGS && \ cd && \ - virtualenv -p python3 p35 && \ - . p35/bin/activate && \ + virtualenv -p python3 /opt/p35 && \ + . /opt/p35/bin/activate && \ pip install $BASE_PIP_PKGS && \ pip install $PIP_PKGS && \ # Install R packages and dependencies used when building. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
