mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Don't install setuptools >= 50.0.0 until they release something useful
https://github.com/pypa/setuptools/issues/2352#issuecomment-685046897
This commit is contained in:
parent
a53bac0a6b
commit
de833885d4
7 changed files with 10 additions and 20 deletions
18
noxfile.py
18
noxfile.py
|
@ -185,7 +185,7 @@ def _get_pip_requirements_file(session, transport, crypto=None):
|
|||
if IS_WINDOWS:
|
||||
if crypto is None:
|
||||
_requirements_file = os.path.join(
|
||||
"requirements", "static", pydir, "{}-windows.txt".format(transport),
|
||||
"requirements", "static", pydir, "{}-windows.txt".format(transport)
|
||||
)
|
||||
if os.path.exists(_requirements_file):
|
||||
return _requirements_file
|
||||
|
@ -262,26 +262,16 @@ def _install_requirements(session, transport, *extra_requirements):
|
|||
|
||||
# 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",
|
||||
]
|
||||
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 = [
|
||||
"--progress-bar=off",
|
||||
"-r",
|
||||
requirements_file,
|
||||
]
|
||||
install_command = ["--progress-bar=off", "-r", requirements_file]
|
||||
session.install(*install_command, silent=PIP_INSTALL_SILENT)
|
||||
|
||||
if extra_requirements:
|
||||
install_command = [
|
||||
"--progress-bar=off",
|
||||
]
|
||||
install_command = ["--progress-bar=off"]
|
||||
install_command += list(extra_requirements)
|
||||
session.install(*install_command, silent=PIP_INSTALL_SILENT)
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- name: 'setuptools<50.0.0'
|
||||
- bin_env: {{ venv_dir }}
|
||||
- require:
|
||||
- virtualenv: {{ venv_dir }}
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- name: 'setuptools<50.0.0'
|
||||
- bin_env: {{ venv_dir }}
|
||||
- require:
|
||||
- virtualenv: {{ venv_dir }}
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- name: 'setuptools<50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- name: 'setuptools<50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- name: 'setuptools<50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
|
|
@ -1724,7 +1724,7 @@ class VirtualEnv:
|
|||
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")
|
||||
self.install("-U", "setuptools<50.0.0")
|
||||
|
||||
|
||||
@contextmanager
|
||||
|
|
Loading…
Add table
Reference in a new issue