Skip to content

Commit d6be46e

Browse files
cloud-fanMarcelo Vanzin
authored and
Marcelo Vanzin
committed
[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 <wenchen@databricks.com> Signed-off-by: Marcelo Vanzin <vanzin@cloudera.com>
1 parent 7b4e94f commit d6be46e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dev/create-release/do-release-docker.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ if [ -n "$JAVA" ]; then
135135
JAVA_VOL="--volume $JAVA:/opt/spark-java"
136136
fi
137137

138+
# SPARK-24530: Sphinx must work with python 3 to generate doc correctly.
139+
echo "SPHINXPYTHON=/opt/p35/bin/python" >> $ENVFILE
140+
138141
echo "Building $RELEASE_TAG; output will be at $WORKDIR/output"
139142
docker run -ti \
140143
--env-file "$ENVFILE" \

dev/create-release/spark-rm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN echo 'deb http://cran.cnr.Berkeley.edu/bin/linux/ubuntu xenial/' >> /etc/apt
6262
pip install $BASE_PIP_PKGS && \
6363
pip install $PIP_PKGS && \
6464
cd && \
65-
virtualenv -p python3 p35 && \
66-
. p35/bin/activate && \
65+
virtualenv -p python3 /opt/p35 && \
66+
. /opt/p35/bin/activate && \
6767
pip install $BASE_PIP_PKGS && \
6868
pip install $PIP_PKGS && \
6969
# Install R packages and dependencies used when building.

0 commit comments

Comments
 (0)