From: Pieter Lexis Date: Mon, 9 Feb 2026 08:36:15 +0000 (+0100) Subject: docs(auth): Pin setuptools so pkg_resources keeps working X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e4710c509ea70e3a4368d3d1f5b4138b05f0b0;p=thirdparty%2Fpdns.git docs(auth): Pin setuptools so pkg_resources keeps working --- diff --git a/docs/Makefile.am b/docs/Makefile.am index 1f2ae072b8..da63c04b60 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -68,7 +68,7 @@ mans/.complete: .venv .venv: requirements.txt $(PYTHON) -m venv .venv - .venv/bin/pip install -U pip setuptools + .venv/bin/pip install -U pip "setuptools<82" .venv/bin/pip install -r ${srcdir}/requirements.txt .NOTPARALLEL: \ diff --git a/docs/Makefile.sphinx b/docs/Makefile.sphinx index 2cc2e1f33c..0ce5f46b22 100644 --- a/docs/Makefile.sphinx +++ b/docs/Makefile.sphinx @@ -21,5 +21,5 @@ help: .venv .venv: python3 -m venv .venv - .venv/bin/pip install -U pip setuptools + .venv/bin/pip install -U pip "setuptools<82" .venv/bin/pip install -r requirements.txt diff --git a/docs/requirements.in b/docs/requirements.in index afb0cbe330..1377866a69 100644 --- a/docs/requirements.in +++ b/docs/requirements.in @@ -17,3 +17,4 @@ setuptools-scm==8.0.3 # setup-requires for sphinxcontrib-openapi pbr # setup-requires for sphinxcontrib-fulltoc standard.pipes standard.imghdr +setuptools<82 diff --git a/docs/requirements.txt b/docs/requirements.txt index 84b4f530c2..219aa19e27 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --allow-unsafe --generate-hashes requirements.in # alabaster==0.7.13 \ --hash=sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3 \ @@ -16,9 +16,9 @@ attrs==25.4.0 \ # via # jsonschema # referencing -babel==2.17.0 \ - --hash=sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d \ - --hash=sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2 +babel==2.18.0 \ + --hash=sha256:b80b99a14bd085fcacfa15c9165f651fbb3406e66cc603abf11c5750937c992d \ + --hash=sha256:e2b422b277c2b9a9630c1d7903c2a00d0830c409c59ac8cae9081c92f1aeba35 # via sphinx certifi==2026.1.4 \ --hash=sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c \ @@ -544,7 +544,12 @@ wheel==0.46.2 \ --hash=sha256:3d79e48fde9847618a5a181f3cc35764c349c752e2fe911e65fa17faab9809b0 # via -r requirements.in -# WARNING: The following packages were not pinned, but pip requires them to be -# pinned when the requirements file includes hashes and the requirement is not -# satisfied by a package already installed. Consider using the --allow-unsafe flag. -# setuptools +# The following packages are considered to be unsafe in a requirements file: +setuptools==81.0.0 \ + --hash=sha256:487b53915f52501f0a79ccfd0c02c165ffe06631443a886740b91af4b7a5845a \ + --hash=sha256:fdd925d5c5d9f62e4b74b30d6dd7828ce236fd6ed998a08d81de62ce5a6310d6 + # via + # -r requirements.in + # pbr + # setuptools-scm + # sphinx diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 6a2b0f5e3c..2f375d6126 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -100,7 +100,7 @@ api-swagger.yaml: $(wildcard ${srcdir}/../docs/http-api/swagger/authoritative-ap if HAVE_VENV api-swagger.json: api-swagger.yaml requirements.txt $(PYTHON) -m venv .venv - .venv/bin/pip install -U pip setuptools + .venv/bin/pip install -U pip "setuptools<82" .venv/bin/pip install -r ${srcdir}/requirements.txt .venv/bin/python ${srcdir}/convert-yaml-to-json.py $< $@ else # if HAVE_VENV