Merge pull request #167 from asherf/tox

Switch to tox

Author: asherf

.travis.yml

@@ -6,41 +6,17 @@ python:
   - "3.7"
   - "3.8"
   - "2.7"
-env:
-  - DJANGO_VERSION=2.1
-  - DJANGO_VERSION=2.2
-  - DJANGO_VERSION=1.11
 services:
   - memcached
   - redis
   - mysql
   - postgresql
-matrix:
-  exclude:
-    - python: "2.7"
-      env: DJANGO_VERSION=2.1
-    - python: "2.7"
-      env: DJANGO_VERSION=2.2
-    - python: "3.8"
-      env: DJANGO_VERSION=1.11
-    - python: "3.7"
-      env: DJANGO_VERSION=1.11
-    - python: "3.6"
-      env: DJANGO_VERSION=1.11
 
 install:
-  - pip install coveralls codacy-coverage
-  - pip install -r requirements.txt
-  - pip install -q Django==$DJANGO_VERSION
-  - pip install --upgrade setuptools wheel
+  - pip install tox-travis coverage coveralls codacy-coverage
   - mysql -e 'create database django_prometheus_1;'
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION == "3.7" ]]; then black --check django_prometheus/; fi
-  - flake8 django_prometheus
-  - isort --check-only -rc django_prometheus/
-  - coverage run --source=django_prometheus setup.py test
-  - pushd  django_prometheus/tests/end2end && PYTHONPATH=../../.. coverage run --source=django_prometheus manage.py test &&  popd
-  - python setup.py sdist bdist_wheel
+  - tox
 after_success:
   - coverage combine .coverage django_prometheus/tests/end2end/.coverage
   - coveralls

requirements.txt

@@ -1,4 +1,3 @@
-Django>=1.11
 django-redis>=4.8
 black; python_version >= '3.6'
 flake8

tox.ini

@@ -1,3 +1,35 @@
+[tox]
+envlist = {py27,py35}-django{111}}-{end2end,unittests},
+          {py35,py36,py37,py38}-django{210,220}-{end2end,unittests},py37-lint
+
+[testenv]
+deps =
+    django111: Django>=1.11,<2.0
+    django210: Django>=2.1,<2.2
+    django220: Django>=2.2,<2.3
+    coverage
+    -rrequirements.txt
+skip_missing_interpreters=true
+
+changedir = 
+    end2end: {toxinidir}/django_prometheus/tests/end2end
+setenv =
+    end2end: PYTHONPATH = {toxinidir}
+commands =
+    end2end: coverage run --source=django_prometheus manage.py test
+    unittests: coverage run --source=django_prometheus setup.py test
+    unittests: python setup.py sdist bdist_wheel
+
+[testenv:lint]
+deps = 
+    black
+    flake8
+    isort
+commands =
+    black --check django_prometheus/
+    flake8 django_prometheus
+    isort --check-only -rc django_prometheus/
+
 [flake8]
 ignore = E501,W503