From 169691ec5c70417e1701e9a985595f6d9dd206b8 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 21 May 2009 16:16:22 +0200
Subject: [PATCH] regen setup.py, striking some unused headers

--HG--
branch : trunk
---
 MANIFEST       |  4 ++++
 py/__init__.py | 14 ++++----------
 setup.py       |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index c315a35e9..658b84f10 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -248,6 +248,7 @@ py/test/dist/testing/test_mypickle.py
 py/test/dist/testing/test_nodemanage.py
 py/test/dist/testing/test_txnode.py
 py/test/dist/txnode.py
+py/test/funcargs.py
 py/test/looponfail/__init__.py
 py/test/looponfail/remote.py
 py/test/looponfail/testing/__init__.py
@@ -265,6 +266,7 @@ py/test/plugin/pytest_doctest.py
 py/test/plugin/pytest_eventlog.py
 py/test/plugin/pytest_execnetcleanup.py
 py/test/plugin/pytest_figleaf.py
+py/test/plugin/pytest_hooklog.py
 py/test/plugin/pytest_iocapture.py
 py/test/plugin/pytest_monkeypatch.py
 py/test/plugin/pytest_pdb.py
@@ -272,6 +274,7 @@ py/test/plugin/pytest_plugintester.py
 py/test/plugin/pytest_pocoo.py
 py/test/plugin/pytest_pylint.py
 py/test/plugin/pytest_pytester.py
+py/test/plugin/pytest_recwarn.py
 py/test/plugin/pytest_restdoc.py
 py/test/plugin/pytest_resultdb.py
 py/test/plugin/pytest_resultlog.py
@@ -292,6 +295,7 @@ py/test/testing/import_test/package/absolute_import_shared_lib.py
 py/test/testing/import_test/package/module_that_imports_shared_lib.py
 py/test/testing/import_test/package/shared_lib.py
 py/test/testing/import_test/package/test_import.py
+py/test/testing/test_api.py
 py/test/testing/test_collect.py
 py/test/testing/test_compat.py
 py/test/testing/test_config.py
diff --git a/py/__init__.py b/py/__init__.py
index 5ff8de317..b89db91d1 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -1,17 +1,15 @@
 
 # -*- coding: utf-8 -*-
 """
-The py lib is an extensible library for testing, distributed processing and 
-interacting with filesystems. 
+advanced testing and development support library: 
 
 - `py.test`_: cross-project testing tool with many advanced features
 - `py.execnet`_: ad-hoc code distribution to SSH, Socket and local sub processes
 - `py.path`_: path abstractions over local and subversion files 
 - `py.code`_: dynamic code compile and traceback printing support
 
-The py lib and its tools should work well on Linux, Win32, 
-OSX, Python versions 2.3-2.6.  For questions please go to
-http://pylib.org/contact.html
+Compatibility: Linux, Win32, OSX, Python versions 2.3-2.6. 
+For questions please check out http://pylib.org/contact.html
 
 .. _`py.test`: http://pylib.org/test.html
 .. _`py.execnet`: http://pylib.org/execnet.html
@@ -24,12 +22,9 @@ from initpkg import initpkg
 version = "1.0.0b2"
 
 initpkg(__name__,
-    description = "pylib and py.test: agile development and test support library",
-    revision = int('$LastChangedRevision: 65143 $'.split(':')[1][:-1]),
-    lastchangedate = '$LastChangedDate: 2009-05-07 19:37:45 +0200 (Thu, 07 May 2009) $',
+    description = "py.test and pylib: advanced testing tool and networking lib", 
     version = version, 
     url = "http://pylib.org", 
-    download_url = "http://codespeak.net/py/%s/download.html" % version,
     license = "MIT license",
     platforms = ['unix', 'linux', 'osx', 'cygwin', 'win32'],
     author = "holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others",
@@ -49,7 +44,6 @@ initpkg(__name__,
         "Programming Language :: Python",
     ],
 
-
     # EXPORTED API 
     exportdefs = {
 
diff --git a/setup.py b/setup.py
index 44173381f..7b460506b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=64088
+        https://codespeak.net/svn/py/trunk, revision=65224
 
     autogenerated by gensetup.py
 """
 import os, sys
         
-from distutils.core import setup, Extension
+from distutils.core import setup
             
 long_description = """
 
@@ -33,11 +33,10 @@ http://pylib.org/contact.html
 def main():
     setup(
         name='py',
-        description='pylib and py.test: agile development and test support library',
+        description='py.test and pylib: advanced testing tool and networking lib',
         long_description = long_description, 
         version='1.0.0b2', 
         url='http://pylib.org', 
-        download_url='http://codespeak.net/py/1.0.0b2/download.html', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 
         author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',