floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show release level info for pypy

This commit is contained in:
holger krekel 2011-07-06 10:18:11 +02:00
parent 758b5e3511
commit 92f8eef836
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -13,6 +13,7 @@ Changes between 2.0.3 and 2.1.0.DEV
- fix issue48: typo in MarkInfo repr leading to exception - fix issue48: typo in MarkInfo repr leading to exception
- fix issue49: avoid confusing error when initizaliation partially fails - fix issue49: avoid confusing error when initizaliation partially fails
- fix issue44: env/username expansion for junitxml file path - fix issue44: env/username expansion for junitxml file path
- show releaselevel information for pypy
Changes between 2.0.2 and 2.0.3 Changes between 2.0.2 and 2.0.3
---------------------------------------------- ----------------------------------------------

2
_pytest/__init__.py
View File

@ -1,2 +1,2 @@
# #
__version__ = '2.1.0.dev9' __version__ = '2.1.0.dev10'

2
_pytest/terminal.py
View File

@ -259,7 +259,7 @@ class TerminalReporter:
msg = "platform %s -- Python %s" % (sys.platform, verinfo) msg = "platform %s -- Python %s" % (sys.platform, verinfo)
if hasattr(sys, 'pypy_version_info'): if hasattr(sys, 'pypy_version_info'):
verinfo = ".".join(map(str, sys.pypy_version_info[:3])) verinfo = ".".join(map(str, sys.pypy_version_info[:3]))
msg += "[pypy-%s]" % verinfo msg += "[pypy-%s-%s]" % (verinfo, sys.pypy_version_info[3])
msg += " -- pytest-%s" % (py.test.__version__) msg += " -- pytest-%s" % (py.test.__version__)
if self.verbosity > 0 or self.config.option.debug or \ if self.verbosity > 0 or self.config.option.debug or \
getattr(self.config.option, 'pastebin', None): getattr(self.config.option, 'pastebin', None):

2
setup.py
View File

@ -22,7 +22,7 @@ def main():
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.1.0.dev9', version='2.1.0.dev10',
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'],