mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Never use setuptools==50.0.0. Followup to 87c94b3490
This commit is contained in:
parent
b7f6fcab5b
commit
738ca360bf
5 changed files with 46 additions and 3 deletions
|
@ -57,6 +57,13 @@
|
|||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- bin_env: {{ venv_dir }}
|
||||
- require:
|
||||
- virtualenv: {{ venv_dir }}
|
||||
|
||||
uwsgi:
|
||||
pip.installed:
|
||||
- name: 'uwsgi == 2.0.18'
|
||||
|
@ -65,4 +72,5 @@ uwsgi:
|
|||
- env_vars:
|
||||
UWSGI_PROFILE: cgi
|
||||
- require:
|
||||
- pip: install-working-setuptools
|
||||
- virtualenv: {{ venv_dir }}
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
{{ salt['runtests_helpers.get_sys_temp_dir_for_path']('issue-1959-virtualenv-runas') }}:
|
||||
{%- set venv_dir = salt['runtests_helpers.get_sys_temp_dir_for_path']('issue-1959-virtualenv-runas') %}
|
||||
|
||||
{{ venv_dir }}:
|
||||
virtualenv.managed:
|
||||
- requirements: salt://issue-1959-virtualenv-runas/requirements.txt
|
||||
- user: issue-1959
|
||||
|
@ -10,3 +12,10 @@
|
|||
{%- endif %}
|
||||
- env:
|
||||
XDG_CACHE_HOME: /tmp
|
||||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- bin_env: {{ venv_dir }}
|
||||
- require:
|
||||
- virtualenv: {{ venv_dir }}
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
{{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}:
|
||||
{%- set virtualenv_base = salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') %}
|
||||
|
||||
{{ virtualenv_base }}:
|
||||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
- distribute: True
|
||||
|
@ -7,9 +9,17 @@
|
|||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
{%- endif %}
|
||||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
||||
pep8-pip:
|
||||
pip.installed:
|
||||
- name: pep8
|
||||
- bin_env: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
- require:
|
||||
- pip: install-working-setuptools
|
||||
- virtualenv: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
|
|
|
@ -10,12 +10,20 @@
|
|||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
{%- endif %}
|
||||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
||||
install_older_venv_1:
|
||||
pip.installed:
|
||||
- name: 'virtualenv < 13.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- upgrade: True
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
- pip: install-working-setuptools
|
||||
|
||||
# For this test we need to make sure that the virtualenv used in the
|
||||
# 'issue-46127-setup' pip.installed state below was created using
|
||||
|
|
|
@ -8,11 +8,19 @@
|
|||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
install-working-setuptools:
|
||||
pip.installed:
|
||||
- name: 'setuptools!=50.0.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
||||
install_older_venv:
|
||||
pip.installed:
|
||||
- name: 'virtualenv < 13.0'
|
||||
- bin_env: {{ virtualenv_base }}
|
||||
- require:
|
||||
- pip: install-working-setuptools
|
||||
- virtualenv: {{ virtualenv_base }}
|
||||
|
||||
# For this test we need to make sure that the virtualenv used in the
|
||||
|
|
Loading…
Add table
Reference in a new issue