fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny

Pfannschmidt.
2014-09-05 15:34:01 +02:00 · 2014-09-05 15:34:01 +02:00 · 09a44f4cac
parent b14b9515a5
commit 09a44f4cac
4 changed files with 10 additions and 3 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+NEXT
+-----------
+
+- fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny
+  Pfannschmidt.
+
+
 2.6.2
 -----------

--- a/_pytest/init.py
+++ b/_pytest/init.py
@ -1,2 +1,2 @@
 #
-__version__ = '2.6.2'
+__version__ = '2.6.3.dev'
--- 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)
--- 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'],