Travis/tox: test with pytest 3.3 (#79)

* Travis/tox: test with pytest 3.3 * tox: complete envlist, fix whitespace
tarpas · Dec 8, 2017 · 647be0e · 647be0e
1 parent f040cc5
commit 647be0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ matrix:
       python: 2.7
     - env: TOXENV=py27-pytestfeatures
       python: 2.7
+
     - env: TOXENV=py34-pytest29
       python: 3.4
     - env: TOXENV=py35-pytest29
@@ -24,6 +25,8 @@ matrix:
       python: 3.6
     - env: TOXENV=py36-pytest32
       python: 3.6
+    - env: TOXENV=py36-pytest33
+      python: 3.6
     - env: TOXENV=py36-pytestmaster
       python: 3.6
     - env: TOXENV=py36-pytestfeatures

diff --git a/tox.ini b/tox.ini
@@ -1,15 +1,16 @@
 [tox]
-envlist = py{27,34,36}-pytest{29,31,32,master,features},py36-pytest32-xdist
+envlist = py{27,34,35,36}-pytest{29,31,32,33,master,features},py36-pytest32-xdist
 
 [testenv]
 passenv = PYTHONPATH
 commands = py.test --tb=native {posargs:test}
 deps =
-	coverage_pth
+    coverage_pth
     xdist: pytest-xdist
     pytest29: pytest>=2.9,<3.0
     pytest31: pytest>=3.1,<3.2
     pytest32: pytest>=3.2,<3.3
+    pytest33: pytest>=3.3,<3.4
     # master is current stable version with bugfixes.
     pytestmaster: git+https://github.com/pytest-dev/pytest.git@master#egg=pytest
     # features is the next non-bugfix version.