mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #58337 from s0undt3ch/hotfix/requirements
Downgrade setuptools to < 50.0.0
This commit is contained in:
commit
b7f6fcab5b
2 changed files with 12 additions and 0 deletions
10
noxfile.py
10
noxfile.py
|
@ -259,6 +259,16 @@ def _install_requirements(session, transport, *extra_requirements):
|
|||
"Skipping Python Requirements because SKIP_REQUIREMENTS_INSTALL was found in the environ"
|
||||
)
|
||||
return
|
||||
|
||||
# setuptools 50.0.0 is broken
|
||||
# https://github.com/pypa/setuptools/issues?q=is%3Aissue+setuptools+50+
|
||||
install_command = [
|
||||
"--progress-bar=off",
|
||||
"-U",
|
||||
"setuptools!=50.0.0",
|
||||
]
|
||||
session.install(*install_command, silent=PIP_INSTALL_SILENT)
|
||||
|
||||
# Install requirements
|
||||
requirements_file = _get_pip_requirements_file(session, transport)
|
||||
install_command = [
|
||||
|
|
|
@ -1723,6 +1723,8 @@ class VirtualEnv:
|
|||
sminion.functions.virtualenv.create(
|
||||
self.venv_dir, python=self._get_real_python()
|
||||
)
|
||||
# https://github.com/pypa/setuptools/issues?q=is%3Aissue+setuptools+50+
|
||||
self.install("-U", "setuptools!=50.0.0")
|
||||
|
||||
|
||||
@contextmanager
|
||||
|
|
Loading…
Add table
Reference in a new issue