refactor dependencies for tox build

zhushida775 · Feb 18, 2018 · 6dad1e6 · 6dad1e6
1 parent ccf7ac5
commit 6dad1e6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/requirements/common.txt b/requirements/common.txt
@@ -1,5 +1,5 @@
+django-admin-sortable2==0.6.19
 django-allauth==0.23.0
-django-angular==1.1.4
 django-appconf==1.0.2
 django-classy-tags==0.8.0
 django-cms==3.4.5

diff --git a/requirements/django110.txt b/requirements/django110.txt
@@ -0,0 +1,4 @@
+django<1.11
+django-select2<6.1
+django-angular<2.1
+-r common.txt
diff --git a/requirements/django111.txt b/requirements/django111.txt
@@ -0,0 +1,4 @@
+django<2.0
+django-select2<6.1
+django-angular<2.1
+-r common.txt
diff --git a/requirements/django19.txt b/requirements/django19.txt
@@ -0,0 +1,4 @@
+django<1.10
+django-select2<6.0
+django-angular<1.2
+-r common.txt
diff --git a/requirements/py2.txt b/requirements/py2.txt
diff --git a/requirements/test_py2.txt b/requirements/test_py2.txt
@@ -1,3 +1,3 @@
 -r test.txt
--r py2.txt
+enum34==1.1.6
 funcsigs==1.0.2
diff --git a/requirements/test_py3.txt b/requirements/test_py3.txt
diff --git a/tox.ini b/tox.ini
@@ -7,16 +7,13 @@ usedevelop = True
 install_command = pip install --no-deps {opts} {packages}
 commands = coverage run -a {envbindir}/py.test example
 deps =
-    django19: django<1.10
-    django19: django-select2<6.0
-    django110: django<1.11
-    django110: django-select2<6.1
-    django111: django<2.0
-    django111: django-select2<6.1
+    django19: -r{toxinidir}/requirements/django19.txt
+    django110: -r{toxinidir}/requirements/django110.txt
+    django111: -r{toxinidir}/requirements/django111.txt
     py27: -r{toxinidir}/requirements/test_py2.txt
-    py34: -r{toxinidir}/requirements/test_py3.txt
-    py35: -r{toxinidir}/requirements/test_py3.txt
-    py36: -r{toxinidir}/requirements/test_py3.txt
+    py34: -r{toxinidir}/requirements/test.txt
+    py35: -r{toxinidir}/requirements/test.txt
+    py36: -r{toxinidir}/requirements/test.txt
 setenv =
     DJANGO_SHOP_TUTORIAL = i18n_polymorphic
     DJANGO_DEBUG = 1