diff --git a/Makefile b/Makefile index 06a76bbf06..d9d413684d 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ push: requirements: @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 Django-1.6.7.tar.gz); \ (cd requirements && pip install --no-index -r dev_local.txt); \ $(PYTHON) fix_virtualenv_setuptools.py; \ else \ @@ -77,7 +77,7 @@ requirements: requirements_pypi: @if [ "$(VIRTUAL_ENV)" ]; then \ 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; \ $(PYTHON) fix_virtualenv_setuptools.py; \ else \ diff --git a/requirements/Django-1.5.5.tar.gz b/requirements/Django-1.5.5.tar.gz deleted file mode 100644 index 0fffd2ba0e..0000000000 Binary files a/requirements/Django-1.5.5.tar.gz and /dev/null differ diff --git a/requirements/Django-1.6.7.tar.gz b/requirements/Django-1.6.7.tar.gz new file mode 100644 index 0000000000..37ebbd0c90 Binary files /dev/null and b/requirements/Django-1.6.7.tar.gz differ diff --git a/requirements/dev.txt b/requirements/dev.txt index 9ee9ccb69f..2ea2ab125f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,7 +4,7 @@ -U distribute # 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 # (in awx/lib/site-packages): diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt index 708328f004..0463addb57 100644 --- a/requirements/dev_local.txt +++ b/requirements/dev_local.txt @@ -4,7 +4,7 @@ # May need to install these packages separately the first time: setuptools-2.2.tar.gz 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): # For Python2.6 support: