From f2facac99fa96408c26d27f3dd3a3e3964482365 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Tue, 7 Dec 2021 08:59:23 +0100 Subject: [PATCH 1/7] Remove pin for Sphinx in requirements.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 4a1edcd0d4e26..e2ca2b882dc99 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ breathe ipython numpydoc -sphinx==2.4.4 +sphinx pydata-sphinx-theme sphinx-tabs From bae57967bcb5d376d90f6821283666ee7dfb3f01 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Tue, 7 Dec 2021 13:53:17 +0100 Subject: [PATCH 2/7] Reference requirements from dockerfile --- ci/docker/linux-apt-docs.dockerfile | 8 +------- docs/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index 3cd62a23d7dd4..da47f0503090e 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -74,13 +74,7 @@ RUN wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \ rm -rf /var/lib/apt/lists/* && \ npm install -g yarn -RUN pip install \ - breathe \ - ipython \ - meson \ - pydata-sphinx-theme \ - sphinx-tabs \ - sphinx>=4.2 +RUN pip install -r /arrow/docs/requirements.txt COPY c_glib/Gemfile /arrow/c_glib/ RUN gem install --no-document bundler && \ diff --git a/docs/requirements.txt b/docs/requirements.txt index e2ca2b882dc99..9c1912762f73b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,7 @@ breathe ipython numpydoc -sphinx +meson pydata-sphinx-theme sphinx-tabs +sphinx>=4.2 From 0814903e71d435b986b8c0b4766d2bb1aabb9772 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Tue, 7 Dec 2021 14:44:57 +0100 Subject: [PATCH 3/7] Update ci/docker/linux-apt-docs.dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Krisztián Szűcs --- ci/docker/linux-apt-docs.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index da47f0503090e..36c1e36f86a3e 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -74,7 +74,7 @@ RUN wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \ rm -rf /var/lib/apt/lists/* && \ npm install -g yarn -RUN pip install -r /arrow/docs/requirements.txt +RUN pip install -r /arrow/docs/requirements.txt meson COPY c_glib/Gemfile /arrow/c_glib/ RUN gem install --no-document bundler && \ From 3e9be8f47291d245d2398d54e4e383f195a6e939 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Tue, 7 Dec 2021 14:50:31 +0100 Subject: [PATCH 4/7] Remove meson from requirements --- docs/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 9c1912762f73b..b6f8deaec3ca7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,6 @@ breathe ipython numpydoc -meson pydata-sphinx-theme sphinx-tabs sphinx>=4.2 From 1728007abcfb98b297c2ac802860e9408f538164 Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Wed, 8 Dec 2021 10:07:15 +0100 Subject: [PATCH 5/7] Error fix - try shorter path --- ci/docker/linux-apt-docs.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index 36c1e36f86a3e..c36ff3b2c81d4 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -74,7 +74,7 @@ RUN wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \ rm -rf /var/lib/apt/lists/* && \ npm install -g yarn -RUN pip install -r /arrow/docs/requirements.txt meson +RUN pip install -r docs/requirements.txt meson COPY c_glib/Gemfile /arrow/c_glib/ RUN gem install --no-document bundler && \ From 58d4fc576770f0fcde823574e32ac0665dfa074f Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Fri, 10 Dec 2021 10:04:23 +0100 Subject: [PATCH 6/7] Add COPY to .dockerfile and requirements to .dockerignore --- .dockerignore | 1 + ci/docker/linux-apt-docs.dockerfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index a369d7d59a662..554cb34f1e9e9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -28,6 +28,7 @@ !ci/** !c_glib/Gemfile !dev/archery/setup.py +!docs/requirements*.txt !python/requirements*.txt !python/manylinux1/** !python/manylinux2010/** diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index c36ff3b2c81d4..4703f54b39342 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -74,7 +74,8 @@ RUN wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \ rm -rf /var/lib/apt/lists/* && \ npm install -g yarn -RUN pip install -r docs/requirements.txt meson +COPY docs/requirements.txt /arrow/docs/ +RUN pip install -r arrow/docs/requirements.txt meson COPY c_glib/Gemfile /arrow/c_glib/ RUN gem install --no-document bundler && \ From d0476127429af21309cb37ce1e4a239eb1d99b3d Mon Sep 17 00:00:00 2001 From: Alenka Frim Date: Fri, 10 Dec 2021 11:47:38 +0100 Subject: [PATCH 7/7] Add a sync note to the requirements.txt --- docs/requirements.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index b6f8deaec3ca7..c44361e2a9e4a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,7 @@ +# +# Note: keep this file in sync with conda_env_sphinx.txt ! +# + breathe ipython numpydoc