mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Use the real python executable path when running within a virtualenv
This commit is contained in:
parent
3d407e8a2e
commit
f86a44e1fc
7 changed files with 20 additions and 8 deletions
|
@ -38,6 +38,8 @@
|
|||
{{ venv_dir }}:
|
||||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
uwsgi:
|
||||
pip.installed:
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
virtualenv.managed:
|
||||
- requirements: salt://issue-1959-virtualenv-runas/requirements.txt
|
||||
- user: issue-1959
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
{%- if grains.get('pythonversion')[0] != 2 %}
|
||||
{#- wheels are disabled because the pip cache dir will not be owned by the above issue-1959 user. Need to check this ASAP #}
|
||||
- no_binary: ':all:'
|
||||
|
|
|
@ -2,10 +2,12 @@
|
|||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
- distribute: True
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
pep8-pip:
|
||||
pip.installed:
|
||||
- name: pep8
|
||||
- bin_env: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
- require:
|
||||
- virtualenv: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
pip.installed:
|
||||
- name: pep8
|
||||
- bin_env: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
- require:
|
||||
- virtualenv: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('issue-2028-pip-installed') }}
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
- distribute: True
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
install_older_venv_1:
|
||||
pip.installed:
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
- distribute: True
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
pep8:
|
||||
pip.installed:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
pep8-pip:
|
||||
pip.installed:
|
||||
- name: pep8
|
||||
- bin_env: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('pip-installed-errors') }}
|
||||
pip.installed:
|
||||
- name: pep8
|
||||
- bin_env: {{ salt['runtests_helpers.get_salt_temp_dir_for_path']('pip-installed-errors') }}
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
virtualenv.managed:
|
||||
- system_site_packages: False
|
||||
- distribute: True
|
||||
{#- Provide the real path for the python executable in case tests are running inside a virtualenv #}
|
||||
- python: {{ salt.runtests_helpers.get_python_executable() }}
|
||||
|
||||
install_older_venv:
|
||||
pip.installed:
|
||||
|
|
Loading…
Add table
Reference in a new issue