diff --git a/circle.yml b/circle.yml index b970851c3a..09fefa5a74 100644 --- a/circle.yml +++ b/circle.yml @@ -27,6 +27,7 @@ dependencies: # dependency on a version range of pbr. # Install a version which falls within that range. - pip install --exists-action w pbr==0.9.0 + - pip install --exists-action w -r requirements/edx/django.txt - pip install --exists-action w -r requirements/edx/base.txt - pip install --exists-action w -r requirements/edx/paver.txt - pip install --exists-action w -r requirements/edx/testing.txt diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index 9571e6dd9e..8d123d857f 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -26,6 +26,7 @@ PYTHON_REQ_FILES = [ 'requirements/edx/pre.txt', 'requirements/edx/github.txt', 'requirements/edx/local.txt', + 'requirements/edx/django.txt', 'requirements/edx/base.txt', 'requirements/edx/paver.txt', 'requirements/edx/development.txt', diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 82ee0d1c69..5371d24d0f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -34,7 +34,6 @@ django-statici18n==1.4.0 django-storages==1.4.1 django-method-override==0.1.0 django-user-tasks==0.1.5 -django==1.8.18 django-waffle==0.12.0 djangorestframework-jwt==1.11.0 enum34==1.1.6 diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt new file mode 100644 index 0000000000..1dc7e115af --- /dev/null +++ b/requirements/edx/django.txt @@ -0,0 +1 @@ +Django==1.8.18 diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 5971db5ac6..28cbb66860 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -9,6 +9,7 @@ # Requirements for the web application -r ../edx/pre.txt +-r ../edx/django.txt -r ../edx/base.txt -r ../edx/local.txt -r ../edx/github.txt