jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Pfannschmidt.
This commit is contained in:
holger krekel 2014-09-05 15:34:01 +02:00
parent b14b9515a5
commit 09a44f4cac
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
NEXT
-----------
- fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny
Pfannschmidt.
2.6.2 2.6.2
----------- -----------

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.6.2' __version__ = '2.6.3.dev'

2
doc/en/goodpractises.txt
View File

@ -233,7 +233,7 @@ get started with setuptools integration::
def initialize_options(self): def initialize_options(self):
TestCommand.initialize_options(self) TestCommand.initialize_options(self)
self.pytest_args = None self.pytest_args = []
def finalize_options(self): def finalize_options(self):
TestCommand.finalize_options(self) TestCommand.finalize_options(self)

2
setup.py
View File

@ -27,7 +27,7 @@ def main():
name='pytest', name='pytest',
description='pytest: simple powerful testing with Python', description='pytest: simple powerful testing with Python',
long_description=long_description, long_description=long_description,
version='2.6.2', version='2.6.3.dev',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],