From cd0dd3c9787a2bd1c5a91c911679b1c1e8531afc Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 31 Jul 2024 16:49:04 -0300 Subject: [PATCH 1/2] Pin towncrier due to incompatibility with sphinxcontrib-towncrier Pin `towncrier` until we find a solution to https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92. --- doc/en/broken-dep-constraints.txt | 6 ++++++ doc/en/requirements.txt | 1 + 2 files changed, 7 insertions(+) create mode 100644 doc/en/broken-dep-constraints.txt diff --git a/doc/en/broken-dep-constraints.txt b/doc/en/broken-dep-constraints.txt new file mode 100644 index 00000000000..f7c3211a9a0 --- /dev/null +++ b/doc/en/broken-dep-constraints.txt @@ -0,0 +1,6 @@ +# This file contains transitive dependencies that need to be pinned for some reason. +# Eventually this file will be empty, but in this case keep it around for future use. + +# Pin towncrier temporarily due to incompatibility with sphinxcontrib-towncrier: +# https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92 +towncrier!=24.7.0,!=24.7.1 diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt index 0637c967b8a..42225057e2b 100644 --- a/doc/en/requirements.txt +++ b/doc/en/requirements.txt @@ -1,3 +1,4 @@ +-c broken-dep-constraints.txt pluggy>=1.5.0 pygments-pytest>=2.3.0 sphinx-removed-in>=0.2.0 From 303e5c51b9bfaa9d699f8852feaf70029ac5ecdc Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 31 Jul 2024 16:51:27 -0300 Subject: [PATCH 2/2] Remove explicit package dependency package was previously an explicit dependency because it was pinned in https://github.com/pytest-dev/pytest/pull/10578, however since then the pin has been removed, so the explicit dependency is no longer necessary. --- doc/en/requirements.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/en/requirements.txt b/doc/en/requirements.txt index 42225057e2b..ddcb7efb99b 100644 --- a/doc/en/requirements.txt +++ b/doc/en/requirements.txt @@ -5,10 +5,6 @@ sphinx-removed-in>=0.2.0 sphinx>=7 sphinxcontrib-trio sphinxcontrib-svg2pdfconverter -# Pin packaging because it no longer handles 'latest' version, which -# is the version that is assigned to the docs. -# See https://github.com/pytest-dev/pytest/pull/10578#issuecomment-1348249045. -packaging furo sphinxcontrib-towncrier sphinx-issues