diff --git a/CHANGELOG b/CHANGELOG index e88387dc4..9328242b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ Changes between 2.0.3 and 2.1.0.DEV - fix issue48: typo in MarkInfo repr leading to exception - fix issue49: avoid confusing error when initizaliation partially fails - fix issue44: env/username expansion for junitxml file path +- show releaselevel information for pypy Changes between 2.0.2 and 2.0.3 ---------------------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 0d9a6e1ef..f00124edc 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.1.0.dev9' +__version__ = '2.1.0.dev10' diff --git a/_pytest/terminal.py b/_pytest/terminal.py index c96e63519..eaa0ae7d0 100644 --- a/_pytest/terminal.py +++ b/_pytest/terminal.py @@ -259,7 +259,7 @@ class TerminalReporter: msg = "platform %s -- Python %s" % (sys.platform, verinfo) if hasattr(sys, 'pypy_version_info'): 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__) if self.verbosity > 0 or self.config.option.debug or \ getattr(self.config.option, 'pastebin', None): diff --git a/setup.py b/setup.py index 58cffc71e..33ed2c233 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.0.dev9', + version='2.1.0.dev10', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],