From 47e78b37fe65fd6d71265962980244551432a106 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 30 Dec 2017 20:55:45 +0100 Subject: [PATCH] tox: use older pytest only for py26/py33 Follow-up to https://github.com/davidhalter/parso/commit/73439d5863daea. --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5b5246a..4b6d3b2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,13 +2,14 @@ envlist = py26, py27, py33, py34, py35, py36 [testenv] deps = - pytest>=3.0.7, < 3.3 + {env:_PARSO_TEST_PYTEST_DEP:pytest>=3.0.7} # For --lf and --ff. pytest-cache setenv = # https://github.com/tomchristie/django-rest-framework/issues/1957 # tox corrupts __pycache__, solution from here: PYTHONDONTWRITEBYTECODE=1 + py26,py33: _PARSO_TEST_PYTEST_DEP=pytest>=3.0.7,<3.3 commands = pytest {posargs:parso test} [testenv:cov]