Add Python 3.7-3.8 and Django 2.1-2.2-3.0 in test matrix

.travis.yml

@@ -1,19 +1,18 @@
-sudo: false
-
 language: python
-
+cache: pip
+dist: xenial
 services:
  - postgresql
 
 install:
- - pip install coverage detox tox-travis flake8 psycopg2
+ - pip install coverage tox tox-venv tox-travis flake8 psycopg2
 
 before_script:
  - psql template1 -c 'create extension hstore;'
 
 script:
  - coverage erase
- - detox
+ - tox
  - flake8 django_admin_hstore_widget/
 
 after_success:
@@ -22,22 +21,30 @@ after_success:
  - pip install codecov
  - codecov
 
-env:
- - DJANGO=1.11
- - DJANGO=2.0
-
 matrix:
  fast_finish: true
  include:
+ # PYTHON 3.8
+ - { python: "3.8", env: DJANGO=3.0 }
+ # PYTHON 3.7
+ - { python: "3.7", env: DJANGO=3.0 }
+ - { python: "3.7", env: DJANGO=2.2 }
+ - { python: "3.7", env: DJANGO=2.1 }
+ - { python: "3.7", env: DJANGO=2.0 }
+ - { python: "3.7", env: DJANGO=1.11 }
+ # PYTHON 3.6
+ - { python: "3.6", env: DJANGO=3.0 }
+ - { python: "3.6", env: DJANGO=2.2 }
+ - { python: "3.6", env: DJANGO=2.1 }
  - { python: "3.6", env: DJANGO=2.0 }
  - { python: "3.6", env: DJANGO=1.11 }
+ # PYTHON 3.5
+ - { python: "3.5", env: DJANGO=2.2 }
+ - { python: "3.5", env: DJANGO=2.1 }
  - { python: "3.5", env: DJANGO=2.0 }
  - { python: "3.5", env: DJANGO=1.11 }
+ # PYTHON 3.4
  - { python: "3.4", env: DJANGO=2.0 }
  - { python: "3.4", env: DJANGO=1.11 }
+ # PYTHON 2.7
  - { python: "2.7", env: DJANGO=1.11 }
-
- exclude:
- - { python: "2.7", env: DJANGO=2.0 }
- - { env: DJANGO=2.0 }
- - { env: DJANGO=1.11 }

django_admin_hstore_widget/widgets.py

@@ -1,6 +1,6 @@
 try:
  from django.contrib.admin.templatetags.admin_static import static
-except ModuleNotFoundError:
+except ImportError:
  from django.templatetags.static import static
 from django.contrib.admin.widgets import AdminTextareaWidget
 from django.contrib.postgres.forms import forms

tox.ini

@@ -1,13 +1,20 @@
 [tox]
 envlist =
- {py27,py34,py35,py36}-django111,
- {py34,py35,py36}-django20,
+ {py27,py34,py35,py36,py37}-django111,
+ {py34,py35,py36,py37}-django20,
+ {py35,py36,py37}-django21,
+ {py35,py36,py37}-django22,
+ {py36,py37}-django30,
+ {py38}-django30,
 
 
 [travis:env]
 DJANGO =
  1.11: django111
  2.0: django20
+ 2.1: django21
+ 2.2: django22
+ 3.0: django30
 
 [latest]
 deps =
@@ -21,4 +28,7 @@ setenv =
 deps =
  django111: Django>=1.11,<2.0
  django20: Django>=2.0,<2.1
+ django21: Django>=2.1,<2.2
+ django22: Django>=2.2,<3.0
+ django30: Django>=3.0,<3.1
  -rrequirements/test-ci.txt