saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Also pin the `pip upgrade to be <21.2`

Browse source
This commit is contained in:
Pedro Algarvio 2021-07-26 17:41:13 +01:00 • committed by Megan Wilhite
parent b245ce5840
commit ac254c7d4a
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
noxfile.py
View file

@ -272,9 +272,7 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ
return _requirements_file
def _install_requirements(
session, transport, *extra_requirements, requirements_type="ci"
):
def _upgrade_pip_setuptools_and_wheel(session):
if SKIP_REQUIREMENTS_INSTALL:
session.log(
"Skipping Python Requirements because SKIP_REQUIREMENTS_INSTALL was found in the environ"
@ -288,11 +286,18 @@ def _install_requirements(
"install",
"--progress-bar=off",
"-U",
"pip>=20.2.4",
"pip>=20.2.4,<21.2",
"setuptools!=50.*,!=51.*,!=52.*",
"wheel",
]
session.run(*install_command, silent=PIP_INSTALL_SILENT)
def _install_requirements(
session, transport, *extra_requirements, requirements_type="ci"
):
_upgrade_pip_setuptools_and_wheel(session)
# Install requirements
requirements_file = _get_pip_requirements_file(
session, transport, requirements_type=requirements_type
@ -999,8 +1004,7 @@ def docs_html(session, compress, clean):
"""
Build Salt's HTML Documentation
"""
install_upgrades = ["--progress-bar=off", "-U", "pip", "setuptools", "wheel"]
session.install(*install_upgrades, silent=PIP_INSTALL_SILENT)
_upgrade_pip_setuptools_and_wheel(session)
requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "docs.txt"
)
@ -1023,8 +1027,7 @@ def docs_man(session, compress, update, clean):
"""
Build Salt's Manpages Documentation
"""
install_upgrades = ["--progress-bar=off", "-U", "pip", "setuptools", "wheel"]
session.install(*install_upgrades, silent=PIP_INSTALL_SILENT)
_upgrade_pip_setuptools_and_wheel(session)
requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "docs.txt"
)