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

Updating Django to 1.6.7 in revision txts.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-09-10 13:35:53 -05:00
parent 55b48204ea
commit 59f3321b13
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -65,7 +65,7 @@ push:
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 setuptools-2.2.tar.gz); \
(cd requirements && pip install --no-index Django-1.5.5.tar.gz); \ (cd requirements && pip install --no-index Django-1.6.7.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 \
@@ -77,7 +77,7 @@ requirements:
requirements_pypi: requirements_pypi:
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
pip install setuptools==2.2; \ pip install setuptools==2.2; \
pip install Django==1.5.5; \ pip install Django\>=1.6.7,\<1.7; \
pip install -r requirements/dev.txt; \ pip install -r requirements/dev.txt; \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \

BIN
requirements/Django-1.5.5.tar.gz
View File

Binary file not shown.

BIN
requirements/Django-1.6.7.tar.gz Normal file
View File

Binary file not shown.

2
requirements/dev.txt
View File

@@ -4,7 +4,7 @@
-U distribute -U distribute
# Packages used for both development and production: # Packages used for both development and production:
Django>=1.4 Django>=1.6.7,<1.7
# The following packages and their dependencies are bundled with AWX # The following packages and their dependencies are bundled with AWX
# (in awx/lib/site-packages): # (in awx/lib/site-packages):

2
requirements/dev_local.txt
View File

@@ -4,7 +4,7 @@
# May need to install these packages separately the first time: # 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 distribute-0.7.3.zip
Django-1.5.5.tar.gz Django-1.6.7.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):
# For Python2.6 support: # For Python2.6 support: