No need to include the base and zeromq dependencies in docs dependencies now.

Given we now properly constraint requirements files

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-06-02 08:08:59 +01:00 committed by Pedro Algarvio
parent bef7a6ab2e
commit 180ece842c
6 changed files with 38 additions and 244 deletions

View file

@ -849,8 +849,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.8
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/ci/docs.in
- id: pip-tools-compile
@ -864,8 +862,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.9
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/ci/docs.in
- id: pip-tools-compile
@ -879,8 +875,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.10
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/ci/docs.in
- id: pip-tools-compile
@ -894,8 +888,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.11
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/ci/docs.in
# <---- Doc CI Requirements ----------------------------------------------------------------------------------------

View file

@ -1526,10 +1526,25 @@ def docs_html(session, compress, clean):
Build Salt's HTML Documentation
"""
if _upgrade_pip_setuptools_and_wheel(session):
requirements_file = os.path.join(
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
)
base_requirements_file = os.path.join("requirements", "base.txt")
zeromq_requirements_file = os.path.join("requirements", "zeromq.txt")
docs_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "docs.txt"
)
install_command = ["--progress-bar=off", "-r", requirements_file]
install_command = [
"--progress-bar=off",
"--constraint",
linux_requirements_file,
"-r",
base_requirements_file,
"-r",
zeromq_requirements_file,
"-r",
docs_requirements_file,
]
session.install(*install_command, silent=PIP_INSTALL_SILENT)
os.chdir("doc/")
if clean:
@ -1549,10 +1564,25 @@ def docs_man(session, compress, update, clean):
Build Salt's Manpages Documentation
"""
if _upgrade_pip_setuptools_and_wheel(session):
requirements_file = os.path.join(
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
)
base_requirements_file = os.path.join("requirements", "base.txt")
zeromq_requirements_file = os.path.join("requirements", "zeromq.txt")
docs_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "docs.txt"
)
install_command = ["--progress-bar=off", "-r", requirements_file]
install_command = [
"--progress-bar=off",
"--constraint",
linux_requirements_file,
"-r",
base_requirements_file,
"-r",
zeromq_requirements_file,
"-r",
docs_requirements_file,
]
session.install(*install_command, silent=PIP_INSTALL_SILENT)
os.chdir("doc/")
if clean:

View file

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.10/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt
# pip-compile --output-file=requirements/static/ci/py3.10/docs.txt requirements/static/ci/docs.in
#
alabaster==0.7.12
# via sphinx
@ -16,10 +16,6 @@ certifi==2023.5.7
# via
# -c requirements/static/ci/py3.10/linux.txt
# requests
cffi==1.15.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# cryptography
charset-normalizer==2.1.1
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -32,18 +28,6 @@ cherrypy==18.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/docs.in
contextvars==2.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
cryptography==40.0.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/crypto.txt
distro==1.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
docutils==0.19
# via sphinx
idna==3.4
@ -52,10 +36,6 @@ idna==3.4
# requests
imagesize==1.4.1
# via sphinx
immutables==0.19
# via
# -c requirements/static/ci/py3.10/linux.txt
# contextvars
inflect==6.0.4
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -81,20 +61,11 @@ jaraco.text==3.11.1
jinja2==3.1.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/docs.in
# myst-docutils
# sphinx
jmespath==1.0.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
linkify-it-py==1.0.3
# via myst-docutils
looseversion==1.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
markdown-it-py==2.2.0
# via
# mdit-py-plugins
@ -102,7 +73,6 @@ markdown-it-py==2.2.0
markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# jinja2
mdit-py-plugins==0.3.3
# via myst-docutils
@ -115,33 +85,16 @@ more-itertools==9.1.0
# cherrypy
# jaraco.functools
# jaraco.text
msgpack==1.0.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
myst-docutils[linkify]==0.18.1
# via -r requirements/static/ci/docs.in
packaging==23.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# sphinx
portend==3.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
psutil==5.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
pycparser==2.21
# via
# -c requirements/static/ci/py3.10/linux.txt
# cffi
pycryptodomex==3.9.8
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -158,16 +111,10 @@ pytz==2023.3
pyyaml==6.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# myst-docutils
pyzmq==25.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/zeromq.txt
requests==2.31.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# sphinx
six==1.16.0
# via
@ -200,10 +147,6 @@ tempora==5.2.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# portend
tornado==6.3.2 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
typing-extensions==4.6.2
# via
# -c requirements/static/ci/py3.10/linux.txt

View file

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.11/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt
# pip-compile --output-file=requirements/static/ci/py3.11/docs.txt requirements/static/ci/docs.in
#
alabaster==0.7.13
# via sphinx
@ -16,10 +16,6 @@ certifi==2023.5.7
# via
# -c requirements/static/ci/py3.11/linux.txt
# requests
cffi==1.15.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# cryptography
charset-normalizer==2.1.1
# via
# -c requirements/static/ci/py3.11/linux.txt
@ -32,18 +28,6 @@ cherrypy==18.8.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/docs.in
contextvars==2.4
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
cryptography==40.0.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/crypto.txt
distro==1.8.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
docutils==0.20.1
# via sphinx
idna==3.4
@ -52,10 +36,6 @@ idna==3.4
# requests
imagesize==1.4.1
# via sphinx
immutables==0.19
# via
# -c requirements/static/ci/py3.11/linux.txt
# contextvars
inflect==6.0.4
# via
# -c requirements/static/ci/py3.11/linux.txt
@ -81,20 +61,11 @@ jaraco.text==3.11.1
jinja2==3.1.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/docs.in
# myst-docutils
# sphinx
jmespath==1.0.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
linkify-it-py==1.0.3
# via myst-docutils
looseversion==1.2.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
markdown-it-py==2.2.0
# via
# mdit-py-plugins
@ -102,7 +73,6 @@ markdown-it-py==2.2.0
markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# jinja2
mdit-py-plugins==0.3.5
# via myst-docutils
@ -115,33 +85,16 @@ more-itertools==9.1.0
# cherrypy
# jaraco.functools
# jaraco.text
msgpack==1.0.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
myst-docutils[linkify]==1.0.0
# via -r requirements/static/ci/docs.in
packaging==23.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# sphinx
portend==3.1.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# cherrypy
psutil==5.9.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
pycparser==2.21
# via
# -c requirements/static/ci/py3.11/linux.txt
# cffi
pycryptodomex==3.9.8
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
# via
# -c requirements/static/ci/py3.11/linux.txt
@ -157,16 +110,10 @@ pytz==2023.3
pyyaml==6.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# myst-docutils
pyzmq==25.1.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/zeromq.txt
requests==2.31.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
# sphinx
six==1.16.0
# via
@ -199,10 +146,6 @@ tempora==5.2.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# portend
tornado==6.3.2 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
typing-extensions==4.6.2
# via
# -c requirements/static/ci/py3.11/linux.txt

View file

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.8/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt
# pip-compile --output-file=requirements/static/ci/py3.8/docs.txt requirements/static/ci/docs.in
#
alabaster==0.7.12
# via sphinx
@ -16,10 +16,6 @@ certifi==2023.5.7
# via
# -c requirements/static/ci/py3.8/linux.txt
# requests
cffi==1.15.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# cryptography
charset-normalizer==2.1.1
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -32,18 +28,6 @@ cherrypy==18.8.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/docs.in
contextvars==2.4
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
cryptography==40.0.2
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/crypto.txt
distro==1.8.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
docutils==0.16
# via sphinx
idna==3.4
@ -52,10 +36,6 @@ idna==3.4
# requests
imagesize==1.2.0
# via sphinx
immutables==0.19
# via
# -c requirements/static/ci/py3.8/linux.txt
# contextvars
importlib-resources==5.12.0
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -85,20 +65,11 @@ jaraco.text==3.11.1
jinja2==3.1.2
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/docs.in
# myst-docutils
# sphinx
jmespath==1.0.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
linkify-it-py==1.0.3
# via myst-docutils
looseversion==1.2.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
markdown-it-py==2.2.0
# via
# mdit-py-plugins
@ -106,7 +77,6 @@ markdown-it-py==2.2.0
markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# jinja2
mdit-py-plugins==0.3.3
# via myst-docutils
@ -119,33 +89,16 @@ more-itertools==9.1.0
# cherrypy
# jaraco.functools
# jaraco.text
msgpack==1.0.5
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
myst-docutils[linkify]==0.18.1
# via -r requirements/static/ci/docs.in
packaging==23.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# sphinx
portend==3.1.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# cherrypy
psutil==5.9.5
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
pycparser==2.21
# via
# -c requirements/static/ci/py3.8/linux.txt
# cffi
pycryptodomex==3.9.8
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -162,16 +115,10 @@ pytz==2023.3
pyyaml==6.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# myst-docutils
pyzmq==25.1.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/zeromq.txt
requests==2.31.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
# sphinx
six==1.16.0
# via
@ -204,10 +151,6 @@ tempora==5.2.2
# via
# -c requirements/static/ci/py3.8/linux.txt
# portend
tornado==6.3.2 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt
typing-extensions==4.6.2
# via
# -c requirements/static/ci/py3.8/linux.txt

View file

@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/static/ci/py3.9/docs.txt requirements/base.txt requirements/static/ci/docs.in requirements/zeromq.txt
# pip-compile --output-file=requirements/static/ci/py3.9/docs.txt requirements/static/ci/docs.in
#
alabaster==0.7.12
# via sphinx
@ -16,10 +16,6 @@ certifi==2023.5.7
# via
# -c requirements/static/ci/py3.9/linux.txt
# requests
cffi==1.15.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# cryptography
charset-normalizer==2.1.1
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -32,18 +28,6 @@ cherrypy==18.8.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/docs.in
contextvars==2.4
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
cryptography==40.0.2
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/crypto.txt
distro==1.8.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
docutils==0.19
# via sphinx
idna==3.4
@ -52,10 +36,6 @@ idna==3.4
# requests
imagesize==1.4.1
# via sphinx
immutables==0.19
# via
# -c requirements/static/ci/py3.9/linux.txt
# contextvars
importlib-metadata==6.6.0
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -85,20 +65,11 @@ jaraco.text==3.11.1
jinja2==3.1.2
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/docs.in
# myst-docutils
# sphinx
jmespath==1.0.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
linkify-it-py==1.0.3
# via myst-docutils
looseversion==1.2.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
markdown-it-py==2.2.0
# via
# mdit-py-plugins
@ -106,7 +77,6 @@ markdown-it-py==2.2.0
markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# jinja2
mdit-py-plugins==0.3.3
# via myst-docutils
@ -119,33 +89,16 @@ more-itertools==9.1.0
# cherrypy
# jaraco.functools
# jaraco.text
msgpack==1.0.5
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
myst-docutils[linkify]==0.18.1
# via -r requirements/static/ci/docs.in
packaging==23.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# sphinx
portend==3.1.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# cherrypy
psutil==5.9.5
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
pycparser==2.21
# via
# -c requirements/static/ci/py3.9/linux.txt
# cffi
pycryptodomex==3.9.8
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -162,16 +115,10 @@ pytz==2023.3
pyyaml==6.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# myst-docutils
pyzmq==25.1.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/zeromq.txt
requests==2.31.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
# sphinx
six==1.16.0
# via
@ -204,10 +151,6 @@ tempora==5.2.2
# via
# -c requirements/static/ci/py3.9/linux.txt
# portend
tornado==6.3.2 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt
typing-extensions==4.6.2
# via
# -c requirements/static/ci/py3.9/linux.txt