[Pytest-commit] commit/pytest: hpk42: fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/2cf48d77a376/
Changeset:   2cf48d77a376
User:        hpk42
Date:        2014-09-05 15:34:01
Summary:     fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny
Pfannschmidt.
Affected #:  4 files

diff -r 1a64df368b2746f35ac479cad426515283b25722 -r 2cf48d77a3764a1c3cf47ec3c63a972d35ad63d4 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+NEXT
+-----------
+
+- fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny
+  Pfannschmidt.
+
+
 2.6.2
 -----------
 

diff -r 1a64df368b2746f35ac479cad426515283b25722 -r 2cf48d77a3764a1c3cf47ec3c63a972d35ad63d4 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.6.2'
+__version__ = '2.6.3.dev'

diff -r 1a64df368b2746f35ac479cad426515283b25722 -r 2cf48d77a3764a1c3cf47ec3c63a972d35ad63d4 doc/en/goodpractises.txt
--- a/doc/en/goodpractises.txt
+++ b/doc/en/goodpractises.txt
@@ -233,7 +233,7 @@
 
         def initialize_options(self):
             TestCommand.initialize_options(self)
-            self.pytest_args = None
+            self.pytest_args = []
 
         def finalize_options(self):
             TestCommand.finalize_options(self)

diff -r 1a64df368b2746f35ac479cad426515283b25722 -r 2cf48d77a3764a1c3cf47ec3c63a972d35ad63d4 setup.py
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
         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'],

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.