From: Matthew Watkins Date: Thu, 5 Mar 2026 15:19:03 +0000 (+0000) Subject: Pin setuptools<81 and sphinx<8 for sphinxcontrib-needs X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=vnfrqts%2Frequirements.git Pin setuptools<81 and sphinx<8 for sphinxcontrib-needs sphinxcontrib-needs 0.7.9 uses pkg_resources (removed in setuptools>=81) and sphinx.util.status_iterator (removed in Sphinx 8). Pin both to unblock the RTD build. Also add pins to etc/requirements.txt so that the root tox.ini builds (needs, docs-linkcheck) are equally protected. Issue-ID: CIMAN-33 Co-Authored-By: Claude Change-Id: I18a954ad30dff923620934d78e1f947ccf2b6405 Signed-off-by: Matthew Watkins --- diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index d2c30e9..383d2b9 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,5 +1,5 @@ -setuptools>=65.0.0,<82 -sphinx>=4.2.0 # BSD +setuptools>=65.0.0,<81 +sphinx>=4.2.0,<8 # BSD sphinx-rtd-theme>=1.0.0 # MIT sphinxcontrib-mermaid>=1.0.0 sphinxcontrib-needs diff --git a/docs/tox.ini b/docs/tox.ini index 9caf5a5..fb4dc45 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -6,7 +6,7 @@ skipsdist = true [testenv:docs] basepython = python3.13 deps = - setuptools>=65.0.0,<82 + setuptools>=65.0.0,<81 -r{toxinidir}/requirements-docs.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = diff --git a/etc/requirements.txt b/etc/requirements.txt index c8b8a77..0dd5e17 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. ############################################################################# -sphinx>=4.2.0 # BSD +setuptools>=65.0.0,<81 +sphinx>=4.2.0,<8 # BSD sphinx-rtd-theme>=1.0.0 # MIT sphinxcontrib-mermaid>=1.0.0 sphinxcontrib-needs