zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix some venv issues related to the new dev env

Browse Source
This commit is contained in:
Matthew Jones
2016-08-30 14:20:41 -04:00
parent f66fa6fb7c
commit 116e40dbe7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/development.py
View File

@@ -71,9 +71,9 @@ include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals()) include(optional('/etc/tower/conf.d/*.py'), scope=locals())
ANSIBLE_USE_VENV = True ANSIBLE_USE_VENV = True
ANSIBLE_VENV_PATH = "/tower_devel/venv/ansible" ANSIBLE_VENV_PATH = "/venv/ansible"
TOWER_USE_VENV = True TOWER_USE_VENV = True
TOWER_VENV_PATH = "/tower_devel/venv/tower" TOWER_VENV_PATH = "/venv/tower"
# If any local_*.py files are present in awx/settings/, use them to override # If any local_*.py files are present in awx/settings/, use them to override
# default settings for development. If not present, we can still run using # default settings for development. If not present, we can still run using

4
pytest.ini
View File

@@ -1,7 +1,7 @@
[pytest] [pytest]
DJANGO_SETTINGS_MODULE = awx.settings.development DJANGO_SETTINGS_MODULE = awx.settings.development
python_paths = venv/tower/lib/python2.7/site-packages python_paths = /venv/tower/lib/python2.7/site-packages
site_dirs = venv/tower/lib/python2.7/site-packages site_dirs = /venv/tower/lib/python2.7/site-packages
python_files = *.py python_files = *.py
addopts = --reuse-db --nomigrations --tb=native addopts = --reuse-db --nomigrations --tb=native
markers = markers =