diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 76639e2e1..4a257c400 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.4.0.dev10' +__version__ = '2.4.0.dev11' diff --git a/setup.py b/setup.py index b4acccbe7..5f8339f3a 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.4.0.dev10', + version='2.4.0.dev11', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], diff --git a/tox.ini b/tox.ini index 368d86dfd..679574189 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,6 @@ basepython=python2.7 deps=pytest-xdist setenv= PYTHONDONTWRITEBYTECODE=1 -distribute=true commands= py.test -n3 -rfsxX \ --junitxml={envlogdir}/junit-{envname}.xml {posargs:testing}