Merge pull request #565 from CTPUG/feature/rework_django_test_matrix

Feature/rework django test matrix

.travis.yml

@@ -7,37 +7,19 @@ python:
    - "3.8"
    - "3.9-dev"
 env:
-   - DJANGO='django>=2.0,<2.1.0' TESTDB=sqlite
-   - DJANGO='django>=2.0,<2.1.0' TESTDB=postgres
-   - DJANGO='django>=2.1,<2.2.0' TESTDB=sqlite
-   - DJANGO='django>=2.1,<2.2.0' TESTDB=postgres
    - DJANGO='django>=2.2,<3.0' TESTDB=sqlite
    - DJANGO='django>=2.2,<3.0' TESTDB=postgres
    - DJANGO='django>=3.0,<3.1.0' TESTDB=sqlite
    - DJANGO='django>=3.0,<3.1.0' TESTDB=postgres
+   - DJANGO='django>=3.1,<3.2.0' TESTDB=sqlite
+   - DJANGO='django>=3.1,<3.2.0' TESTDB=postgres
    - DJANGO='https://github.com/django/django/archive/master.tar.gz' TESTDB=sqlite
    - DJANGO='https://github.com/django/django/archive/master.tar.gz' TESTDB=postgres
 
 matrix:
-   exclude:
-      - python: "3.8"
-        env: DJANGO='django>=2.0,<2.1.0' TESTDB=sqlite
-      - python: "3.8"
-        env: DJANGO='django>=2.0,<2.1.0' TESTDB=postgres
-      - python: "3.8"
-        env: DJANGO='django>=2.1,<2.2.0' TESTDB=sqlite
-      - python: "3.8"
-        env: DJANGO='django>=2.1,<2.2.0' TESTDB=postgres
-      - python: "3.9-dev"
-        env: DJANGO='django>=2.0,<2.1.0' TESTDB=sqlite
-      - python: "3.9-dev"
-        env: DJANGO='django>=2.0,<2.1.0' TESTDB=postgres
-      - python: "3.9-dev"
-        env: DJANGO='django>=2.1,<2.2.0' TESTDB=sqlite
-      - python: "3.9-dev"
-        env: DJANGO='django>=2.1,<2.2.0' TESTDB=postgres
-
    allow_failures:
+      - env: DJANGO='django>=3.1,<3.2.0' TESTDB=sqlite
+      - env: DJANGO='django>=3.1,<3.2.0' TESTDB=postgres
       - env: DJANGO='https://github.com/django/django/archive/master.tar.gz' TESTDB=postgres
       - env: DJANGO='https://github.com/django/django/archive/master.tar.gz' TESTDB=sqlite
 
@@ -52,8 +34,8 @@ before_install:
    - if [ "$TESTDB" = "postgres" ]; then pip install -q psycopg2 ; fi
 # command to install dependencies,
 install:
-   # Install the right version of Django first
-   - pip install "$DJANGO"
    - pip install -r requirements.txt -r requirements-dev.txt
+   # Install the right version of Django after we've installed wafer's version
+   - pip install "$DJANGO"
 # command to run tests
 script: NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test

setup.py

@@ -5,7 +5,7 @@
 from setuptools import find_packages, setup
 
 REQUIRES = [
-    'Django>=2.0, <3.0',
+    'Django>=2.2,<3.1',
     'django-crispy-forms',
     'django-nose',
     'django-registration-redux',