Update make develop command, version check after package rename.

This commit is contained in:
Chris Church
2014-01-29 13:49:29 -05:00
committed by Matthew Jones
parent fee658e950
commit b6f623229b
2 changed files with 4 additions and 2 deletions

View File

@@ -72,12 +72,14 @@ requirements_pypi:
sudo pip install -r requirements/dev.txt; \ sudo pip install -r requirements/dev.txt; \
fi fi
# "Install" awx package in development mode. Creates link to working # "Install" ansible-tower package in development mode. Creates link to working
# copy in site-packages and installs awx-manage command. # copy in site-packages and installs awx-manage command.
develop: develop:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
pip uninstall -y awx; \
$(PYTHON) setup.py develop; \ $(PYTHON) setup.py develop; \
else \ else \
sudo pip uninstall -y awx; \
sudo $(PYTHON) setup.py develop; \ sudo $(PYTHON) setup.py develop; \
fi fi

View File

@@ -77,7 +77,7 @@ def get_ansible_version():
def get_awx_version(): def get_awx_version():
''' '''
Return AWX version as reported by setuptools. Return Ansible Tower version as reported by setuptools.
''' '''
from awx import __version__ from awx import __version__
try: try: