Install setuptools/Django development packages separately before installing the others.

This commit is contained in:
Chris Church
2014-03-31 14:08:03 -04:00
parent 89474973fc
commit 8901cd31e7
3 changed files with 7 additions and 1 deletions

View File

@@ -58,6 +58,8 @@ push:
# locally downloaded packages). # locally downloaded packages).
requirements: requirements:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
(cd requirements && pip install --no-index setuptools-2.2.tar.gz); \
(cd requirements && pip install --no-index Django-1.5.5.tar.gz); \
(cd requirements && pip install --no-index -r dev_local.txt); \ (cd requirements && pip install --no-index -r dev_local.txt); \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \
@@ -68,6 +70,8 @@ requirements:
# (downloading from PyPI if necessary). # (downloading from PyPI if necessary).
requirements_pypi: requirements_pypi:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
pip install setuptools==2.2; \
pip install Django==1.5.5; \
pip install -r requirements/dev.txt; \ pip install -r requirements/dev.txt; \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \

View File

@@ -1,8 +1,9 @@
# PIP requirements for AWX development/build environment (using only local # PIP requirements for AWX development/build environment (using only local
# packages). Install using "pip --no-index -r dev_local.txt". # packages). Install using "pip --no-index -r dev_local.txt".
distribute-0.7.3.zip # May need to install these packages separately the first time:
setuptools-2.2.tar.gz setuptools-2.2.tar.gz
distribute-0.7.3.zip
Django-1.5.5.tar.gz Django-1.5.5.tar.gz
# The following packages are bundled with AWX (in awx/lib/site-packages): # The following packages are bundled with AWX (in awx/lib/site-packages):

View File

@@ -1,6 +1,7 @@
# PIP requirements for AWX production environment (using only local packages). # PIP requirements for AWX production environment (using only local packages).
# Install using "pip --no-index -r prod_local.txt". # Install using "pip --no-index -r prod_local.txt".
# May need to install this package separately the first time:
Django-1.5.5.tar.gz Django-1.5.5.tar.gz
# The following packages are bundled with AWX (in awx/lib/site-packages): # The following packages are bundled with AWX (in awx/lib/site-packages):