[svn r63164] rebuild setup.py

--HG-- branch : trunk
2009-03-21 03:21:45 +01:00 · 2009-03-21 03:21:45 +01:00 · 074788e580
parent 75bfb84ea5
commit 074788e580
3 changed files with 69 additions and 107 deletions
--- a/129
+++ b/129
@ -6,61 +6,7 @@ TODO.txt
 ez_setup.py
 py/LICENSE
 py/__init__.py
-py/apigen/__init__.py
-py/apigen/api.js
-py/apigen/apigen.js
-py/apigen/apigen.py
-py/apigen/conftest.py
-py/apigen/html.py
-py/apigen/htmlgen.py
-py/apigen/layout.py
-py/apigen/linker.py
-py/apigen/project.py
-py/apigen/rest/__init__.py
-py/apigen/rest/genrest.py
-py/apigen/rest/htmlhandlers.py
-py/apigen/rest/testing/__init__.py
-py/apigen/rest/testing/somemodule.py
-py/apigen/rest/testing/someothermodule.py
-py/apigen/rest/testing/test_htmlhandlers.py
-py/apigen/rest/testing/test_rest.py
-py/apigen/source/__init__.py
-py/apigen/source/browser.py
-py/apigen/source/color.py
-py/apigen/source/html.py
-py/apigen/source/index.cgi
-py/apigen/source/path.py
-py/apigen/source/server.py
-py/apigen/source/testing/__init__.py
-py/apigen/source/testing/test_browser.py
-py/apigen/source/testing/test_color.py
-py/apigen/source/testing/test_html.py
-py/apigen/style.css
-py/apigen/testing/__init__.py
-py/apigen/testing/test_apigen_example.py
-py/apigen/testing/test_apigen_functional.py
-py/apigen/testing/test_htmlgen.py
-py/apigen/testing/test_linker.py
-py/apigen/todo-apigen.txt
-py/apigen/todo.txt
-py/apigen/tracer/__init__.py
-py/apigen/tracer/description.py
-py/apigen/tracer/docstorage.py
-py/apigen/tracer/magic.py
-py/apigen/tracer/model.py
-py/apigen/tracer/permastore.py
-py/apigen/tracer/testing/__init__.py
-py/apigen/tracer/testing/package/__init__.py
-py/apigen/tracer/testing/package/submodule/__init__.py
-py/apigen/tracer/testing/package/submodule/pak/__init__.py
-py/apigen/tracer/testing/package/submodule/pak/mod.py
-py/apigen/tracer/testing/package/submodule/pak/somenamespace.py
-py/apigen/tracer/testing/runtest.py
-py/apigen/tracer/testing/test_desc.py
-py/apigen/tracer/testing/test_docgen.py
-py/apigen/tracer/testing/test_model.py
-py/apigen/tracer/testing/test_package.py
-py/apigen/tracer/tracer.py
+py/_com.py
 py/bin/_findpy.py
 py/bin/_genscripts.py
 py/bin/gendoc.py
@ -151,15 +97,14 @@ py/compat/testing/test_textwrap.py
 py/compat/textwrap.py
 py/conftest.py
 py/doc/__init__.py
-py/doc/apigen.txt
 py/doc/apigen_refactorings.txt
 py/doc/bin.txt
 py/doc/code.txt
 py/doc/coding-style.txt
 py/doc/confrest.py
-py/doc/conftest.py
 py/doc/contact.txt
 py/doc/download.txt
+py/doc/draft_pyfs
 py/doc/example/genhtml.py
 py/doc/example/genhtmlcss.py
 py/doc/example/genxml.py
@ -179,8 +124,9 @@ py/doc/path.txt
 py/doc/release-0.9.0.txt
 py/doc/release-0.9.2.txt
 py/doc/style.css
+py/doc/test-config.txt
+py/doc/test-plugins.txt
 py/doc/test.txt
-py/doc/test_conftest.py
 py/doc/why_py.txt
 py/doc/xml.txt
 py/env.cmd
@ -189,8 +135,11 @@ py/execnet/NOTES
 py/execnet/__init__.py
 py/execnet/channel.py
 py/execnet/gateway.py
+py/execnet/gwmanage.py
+py/execnet/improve-remote-tracebacks.txt
 py/execnet/inputoutput.py
 py/execnet/message.py
+py/execnet/multi.py
 py/execnet/register.py
 py/execnet/rsync.py
 py/execnet/rsync_remote.py
@ -202,9 +151,15 @@ py/execnet/script/socketserver.py
 py/execnet/script/socketserverservice.py
 py/execnet/script/xx.py
 py/execnet/testing/__init__.py
+py/execnet/testing/conftest.py
+py/execnet/testing/test_event.py
 py/execnet/testing/test_gateway.py
+py/execnet/testing/test_gwmanage.py
+py/execnet/testing/test_multi.py
 py/execnet/testing/test_pickle.py
 py/execnet/testing/test_rsync.py
+py/execnet/testing/test_xspec.py
+py/execnet/xspec.py
 py/initpkg.py
 py/io/__init__.py
 py/io/dupfile.py
@ -257,6 +212,7 @@ py/misc/testing/__init__.py
 py/misc/testing/data/svnlookrepo.dump
 py/misc/testing/test_api.py
 py/misc/testing/test_cache.py
+py/misc/testing/test_com.py
 py/misc/testing/test_error.py
 py/misc/testing/test_initpkg.py
 py/misc/testing/test_std.py
@ -338,15 +294,15 @@ py/test/custompdb.py
 py/test/defaultconftest.py
 py/test/dsession/__init__.py
 py/test/dsession/dsession.py
-py/test/dsession/hostmanage.py
-py/test/dsession/masterslave.py
 py/test/dsession/mypickle.py
+py/test/dsession/nodemanage.py
 py/test/dsession/testing/__init__.py
 py/test/dsession/testing/test_dsession.py
 py/test/dsession/testing/test_functional_dsession.py
-py/test/dsession/testing/test_hostmanage.py
-py/test/dsession/testing/test_masterslave.py
 py/test/dsession/testing/test_mypickle.py
+py/test/dsession/testing/test_nodemanage.py
+py/test/dsession/testing/test_txnode.py
+py/test/dsession/txnode.py
 py/test/event.py
 py/test/looponfail/__init__.py
 py/test/looponfail/remote.py
@ -355,49 +311,52 @@ py/test/looponfail/testing/test_remote.py
 py/test/looponfail/testing/test_util.py
 py/test/looponfail/util.py
 py/test/outcome.py
+py/test/parseopt.py
+py/test/plugin/__init__.py
+py/test/plugin/conftest.py
+py/test/plugin/pytest_default.py
+py/test/plugin/pytest_doctest.py
+py/test/plugin/pytest_eventlog.py
+py/test/plugin/pytest_execnetcleanup.py
+py/test/plugin/pytest_iocapture.py
+py/test/plugin/pytest_monkeypatch.py
+py/test/plugin/pytest_plugintester.py
+py/test/plugin/pytest_pocoo.py
+py/test/plugin/pytest_pytester.py
+py/test/plugin/pytest_restdoc.py
+py/test/plugin/pytest_resultlog.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
 py/test/pycollect.py
-py/test/report/__init__.py
-py/test/report/base.py
-py/test/report/collectonly.py
-py/test/report/rest.py
-py/test/report/terminal.py
-py/test/report/testing/__init__.py
-py/test/report/testing/test_basereporter.py
-py/test/report/testing/test_collectonly.py
-py/test/report/testing/test_rest.py
-py/test/report/testing/test_terminal.py
-py/test/report/testing/test_web.py
-py/test/report/testing/test_webjs.py
-py/test/report/web.py
-py/test/report/webdata/__init__.py
-py/test/report/webdata/index.html
-py/test/report/webdata/json.py
-py/test/report/webdata/source.js
-py/test/report/webjs.py
-py/test/resultlog.py
+py/test/pytestplugin.py
 py/test/runner.py
 py/test/session.py
 py/test/testing/__init__.py
 py/test/testing/acceptance_test.py
+py/test/testing/conftest.py
 py/test/testing/import_test/package/__init__.py
 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/suptest.py
 py/test/testing/test_collect.py
 py/test/testing/test_compat.py
 py/test/testing/test_config.py
 py/test/testing/test_conftesthandle.py
 py/test/testing/test_deprecated_api.py
-py/test/testing/test_doctest.py
-py/test/testing/test_event.py
+py/test/testing/test_genitems.py
 py/test/testing/test_outcome.py
+py/test/testing/test_parseopt.py
+py/test/testing/test_pickling.py
+py/test/testing/test_pycollect.py
+py/test/testing/test_pytestplugin.py
 py/test/testing/test_recording.py
-py/test/testing/test_resultlog.py
 py/test/testing/test_runner_functional.py
 py/test/testing/test_session.py
 py/test/testing/test_setup_nested.py
+py/test/testing/test_traceback.py
 py/test/web/__init__.py
 py/test/web/exception.py
 py/test/web/post_multipart.py
--- a/py/init.py
+++ b/py/init.py
@ -23,22 +23,22 @@ http://pylib.org/contact.html
 """
 from initpkg import initpkg

-version = "1.0.0a1"
+version = "1.0.0a2"

 initpkg(__name__,
    description = "pylib and py.test: agile development and test support library",
-    revision = int('$LastChangedRevision: 63147 $'.split(':')[1][:-1]),
-    lastchangedate = '$LastChangedDate: 2009-03-20 17:28:14 +0100 (Fri, 20 Mar 2009) $',
+    revision = int('$LastChangedRevision: 63164 $'.split(':')[1][:-1]),
+    lastchangedate = '$LastChangedDate: 2009-03-21 03:21:45 +0100 (Sat, 21 Mar 2009) $',
    version = version, 
    url = "http://pylib.org", 
-    download_url = "http://codespeak.net/py/0.9.2/download.html",
+    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",
    author_email = "holger at merlinux.eu, py-dev at codespeak.net",
    long_description = globals()['__doc__'],
    classifiers = [
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 4 - Beta",
        "Intended Audience :: Developers", 
        "License :: OSI Approved :: MIT License",
        "Operating System :: POSIX",
--- a/setup.py
+++ b/setup.py
@ -1,7 +1,7 @@
 """
    setup file for 'py' package based on:

-        https://codespeak.net/svn/py/trunk, revision=58363
+        https://codespeak.net/svn/py/trunk, revision=63163

    autogenerated by gensetup.py
 """
@ -13,13 +13,14 @@ from setuptools import setup, Extension
        
 long_description = """

-The py lib is a development support library featuring these tools and APIs:
+The py lib is an extensible library for testing, distributed processing and 
+interacting with filesystems. 

 - `py.test`_: cross-project testing tool with many advanced features
 - `py.execnet`_: ad-hoc code distribution to SSH, Socket and local sub processes
- `py.magic.greenlet`_: micro-threads on standard CPython ("stackless-light") and PyPy
 - `py.path`_: path abstractions over local and subversion files 
 - `py.code`_: dynamic code compile and traceback printing support
+- `py.magic.greenlet`_: micro-threads on standard CPython ("stackless-light") and PyPy

 The py lib and its tools should work well on Linux, Win32, 
 OSX, Python versions 2.3-2.6.  For questions please go to
@ -38,9 +39,9 @@ def main():
        name='py',
        description='pylib and py.test: agile development and test support library',
        long_description = long_description, 
-        version='1.0.0a1', 
+        version='1.0.0a2', 
        url='http://pylib.org', 
-        download_url='http://codespeak.net/py/0.9.2/download.html', 
+        download_url='http://codespeak.net/py/1.0.0a2/download.html', 
        license='MIT license',
        platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 
        author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
@ -66,7 +67,11 @@ def main():
                     'Topic :: System :: Distributed Computing',
                     'Topic :: Utilities',
                     'Programming Language :: Python'],
-        packages=['py',
+        packages=['contrib.pygreen',
+                  'contrib.pygreen.pipe',
+                  'contrib.pygreen.server',
+                  'contrib.pygreen.test',
+                  'py',
                  'py.builtin',
                  'py.builtin.testing',
                  'py.c-extension',
@ -105,6 +110,7 @@ def main():
                  'py.test.dsession.testing',
                  'py.test.looponfail',
                  'py.test.looponfail.testing',
+                  'py.test.plugin',
                  'py.test.testing',
                  'py.test.testing.import_test.package',
                  'py.test.web',
@ -114,13 +120,9 @@ def main():
                  'py.tool.testing',
                  'py.xmlobj',
                  'py.xmlobj.testing'],
-        package_data={'py': ['LICENSE',
-                             'apigen/api.js',
-                             'apigen/apigen.js',
-                             'apigen/source/index.cgi',
-                             'apigen/style.css',
-                             'apigen/todo-apigen.txt',
-                             'apigen/todo.txt',
+        package_data={'py': ['',
+                             '',
+                             'LICENSE',
                             'bin/_findpy.py',
                             'bin/_genscripts.py',
                             'bin/gendoc.py',
@ -160,13 +162,13 @@ def main():
                             'compat/LICENSE',
                             'compat/testing/test_doctest.txt',
                             'compat/testing/test_doctest2.txt',
-                             'doc/apigen.txt',
                             'doc/apigen_refactorings.txt',
                             'doc/bin.txt',
                             'doc/code.txt',
                             'doc/coding-style.txt',
                             'doc/contact.txt',
                             'doc/download.txt',
+                             'doc/draft_pyfs',
                             'doc/example/genhtml.py',
                             'doc/example/genhtmlcss.py',
                             'doc/example/genxml.py',
@ -186,11 +188,14 @@ def main():
                             'doc/release-0.9.0.txt',
                             'doc/release-0.9.2.txt',
                             'doc/style.css',
+                             'doc/test-config.txt',
+                             'doc/test-plugins.txt',
                             'doc/test.txt',
                             'doc/why_py.txt',
                             'doc/xml.txt',
                             'env.cmd',
                             'execnet/NOTES',
+                             'execnet/improve-remote-tracebacks.txt',
                             'misc/testing/data/svnlookrepo.dump',
                             'path/gateway/TODO.txt',
                             'path/svn/quoting.txt',
@ -203,9 +208,7 @@ def main():
                             'rest/testing/data/graphviz.txt',
                             'rest/testing/data/part1.txt',
                             'rest/testing/data/part2.txt',
-                             'rest/testing/data/tocdepth.rst2pdfconfig',
-                             'test/report/webdata/index.html',
-                             'test/report/webdata/source.js']},
+                             'rest/testing/data/tocdepth.rst2pdfconfig']},
        zip_safe=False,
    )