Commit 8eb5945e by John Eskew

Move Django requirement into separate file to enable tox testing.

parent 167472da
...@@ -27,6 +27,7 @@ dependencies: ...@@ -27,6 +27,7 @@ dependencies:
# dependency on a version range of pbr. # dependency on a version range of pbr.
# Install a version which falls within that range. # Install a version which falls within that range.
- pip install --exists-action w pbr==0.9.0 - 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/base.txt
- pip install --exists-action w -r requirements/edx/paver.txt - pip install --exists-action w -r requirements/edx/paver.txt
- pip install --exists-action w -r requirements/edx/testing.txt - pip install --exists-action w -r requirements/edx/testing.txt
......
...@@ -26,6 +26,7 @@ PYTHON_REQ_FILES = [ ...@@ -26,6 +26,7 @@ PYTHON_REQ_FILES = [
'requirements/edx/pre.txt', 'requirements/edx/pre.txt',
'requirements/edx/github.txt', 'requirements/edx/github.txt',
'requirements/edx/local.txt', 'requirements/edx/local.txt',
'requirements/edx/django.txt',
'requirements/edx/base.txt', 'requirements/edx/base.txt',
'requirements/edx/paver.txt', 'requirements/edx/paver.txt',
'requirements/edx/development.txt', 'requirements/edx/development.txt',
......
...@@ -34,7 +34,6 @@ django-statici18n==1.4.0 ...@@ -34,7 +34,6 @@ django-statici18n==1.4.0
django-storages==1.4.1 django-storages==1.4.1
django-method-override==0.1.0 django-method-override==0.1.0
django-user-tasks==0.1.5 django-user-tasks==0.1.5
django==1.8.18
django-waffle==0.12.0 django-waffle==0.12.0
djangorestframework-jwt==1.11.0 djangorestframework-jwt==1.11.0
enum34==1.1.6 enum34==1.1.6
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# Requirements for the web application # Requirements for the web application
-r ../edx/pre.txt -r ../edx/pre.txt
-r ../edx/django.txt
-r ../edx/base.txt -r ../edx/base.txt
-r ../edx/local.txt -r ../edx/local.txt
-r ../edx/github.txt -r ../edx/github.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment