Fix the changelog and dependencies for tox

This commit is contained in:
Ceridwen 2016-04-02 10:52:28 -04:00
parent 491b30c5d9
commit 08671fcf4a
2 changed files with 6 additions and 2 deletions

View File

@ -23,7 +23,7 @@
**Changes** **Changes**
* Fix (`#1351 <https://github.com/pytest-dev/pytest/issues/1351>`_): * Fix (`#1351`_):
explicitly passed parametrize ids do not get escaped to ascii. explicitly passed parametrize ids do not get escaped to ascii.
Thanks `@ceridwen`_ for the PR. Thanks `@ceridwen`_ for the PR.
@ -38,12 +38,13 @@
.. _@novas0x2a: https://github.com/novas0x2a .. _@novas0x2a: https://github.com/novas0x2a
.. _@kalekundert: https://github.com/kalekundert .. _@kalekundert: https://github.com/kalekundert
.. _@tareqalayan: https://github.com/tareqalayan .. _@tareqalayan: https://github.com/tareqalayan
.. _@ceridwen: https://github.com/ceridwen
.. _#1428: https://github.com/pytest-dev/pytest/pull/1428 .. _#1428: https://github.com/pytest-dev/pytest/pull/1428
.. _#1444: https://github.com/pytest-dev/pytest/pull/1444 .. _#1444: https://github.com/pytest-dev/pytest/pull/1444
.. _#1441: https://github.com/pytest-dev/pytest/pull/1441 .. _#1441: https://github.com/pytest-dev/pytest/pull/1441
.. _#1454: https://github.com/pytest-dev/pytest/pull/1454 .. _#1454: https://github.com/pytest-dev/pytest/pull/1454
.. _#1351: https://github.com/pytest-dev/pytest/issues/1351
2.9.2.dev1 2.9.2.dev1
========== ==========

View File

@ -18,6 +18,7 @@ deps=
[testenv:py26] [testenv:py26]
commands= py.test --lsof -rfsxX {posargs:testing} commands= py.test --lsof -rfsxX {posargs:testing}
deps= deps=
hypothesis<3.03
nose nose
mock<1.1 # last supported version for py26 mock<1.1 # last supported version for py26
@ -44,6 +45,7 @@ commands = flake8 pytest.py _pytest testing
deps=pytest-xdist>=1.13 deps=pytest-xdist>=1.13
mock mock
nose nose
hypothesis
commands= commands=
py.test -n1 -rfsxX {posargs:testing} py.test -n1 -rfsxX {posargs:testing}
@ -68,6 +70,7 @@ commands=
[testenv:py27-nobyte] [testenv:py27-nobyte]
deps=pytest-xdist>=1.13 deps=pytest-xdist>=1.13
hypothesis
distribute=true distribute=true
setenv= setenv=
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1