diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0a1178ecc..7bbfb4b0e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -23,7 +23,7 @@ **Changes** -* Fix (`#1351 `_): +* Fix (`#1351`_): explicitly passed parametrize ids do not get escaped to ascii. Thanks `@ceridwen`_ for the PR. @@ -38,12 +38,13 @@ .. _@novas0x2a: https://github.com/novas0x2a .. _@kalekundert: https://github.com/kalekundert .. _@tareqalayan: https://github.com/tareqalayan +.. _@ceridwen: https://github.com/ceridwen .. _#1428: https://github.com/pytest-dev/pytest/pull/1428 .. _#1444: https://github.com/pytest-dev/pytest/pull/1444 .. _#1441: https://github.com/pytest-dev/pytest/pull/1441 .. _#1454: https://github.com/pytest-dev/pytest/pull/1454 - +.. _#1351: https://github.com/pytest-dev/pytest/issues/1351 2.9.2.dev1 ========== diff --git a/tox.ini b/tox.ini index 82fe34b22..0876f510c 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ deps= [testenv:py26] commands= py.test --lsof -rfsxX {posargs:testing} deps= + hypothesis<3.03 nose mock<1.1 # last supported version for py26 @@ -44,6 +45,7 @@ commands = flake8 pytest.py _pytest testing deps=pytest-xdist>=1.13 mock nose + hypothesis commands= py.test -n1 -rfsxX {posargs:testing} @@ -68,6 +70,7 @@ commands= [testenv:py27-nobyte] deps=pytest-xdist>=1.13 + hypothesis distribute=true setenv= PYTHONDONTWRITEBYTECODE=1