Merge pull request #30 from moshthepitt/better-testing

Better testing
moshthepitt · Dec 29, 2018 · dc687b6 · dc687b6
2 parents dca40de + 17555fb
commit dc687b6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,15 @@ matrix:
         - python: 3.6
           env: TOXENV=pylint
         - python: 3.6
-          env: TOXENV=py36
+          env: TOXENV=py36-django20
+        - python: 3.6
+          env: TOXENV=py36-django21
+        - python: 3.7
+          env: TOXENV=py37-django20
+          dist: xenial
+        - python: 3.7
+          env: TOXENV=py37-django21
+          dist: xenial
 services:
     - postgresql
 addons:

diff --git a/setup.py b/setup.py
@@ -22,6 +22,7 @@
     ],
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6'
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7'
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     flake8
     pylint
-    py36
+    py36-django{20,21}
+    py37-django{20,21}
 
 [testenv:flake8]
 deps =
@@ -20,12 +21,16 @@ commands =
     pip install -r requirements/dev.txt
     pylint --rcfile={toxinidir}/.pylintrc {toxinidir}/vega_admin
 
-[testenv:py36]
+[testenv]
 deps =
     coverage
-basepython = python3.6
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+basepython =
+    py36: python3.6
+    py37: python3.7
 commands =
-    pip install -r requirements/dev.txt
+    pip install -r requirements/dev.in
     coverage erase
     coverage run --include="vega_admin/**.*" --omit="tests/**.*,vega_admin/migrations/**.*" manage.py test {toxinidir}/tests
     coverage report