diff --git a/requirements.txt b/requirements.txt index 56e6917..5a5a649 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ +.[validation] -r requirements/heroku.txt diff --git a/requirements/base.txt b/requirements/base.txt index 4951db1..14a1855 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,3 +6,7 @@ inflection>=0.3.1 future>=0.16.0 six>=1.11.0 uritemplate>=3.0.0 + +djangorestframework>=3.7.0 +Django>=1.11.7,<2.0; python_version <= "2.7" +Django>=1.11.7; python_version >= "3.4" diff --git a/requirements/heroku.txt b/requirements/heroku.txt index 3b41dc2..7b7453a 100644 --- a/requirements/heroku.txt +++ b/requirements/heroku.txt @@ -1,8 +1,4 @@ # requirements necessary when deploying the test project to heroku -.[validation] -Django>=1.11.7,<2.0; python_version <= "2.7" -Django>=1.11.7; python_version >= "3.4" - -r testproj.txt psycopg2>=2.7.3 gunicorn>=19.7.1 diff --git a/setup.py b/setup.py index 2ecda55..f462f5b 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def read_req(req_file): with io.open('README.rst', encoding='utf-8') as readme: description = readme.read() -requirements = ['djangorestframework>=3.7.0'] + read_req('base.txt') +requirements = read_req('base.txt') requirements_setup = read_req('setup.txt') requirements_validation = read_req('validation.txt') diff --git a/testproj/requirements.txt b/testproj/requirements.txt index c1ff544..67cd530 100644 --- a/testproj/requirements.txt +++ b/testproj/requirements.txt @@ -1,4 +1,2 @@ ..[validation] -Django>=1.11.7,<2.0; python_version <= "2.7" -Django>=1.11.7; python_version >= "3.4" -r ../requirements/testproj.txt