From a137b6237022cdc7adb6e86e79cb9d1bb6f979bf Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 24 Jun 2009 16:57:55 +0200
Subject: [PATCH] add py.test version to verbose reporting correctly regen
 setup

--HG--
branch : 1.0.x
---
 MANIFEST                          |  4 +--
 py/test/plugin/pytest_terminal.py |  1 +
 setup.py                          | 57 ++++++++++++++++++++++++++-----
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 2919e5156..5b3176209 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,5 @@
 MANIFEST
-py/__init__.py
+py/test/plugin/pytest_terminal.py
 setup.py
 .hgignore
 .hgtags
@@ -61,6 +61,7 @@ example/pytest/test_failures.py
 example/pytest/test_setup_flow_example.py
 ez_setup.py
 py/LICENSE
+py/__init__.py
 py/_com.py
 py/bin/_findpy.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_resultlog.py
 py/test/plugin/pytest_runner.py
-py/test/plugin/pytest_terminal.py
 py/test/plugin/pytest_tmpdir.py
 py/test/plugin/pytest_unittest.py
 py/test/plugin/pytest_xfail.py
diff --git a/py/test/plugin/pytest_terminal.py b/py/test/plugin/pytest_terminal.py
index 491c500a3..1133efbbd 100644
--- a/py/test/plugin/pytest_terminal.py
+++ b/py/test/plugin/pytest_terminal.py
@@ -204,6 +204,7 @@ class TerminalReporter:
         msg = "python: platform %s -- Python %s" % (sys.platform, verinfo)
         if self.config.option.verbose or self.config.option.debug:
             msg += " -- " + str(sys.executable)
+            msg += " -- pytest-%s" % (py.__version__)
         self.write_line(msg)
 
         if self.config.option.debug or self.config.option.traceconfig:
diff --git a/setup.py b/setup.py
index 610124d96..a1b14ea9d 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,9 @@
 autogenerated by gensetup.py
 setup file for 'py' package based on:
         
-changeset:   1170:4fa7081c2758
-branch:      1.0.x
-tag:         tip
-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
-         
+tags: tip
+branch: 1.0.x
+revision: 1173:33348724fd55e40d1dfaab26575811a1ecdd38f1
          
 """
 import os, sys
@@ -66,7 +62,52 @@ def main():
                      'Topic :: System :: Distributed Computing',
                      'Topic :: Utilities',
                      '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',
                              'bin/_findpy.py',
                              'bin/_genscripts.py',