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

fix issue365 and depend on a newer py versions which uses colorama 

for coloring instead of its own ctypes hacks.
This commit is contained in:
holger krekel 2013-10-03 17:46:36 +02:00
parent ae090740c5
commit cb65c56037
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,12 +1,15 @@
Changes between 2.4.1 and 2.4.2 Changes between 2.4.1 and 2.4.2
----------------------------------- -----------------------------------
- on Windows require colorama and a newer py lib so that py.io.TerminalWriter()
now uses colorama instead of its own ctypes hacks. (fixes issue365)
- fix "-k" matching of tests where "repr" and "attr" and other names would - fix "-k" matching of tests where "repr" and "attr" and other names would
cause wrong matches because of an internal implementation quirk cause wrong matches because of an internal implementation quirk
(don't ask) which is now properly implemented. fixes issue345. (don't ask) which is now properly implemented. fixes issue345.
- avoid "IOError: Bad Filedescriptor" on pytest shutdown by not closing - avoid "IOError: Bad Filedescriptor" on pytest shutdown by not closing
the internal dupped stdout (fix is slightly hand-wavy but work). the internal dupped stdout (fix is slightly hand-wavy but works).
- avoid tmpdir fixture to create too long filenames especially - avoid tmpdir fixture to create too long filenames especially
when parametrization is used (issue354) when parametrization is used (issue354)
@ -21,6 +24,7 @@ Changes between 2.4.1 and 2.4.2
details of the node.keywords pseudo-dicts. Adapated details of the node.keywords pseudo-dicts. Adapated
docs. docs.
Changes between 2.4.0 and 2.4.1 Changes between 2.4.0 and 2.4.1
----------------------------------- -----------------------------------

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.4.2.dev1' __version__ = '2.4.2'

6
setup.py
View File

@ -3,15 +3,17 @@ from setuptools import setup, Command
long_description = open("README.rst").read() long_description = open("README.rst").read()
def main(): def main():
install_requires = ["py>=1.4.16"] install_requires = ["py>=1.4.17.dev2"]
if sys.version_info < (2,7): if sys.version_info < (2,7):
install_requires.append("argparse") install_requires.append("argparse")
if sys.platform == "win32":
install_requires.append("colorama")
setup( setup(
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.4.2.dev1', version='2.4.2',
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'],