From 5d30cc42b8323200b8dc006f4f69457150215297 Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Wed, 10 Jan 2024 23:03:30 -0500 Subject: [PATCH 1/3] sphinx -> 4.5 --- .github/workflows/build_and_test.yml | 2 +- dev/create-release/spark-rm/Dockerfile | 2 +- dev/requirements.txt | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ea02192960e1..33c3ecb22bf0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -750,7 +750,7 @@ jobs: Rscript -e "devtools::install_version('preferably', version='0.4', repos='https://cloud.r-project.org')" - name: Install dependencies for documentation generation run: | - python3.9 -m pip install 'sphinx==4.2.0' mkdocs 'pydata_sphinx_theme>=0.13' sphinx-copybutton nbsphinx numpydoc jinja2 markupsafe 'pyzmq<24.0.0' + python3.9 -m pip install 'sphinx==4.5.0' mkdocs 'pydata_sphinx_theme>=0.13' sphinx-copybutton nbsphinx numpydoc jinja2 markupsafe 'pyzmq<24.0.0' python3.9 -m pip install ipython_genutils # See SPARK-38517 python3.9 -m pip install sphinx_plotly_directive 'numpy>=1.20.0' pyarrow pandas 'plotly>=4.8' python3.9 -m pip install 'docutils<0.18.0' # See SPARK-39421 diff --git a/dev/create-release/spark-rm/Dockerfile b/dev/create-release/spark-rm/Dockerfile index 9cfe78570421..eeddfdf9d009 100644 --- a/dev/create-release/spark-rm/Dockerfile +++ b/dev/create-release/spark-rm/Dockerfile @@ -37,7 +37,7 @@ ENV DEBCONF_NONINTERACTIVE_SEEN true # These arguments are just for reuse and not really meant to be customized. ARG APT_INSTALL="apt-get install --no-install-recommends -y" -ARG PIP_PKGS="sphinx==4.2.0 mkdocs==1.1.2 numpy==1.20.3 pydata_sphinx_theme==0.13.3 ipython==7.19.0 nbsphinx==0.8.0 numpydoc==1.1.0 jinja2==3.1.2 twine==3.4.1 sphinx-plotly-directive==0.1.3 sphinx-copybutton==0.5.2 pandas==1.5.3 pyarrow==3.0.0 plotly==5.4.0 markupsafe==2.0.1 docutils<0.17 grpcio==1.59.3 protobuf==4.21.6 grpcio-status==1.59.3 googleapis-common-protos==1.56.4" +ARG PIP_PKGS="sphinx==4.5.0 mkdocs==1.1.2 numpy==1.20.3 pydata_sphinx_theme==0.13.3 ipython==7.19.0 nbsphinx==0.8.0 numpydoc==1.1.0 jinja2==3.1.2 twine==3.4.1 sphinx-plotly-directive==0.1.3 sphinx-copybutton==0.5.2 pandas==1.5.3 pyarrow==3.0.0 plotly==5.4.0 markupsafe==2.0.1 docutils<0.17 grpcio==1.59.3 protobuf==4.21.6 grpcio-status==1.59.3 googleapis-common-protos==1.56.4" ARG GEM_PKGS="bundler:2.3.8" # Install extra needed repos and refresh. diff --git a/dev/requirements.txt b/dev/requirements.txt index 51facfeb5088..a46db00547db 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -36,7 +36,7 @@ ipython nbsphinx numpydoc jinja2 -sphinx==4.2.0 +sphinx==4.5.0 sphinx-plotly-directive sphinx-copybutton docutils<0.18.0 @@ -67,4 +67,3 @@ torcheval # DeepspeedTorchDistributor dependencies deepspeed; sys_platform != 'darwin' - From 23cb58b87f266e16ad97be0a480937481fe5c342 Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Wed, 10 Jan 2024 23:03:43 -0500 Subject: [PATCH 2/3] enable parallel sphinx workers --- python/docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/docs/Makefile b/python/docs/Makefile index c9596209f521..5058c1206171 100644 --- a/python/docs/Makefile +++ b/python/docs/Makefile @@ -16,7 +16,7 @@ # Minimal makefile for Sphinx documentation # You can set these variables from the command line. -SPHINXOPTS ?= "-W" +SPHINXOPTS ?= "-W" "-j" "auto" SPHINXBUILD ?= sphinx-build SOURCEDIR ?= source BUILDDIR ?= build From 9c232ee4d78b57c890b94cdea42805ac0eb4bf18 Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Wed, 10 Jan 2024 23:20:46 -0500 Subject: [PATCH 3/3] trigger build