add py.test version to verbose reporting
correctly regen setup --HG-- branch : 1.0.x
This commit is contained in:
parent
2b12f3f538
commit
a137b62370
4
MANIFEST
4
MANIFEST
|
@ -1,5 +1,5 @@
|
||||||
MANIFEST
|
MANIFEST
|
||||||
py/__init__.py
|
py/test/plugin/pytest_terminal.py
|
||||||
setup.py
|
setup.py
|
||||||
.hgignore
|
.hgignore
|
||||||
.hgtags
|
.hgtags
|
||||||
|
@ -61,6 +61,7 @@ example/pytest/test_failures.py
|
||||||
example/pytest/test_setup_flow_example.py
|
example/pytest/test_setup_flow_example.py
|
||||||
ez_setup.py
|
ez_setup.py
|
||||||
py/LICENSE
|
py/LICENSE
|
||||||
|
py/__init__.py
|
||||||
py/_com.py
|
py/_com.py
|
||||||
py/bin/_findpy.py
|
py/bin/_findpy.py
|
||||||
py/bin/_genscripts.py
|
py/bin/_genscripts.py
|
||||||
|
@ -330,7 +331,6 @@ py/test/plugin/pytest_restdoc.py
|
||||||
py/test/plugin/pytest_resultdb.py
|
py/test/plugin/pytest_resultdb.py
|
||||||
py/test/plugin/pytest_resultlog.py
|
py/test/plugin/pytest_resultlog.py
|
||||||
py/test/plugin/pytest_runner.py
|
py/test/plugin/pytest_runner.py
|
||||||
py/test/plugin/pytest_terminal.py
|
|
||||||
py/test/plugin/pytest_tmpdir.py
|
py/test/plugin/pytest_tmpdir.py
|
||||||
py/test/plugin/pytest_unittest.py
|
py/test/plugin/pytest_unittest.py
|
||||||
py/test/plugin/pytest_xfail.py
|
py/test/plugin/pytest_xfail.py
|
||||||
|
|
|
@ -204,6 +204,7 @@ class TerminalReporter:
|
||||||
msg = "python: platform %s -- Python %s" % (sys.platform, verinfo)
|
msg = "python: platform %s -- Python %s" % (sys.platform, verinfo)
|
||||||
if self.config.option.verbose or self.config.option.debug:
|
if self.config.option.verbose or self.config.option.debug:
|
||||||
msg += " -- " + str(sys.executable)
|
msg += " -- " + str(sys.executable)
|
||||||
|
msg += " -- pytest-%s" % (py.__version__)
|
||||||
self.write_line(msg)
|
self.write_line(msg)
|
||||||
|
|
||||||
if self.config.option.debug or self.config.option.traceconfig:
|
if self.config.option.debug or self.config.option.traceconfig:
|
||||||
|
|
57
setup.py
57
setup.py
|
@ -2,13 +2,9 @@
|
||||||
autogenerated by gensetup.py
|
autogenerated by gensetup.py
|
||||||
setup file for 'py' package based on:
|
setup file for 'py' package based on:
|
||||||
|
|
||||||
changeset: 1170:4fa7081c2758
|
tags: tip
|
||||||
branch: 1.0.x
|
branch: 1.0.x
|
||||||
tag: tip
|
revision: 1173:33348724fd55e40d1dfaab26575811a1ecdd38f1
|
||||||
user: holger krekel <holger@merlinux.eu>
|
|
||||||
date: Wed Jun 24 16:04:42 2009 +0200
|
|
||||||
summary: add test and fix keyword recogniation, thanks Andreas Kloeckner
|
|
||||||
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
import os, sys
|
import os, sys
|
||||||
|
@ -66,7 +62,52 @@ def main():
|
||||||
'Topic :: System :: Distributed Computing',
|
'Topic :: System :: Distributed Computing',
|
||||||
'Topic :: Utilities',
|
'Topic :: Utilities',
|
||||||
'Programming Language :: Python'],
|
'Programming Language :: Python'],
|
||||||
packages=[],
|
packages=['py.builtin',
|
||||||
|
'py.builtin.testing',
|
||||||
|
'py.cmdline',
|
||||||
|
'py.cmdline.testing',
|
||||||
|
'py.code',
|
||||||
|
'py.code.testing',
|
||||||
|
'py.compat',
|
||||||
|
'py.compat.testing',
|
||||||
|
'py.execnet',
|
||||||
|
'py.execnet.script',
|
||||||
|
'py.execnet.testing',
|
||||||
|
'py.io',
|
||||||
|
'py.io.testing',
|
||||||
|
'py.log',
|
||||||
|
'py.log.testing',
|
||||||
|
'py.magic',
|
||||||
|
'py.magic.testing',
|
||||||
|
'py.misc',
|
||||||
|
'py.misc.cmdline',
|
||||||
|
'py.misc.testing',
|
||||||
|
'py.path',
|
||||||
|
'py.path.gateway',
|
||||||
|
'py.path.local',
|
||||||
|
'py.path.local.testing',
|
||||||
|
'py.path.svn',
|
||||||
|
'py.path.svn.testing',
|
||||||
|
'py.path.testing',
|
||||||
|
'py.process',
|
||||||
|
'py.process.testing',
|
||||||
|
'py.rest',
|
||||||
|
'py.rest.testing',
|
||||||
|
'py.test',
|
||||||
|
'py.test.dist',
|
||||||
|
'py.test.dist.testing',
|
||||||
|
'py.test.looponfail',
|
||||||
|
'py.test.looponfail.testing',
|
||||||
|
'py.test.plugin',
|
||||||
|
'py.test.testing',
|
||||||
|
'py.test.testing.import_test.package',
|
||||||
|
'py.test.web',
|
||||||
|
'py.thread',
|
||||||
|
'py.thread.testing',
|
||||||
|
'py.tool',
|
||||||
|
'py.tool.testing',
|
||||||
|
'py.xmlobj',
|
||||||
|
'py.xmlobj.testing'],
|
||||||
package_data={'py': ['LICENSE',
|
package_data={'py': ['LICENSE',
|
||||||
'bin/_findpy.py',
|
'bin/_findpy.py',
|
||||||
'bin/_genscripts.py',
|
'bin/_genscripts.py',
|
||||||
|
|
Loading…
Reference in New Issue