Merge d284c00 into ebfdea6

carsongee · May 5, 2020 · 3188264 · 3188264
2 parents ebfdea6 + d284c00
commit 3188264
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,6 @@ matrix:
 install:
   - "pip install tox-travis tox==3.14.6 coveralls"
   - "pip install -e ."
-script: tox
+script: tox -p auto
 after_success:
   "coveralls"
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,17 @@
 [tox]
-envlist = py35,py36,py37,py38
+envlist = py3{6,7,8}-pylint{23,latest,master}-pytest{54,latest,master}
 skip_missing_interpreters =
     true
 [testenv]
 usedevelop = true
 deps =
-    pylint
-    pytest
+    pylint23: pylint>=2.3,<2.4
+    pylintlatest: pylint
+    pylintmaster: git+https://github.com/PyCQA/pylint.git@master#egg=pylint
+    pylintmaster: git+https://github.com/PyCQA/astroid.git@master#egg=astroid
+    pytest23: pytest>=5.4,<5.5
+    pytestlatest: pytest
+    pytestmaster: git+https://github.com/pytest-dev/pytest.git@master#egg=pytest
     pytest-flake8
     coverage
 commands =