Update test matrix

jpvanhal · jpvanhal · commit 78f468f8f1a0 · 2018-05-19T14:07:51.000+03:00
* Drop support for Python 2.6 and 3.3
* Add support for Python 3.6 and 3.7
* Test against latest pytest 2.x and 3.x
* Use pytest-xdist&lt;1.18.0 for pytest 2.x. pytest-xdist 1.18.0 requires
  pytest&gt;=3.0.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,26 @@
 language: python
-python:
-  - 2.7
-env:
-  matrix:
-    # Please use "tox --listenvs" to populate the build matrix below.
-    - TESTENV=py26-pytest29
-    - TESTENV=py27-pytest29
-    - TESTENV=py33-pytest29
-    - TESTENV=py34-pytest29
-    - TESTENV=py35-pytest29
-    - TESTENV=pypy-pytest29
-    - TESTENV=py26-pytest30
-    - TESTENV=py27-pytest30
-    - TESTENV=py33-pytest30
-    - TESTENV=py34-pytest30
-    - TESTENV=py35-pytest30
-    - TESTENV=pypy-pytest30
+matrix:
+  include:
+    - python: 2.7
+      env: TESTENV=py27-pytest2
+    - python: 2.7
+      env: TESTENV=py27-pytest3
+    - python: 3.4
+      env: TESTENV=py34-pytest2
+    - python: 3.4
+      env: TESTENV=py34-pytest3
+    - python: 3.5
+      env: TESTENV=py35-pytest2
+    - python: 3.5
+      env: TESTENV=py35-pytest3
+    - python: 3.6
+      env: TESTENV=py36-pytest2
+    - python: 3.6
+      env: TESTENV=py36-pytest3
+    - python: 3.7-dev
+      env: TESTENV=py37-pytest2
+    - python: 3.7-dev
+      env: TESTENV=py37-pytest3
 install:
   - pip install -U tox
 script:
diff --git a/setup.py b/setup.py
@@ -26,12 +26,12 @@
         'Topic :: Software Development :: Libraries',
         'Topic :: Utilities',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
     ]
 )
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 envlist =
-  py{26,27,33,34,35,py}-pytest{29,30}
+  py{27,34,35,36,37,py}-pytest{2,3}
 
 [testenv]
 deps =
     pexpect
-    pytest29: pytest~=2.9.2
-    pytest30: pytest~=3.0.2
-    pytest-xdist
+    pytest2: pytest<3.0
+    pytest2: pytest-xdist<1.18.0
+    pytest3: pytest>3.0
+    pytest3: pytest-xdist
 commands = py.test {posargs}
