Add support for Django 2.0. Drop support for Django 1.8, 1.9 (#5)

APSL · May 21, 2018 · 1a6b3e2 · 1a6b3e2
1 parent f9e6426
commit 1a6b3e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,30 +5,12 @@ services:
   - elasticsearch
 matrix:
   include:
-   - env: TOXENV=py27-dj18
-     python: 2.7
-   - env: TOXENV=pypy-dj18
-     python: pypy
-   - env: TOXENV=py34-dj18
-     python: 3.4
-   - env: TOXENV=py35-dj18
-     python: 3.5
-   - env: TOXENV=py36-dj18
-     python: 3.6
-   - env: TOXENV=py27-dj19
-     python: 2.7
-   - env: TOXENV=pypy-dj19
-     python: pypy
-   - env: TOXENV=py34-dj19
-     python: 3.4
-   - env: TOXENV=py35-dj19
-     python: 3.5
-   - env: TOXENV=py36-dj19
-     python: 3.6     
    - env: TOXENV=py27-dj110
      python: 2.7
    - env: TOXENV=pypy-dj110
      python: pypy
+   - env: TOXENV=pypy3-dj110
+     python: pypy3
    - env: TOXENV=py34-dj110
      python: 3.4
    - env: TOXENV=py35-dj110
@@ -39,14 +21,24 @@ matrix:
      python: 2.7
    - env: TOXENV=pypy-dj111
      python: pypy
+   - env: TOXENV=pypy3-dj111
+     python: pypy3
    - env: TOXENV=py34-dj111
      python: 3.4
    - env: TOXENV=py35-dj111
      python: 3.5
    - env: TOXENV=py36-dj111
-     python: 3.6    
-   - env: TOXENV=flake8
+     python: 3.6
+   - env: TOXENV=pypy3-dj20
+     python: pypy3
+   - env: TOXENV=py34-dj20
      python: 3.4
+   - env: TOXENV=py35-dj20
+     python: 3.5
+   - env: TOXENV=py36-dj20
+     python: 3.6
+   - env: TOXENV=flake8
+     python: 3.6
 before_install:
    # RethinkDB
    - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,py}-dj{18,19,110,111}, flake8
+envlist = py{27,34,35,36,py,py3}-dj{110,111,20}, flake8
 
 [flake8]
 max-line-length = 120
@@ -14,6 +14,7 @@ basepython =
     py35: python3.5
     py36: python3.6
     pypy: pypy
+    pypy3: pypy3
 
 deps =
     pytest==2.9.1
@@ -29,12 +30,11 @@ deps =
     redis
     six==1.10.0
 
-    dj18: Django>=1.8,<1.9
-    dj19: Django>=1.9,<1.10
     dj110: Django>=1.10,<1.11
     dj111: Django>=1.11,<2.0
+    dj20: Django>=2.0,<2.1
 
 [testenv:flake8]
-basepython = python3.4
+basepython = python3.6
 deps = flake8==2.5.4
 commands = flake8 kaneda django_kaneda tests