External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Ignore awx venv

Browse Source 
- General usability / readibility improvements
This commit is contained in:
Shane McDonald
2021-05-11 18:15:51 -04:00
committed by Rebeccah
parent dfaa69be51
commit 256a47618f
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/utils/common.py
View File

@@ -14,6 +14,8 @@ import threading
import contextlib import contextlib
import tempfile import tempfile
import psutil import psutil
import traceback
import sys
from functools import reduce, wraps from functools import reduce, wraps
from decimal import Decimal from decimal import Decimal
@@ -898,25 +900,26 @@ def get_custom_venv_choices():
custom_venv_choices = [] custom_venv_choices = []
for venv_path in all_venv_paths: for venv_path in all_venv_paths:
try: if os.path.exists(venv_path):
if os.path.exists(venv_path): for d in os.listdir(venv_path):
custom_venv_choices.extend( if venv_path == settings.BASE_VENV_PATH and d == 'awx':
[os.path.join(venv_path, x) for x in os.listdir(venv_path) if os.path.exists(os.path.join(venv_path, x, 'bin', 'pip'))] continue
)
except Exception: if os.path.exists(os.path.join(venv_path, d, 'bin', 'pip')):
logger.exception("Encountered an error while discovering custom virtual environments.") custom_venv_choices.append(os.path.join(venv_path, d))
return custom_venv_choices return custom_venv_choices
def get_custom_venv_pip_freeze(venv_path): def get_custom_venv_pip_freeze(venv_path):
venv_path = os.path.join(venv_path, 'bin', 'pip') pip_path = os.path.join(venv_path, 'bin', 'pip')
try: try:
if os.path.exists(venv_path): freeze_data = subprocess.run([pip_path, "freeze"], capture_output=True)
freeze_data = subprocess.run([venv_path, "freeze"], capture_output=True) pip_data = (freeze_data.stdout).decode('UTF-8')
pip_data = (freeze_data.stdout).decode('UTF-8') return pip_data
return pip_data
except Exception: except Exception:
logger.exception("Encountered an error while discovering Pip Freeze data for custom virtual environments.") logger.exception("Encountered an error while trying to run 'pip freeze' for custom virtual environments:")
def is_ansible_variable(key): def is_ansible_variable(key):