From 09a44f4cac2e54c6dfd658205c3e0ba3127aa95e Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 5 Sep 2014 15:34:01 +0200 Subject: [PATCH] fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny Pfannschmidt. --- CHANGELOG | 7 +++++++ _pytest/__init__.py | 2 +- doc/en/goodpractises.txt | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 09a928635..2fe971189 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +NEXT +----------- + +- fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny + Pfannschmidt. + + 2.6.2 ----------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 341423b72..1ad918750 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.6.2' +__version__ = '2.6.3.dev' diff --git a/doc/en/goodpractises.txt b/doc/en/goodpractises.txt index 1b5d26f4d..3a5743bda 100644 --- a/doc/en/goodpractises.txt +++ b/doc/en/goodpractises.txt @@ -233,7 +233,7 @@ get started with setuptools integration:: def initialize_options(self): TestCommand.initialize_options(self) - self.pytest_args = None + self.pytest_args = [] def finalize_options(self): TestCommand.finalize_options(self) diff --git a/setup.py b/setup.py index c7c265baa..0c55493ce 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def main(): name='pytest', description='pytest: simple powerful testing with Python', long_description=long_description, - version='2.6.2', + version='2.6.3.dev', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],