Revert "add Django-1.11 to testing matrix"

This reverts commit f50f9d2.
zhushida775 · Nov 8, 2017 · e1528fa · e1528fa
1 parent c440b46
commit e1528fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ python:
 env:
   - DJANGOVER=django19
   - DJANGOVER=django110
-  - DJANGOVER=django111
   - TOX_ENV=docs
 
 install:

diff --git a/requirements/common.txt b/requirements/common.txt
@@ -51,3 +51,4 @@ urllib3==1.22
 virtualenv==13.1.2
 wheel==0.24.0
 bs4==0.0.1
+djangoshop-stripe==0.3.4
diff --git a/setup.py b/setup.py
@@ -45,19 +45,19 @@ def convert(filename, fmt):
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'Django>=1.9.12,<2.0',
+        'Django>=1.9.12,<1.11',
         'django-post-office>=3.0.0',
         'django-filer>=1.2.8',
         'django-ipware>=1.1.1',
         'django-fsm>=2.4.0',
         'django-fsm-admin>=1.2.4',
-        'djangorestframework>=3.7.3',
-        'django-angular>=1.1.4',
+        'djangorestframework>=3.6.3',
+        'django-angular>=1.1.2',
         'Django-Select2>=5.8.9',
         'django-rest-auth>=0.9.1',
         'django-admin-sortable2>=0.6.15',
         'django-formtools>=1.0',
-        'djangocms-cascade>=0.14.4',
+        'djangocms-cascade>=0.14.1',
         'bs4>=0.0.1',
     ],
     # Note: this requires setuptools >= 18.0.

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean, py{27,34,35,36}-django{19,110,111}, coverage-report
+envlist = coverage-clean, py{27,34,35,36}-django{19,110}, coverage-report
 
 [testenv]
 # usedevelop is needed to collect coverage data.
@@ -9,7 +9,6 @@ commands = coverage run -a {envbindir}/py.test example
 deps =
     django19: django<1.10
     django110: django<1.11
-    django111: django<2.0
     py27: -r{toxinidir}/requirements/test_py2.txt
     py34: -r{toxinidir}/requirements/test_py3.txt
     py35: -r{toxinidir}/requirements/test_py3.txt