From 1842e2038ae123e16601e083a553fe931f34fbd0 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 21 Jun 2019 15:36:25 +0200 Subject: [PATCH 1/2] tests: Update unittest local variable name for Python 3.8 --- parameterized/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parameterized/test.py b/parameterized/test.py index 5e506f5..6b8e4d2 100644 --- a/parameterized/test.py +++ b/parameterized/test.py @@ -252,7 +252,8 @@ def _assert_docstring(self, expected_docstring, rstrip=False): f_locals = stack[3][0].f_locals test_method = ( f_locals.get("testMethod") or # Py27 - f_locals.get("function") # Py33 + f_locals.get("function") or # Py33 + f_locals.get("method") # Py38 ) if test_method is None: raise AssertionError("uh oh, unittest changed a local variable name") From d804fa69d469c9d724975004f5a4be5df8195524 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 21 Jun 2019 15:46:23 +0200 Subject: [PATCH 2/2] Update Travis CI config w.r.t. pytest tox configuration --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b277b4b..3d80246 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,9 @@ matrix: python: "2.7" - env: "TOXENV=py27-nose2" python: "2.7" - - env: "TOXENV=py27-pytest" + - env: "TOXENV=py27-pytest2" + python: "2.7" + - env: "TOXENV=py27-pytest3" python: "2.7" - env: "TOXENV=py27-unit" python: "2.7" @@ -16,7 +18,9 @@ matrix: python: "3.5" - env: "TOXENV=py35-nose2" python: "3.5" - - env: "TOXENV=py35-pytest" + - env: "TOXENV=py35-pytest2" + python: "3.5" + - env: "TOXENV=py35-pytest3" python: "3.5" - env: "TOXENV=py35-unit" python: "3.5" @@ -26,7 +30,9 @@ matrix: python: "3.6" - env: "TOXENV=py36-nose2" python: "3.6" - - env: "TOXENV=py36-pytest" + - env: "TOXENV=py36-pytest2" + python: "3.6" + - env: "TOXENV=py36-pytest3" python: "3.6" - env: "TOXENV=py36-unit" python: "3.6" @@ -36,7 +42,9 @@ matrix: python: "pypy" - env: "TOXENV=pypy-nose2" python: "pypy" - - env: "TOXENV=pypy-pytest" + - env: "TOXENV=pypy-pytest2" + python: "pypy" + - env: "TOXENV=pypy-pytest3" python: "pypy" - env: "TOXENV=pypy-unit" python: "pypy"