Saner requirements

Joachim Jablon · Joachim Jablon · commit da845f36fe15 · 2016-09-05T08:24:13.000+02:00
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,2 @@
 django>=1.8
-
-# Additional requirements go here
+-e .
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,4 +1,4 @@
+-r requirements.txt
 bumpversion==0.5.3
 wheel==0.29.0
-django>=1.9.6
 sphinx>=1.4.6
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,10 +1,7 @@
-django>=1.9.6
+-r requirements.txt
 coverage==4.1
 mock>=1.0.1
 flake8>=2.1.0
 tox>=1.7.0
 psycopg2>=2.6.2
 dj_database_url>=0.4.1
-
-
-# Additional test requirements go here
diff --git a/tox.ini b/tox.ini
@@ -14,5 +14,5 @@ commands =
 deps =
     django-18: Django>=1.8,<1.9
     django-19: Django>=1.9,<1.10
-    django-110: Django>=1.10
+    django-110: Django>=1.10,<1.11
     -r{toxinidir}/requirements_test.txt

-Original file line number
+Diff line change
@@ @@ -1,3 +1,2 @@ @@
 django>=1.8
+-
 -# Additional requirements go here
 +-e .