diff --git a/MANIFEST b/MANIFEST index 5bd6e8c4e..0c4f135ee 100644 --- a/MANIFEST +++ b/MANIFEST @@ -83,25 +83,30 @@ py/compat/testing/test_subprocess.py py/compat/testing/test_textwrap.py py/compat/textwrap.py py/conftest.py +py/doc/Makefile py/doc/__init__.py py/doc/bin.txt py/doc/code.txt py/doc/coding-style.txt +py/doc/conf.py py/doc/confrest.py py/doc/contact.txt py/doc/download.txt -py/doc/draft_pyfs py/doc/execnet.txt -py/doc/future.txt +py/doc/img/pylib.png py/doc/impl-test.txt py/doc/index.txt py/doc/io.txt py/doc/links.txt py/doc/log.txt +py/doc/make.bat py/doc/misc.txt py/doc/path.txt py/doc/release-0.9.0.txt py/doc/release-0.9.2.txt +py/doc/release-1.0.0.txt +py/doc/releases.txt +py/doc/roles.py py/doc/style.css py/doc/test-config.txt py/doc/test-dist.txt @@ -110,8 +115,8 @@ py/doc/test-ext.txt py/doc/test-features.txt py/doc/test-plugins.txt py/doc/test-quickstart.txt +py/doc/test-statemanage.txt py/doc/test.txt -py/doc/why_py.txt py/doc/xml.txt py/env.cmd py/env.py @@ -300,12 +305,15 @@ 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_figleaf.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_pylint.py py/test/plugin/pytest_pytester.py py/test/plugin/pytest_restdoc.py +py/test/plugin/pytest_resultdb.py py/test/plugin/pytest_resultlog.py py/test/plugin/pytest_terminal.py py/test/plugin/pytest_tmpdir.py diff --git a/py/doc/Makefile b/doc/Makefile similarity index 100% rename from py/doc/Makefile rename to doc/Makefile diff --git a/py/doc/__init__.py b/doc/__init__.py similarity index 100% rename from py/doc/__init__.py rename to doc/__init__.py diff --git a/py/doc/bin.txt b/doc/bin.txt similarity index 100% rename from py/doc/bin.txt rename to doc/bin.txt diff --git a/py/doc/code.txt b/doc/code.txt similarity index 100% rename from py/doc/code.txt rename to doc/code.txt diff --git a/py/doc/coding-style.txt b/doc/coding-style.txt similarity index 100% rename from py/doc/coding-style.txt rename to doc/coding-style.txt diff --git a/py/doc/conf.py b/doc/conf.py similarity index 100% rename from py/doc/conf.py rename to doc/conf.py diff --git a/py/doc/confrest.py b/doc/confrest.py similarity index 100% rename from py/doc/confrest.py rename to doc/confrest.py diff --git a/py/doc/contact.txt b/doc/contact.txt similarity index 100% rename from py/doc/contact.txt rename to doc/contact.txt diff --git a/py/doc/download.txt b/doc/download.txt similarity index 100% rename from py/doc/download.txt rename to doc/download.txt diff --git a/py/doc/execnet.txt b/doc/execnet.txt similarity index 100% rename from py/doc/execnet.txt rename to doc/execnet.txt diff --git a/py/doc/img/pylib.png b/doc/img/pylib.png similarity index 100% rename from py/doc/img/pylib.png rename to doc/img/pylib.png diff --git a/py/doc/impl-test.txt b/doc/impl-test.txt similarity index 100% rename from py/doc/impl-test.txt rename to doc/impl-test.txt diff --git a/py/doc/index.txt b/doc/index.txt similarity index 100% rename from py/doc/index.txt rename to doc/index.txt diff --git a/py/doc/io.txt b/doc/io.txt similarity index 100% rename from py/doc/io.txt rename to doc/io.txt diff --git a/py/doc/links.txt b/doc/links.txt similarity index 100% rename from py/doc/links.txt rename to doc/links.txt diff --git a/py/doc/log.txt b/doc/log.txt similarity index 100% rename from py/doc/log.txt rename to doc/log.txt diff --git a/py/doc/make.bat b/doc/make.bat similarity index 100% rename from py/doc/make.bat rename to doc/make.bat diff --git a/py/doc/misc.txt b/doc/misc.txt similarity index 100% rename from py/doc/misc.txt rename to doc/misc.txt diff --git a/py/doc/path.txt b/doc/path.txt similarity index 100% rename from py/doc/path.txt rename to doc/path.txt diff --git a/py/doc/release-0.9.0.txt b/doc/release-0.9.0.txt similarity index 100% rename from py/doc/release-0.9.0.txt rename to doc/release-0.9.0.txt diff --git a/py/doc/release-0.9.2.txt b/doc/release-0.9.2.txt similarity index 100% rename from py/doc/release-0.9.2.txt rename to doc/release-0.9.2.txt diff --git a/py/doc/release-1.0.0.txt b/doc/release-1.0.0.txt similarity index 100% rename from py/doc/release-1.0.0.txt rename to doc/release-1.0.0.txt diff --git a/py/doc/releases.txt b/doc/releases.txt similarity index 100% rename from py/doc/releases.txt rename to doc/releases.txt diff --git a/py/doc/roles.py b/doc/roles.py similarity index 100% rename from py/doc/roles.py rename to doc/roles.py diff --git a/py/doc/style.css b/doc/style.css similarity index 100% rename from py/doc/style.css rename to doc/style.css diff --git a/py/doc/test-config.txt b/doc/test-config.txt similarity index 100% rename from py/doc/test-config.txt rename to doc/test-config.txt diff --git a/py/doc/test-dist.txt b/doc/test-dist.txt similarity index 100% rename from py/doc/test-dist.txt rename to doc/test-dist.txt diff --git a/py/doc/test-examples.txt b/doc/test-examples.txt similarity index 100% rename from py/doc/test-examples.txt rename to doc/test-examples.txt diff --git a/py/doc/test-ext.txt b/doc/test-ext.txt similarity index 100% rename from py/doc/test-ext.txt rename to doc/test-ext.txt diff --git a/py/doc/test-features.txt b/doc/test-features.txt similarity index 100% rename from py/doc/test-features.txt rename to doc/test-features.txt diff --git a/py/doc/test-plugins.txt b/doc/test-plugins.txt similarity index 100% rename from py/doc/test-plugins.txt rename to doc/test-plugins.txt diff --git a/py/doc/test-quickstart.txt b/doc/test-quickstart.txt similarity index 100% rename from py/doc/test-quickstart.txt rename to doc/test-quickstart.txt diff --git a/py/doc/test-statemanage.txt b/doc/test-statemanage.txt similarity index 100% rename from py/doc/test-statemanage.txt rename to doc/test-statemanage.txt diff --git a/py/doc/test.txt b/doc/test.txt similarity index 100% rename from py/doc/test.txt rename to doc/test.txt diff --git a/py/doc/xml.txt b/doc/xml.txt similarity index 100% rename from py/doc/xml.txt rename to doc/xml.txt diff --git a/setup.py b/setup.py index 569cec979..cad836708 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ """ setup file for 'py' package based on: - https://codespeak.net/svn/py/trunk, revision=63342 + https://codespeak.net/svn/py/trunk, revision=63519 autogenerated by gensetup.py """ @@ -32,7 +32,6 @@ http://pylib.org/contact.html """ -CEXTENSION = False def main(): setup( name='py', @@ -45,10 +44,6 @@ def main(): 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', - ext_modules = CEXTENSION and - [Extension("py.c-extension.greenlet.greenlet", - ["py/c-extension/greenlet/greenlet.c"]),] - or [], entry_points={'console_scripts': ['py.cleanup = py.cmdline:pycleanup', 'py.countloc = py.cmdline:pycountloc', @@ -137,23 +132,26 @@ def main(): 'compat/LICENSE', 'compat/testing/test_doctest.txt', 'compat/testing/test_doctest2.txt', + 'doc/Makefile', 'doc/bin.txt', 'doc/code.txt', 'doc/coding-style.txt', 'doc/contact.txt', 'doc/download.txt', - 'doc/draft_pyfs', 'doc/execnet.txt', - 'doc/future.txt', + 'doc/img/pylib.png', 'doc/impl-test.txt', 'doc/index.txt', 'doc/io.txt', 'doc/links.txt', 'doc/log.txt', + 'doc/make.bat', 'doc/misc.txt', 'doc/path.txt', 'doc/release-0.9.0.txt', 'doc/release-0.9.2.txt', + 'doc/release-1.0.0.txt', + 'doc/releases.txt', 'doc/style.css', 'doc/test-config.txt', 'doc/test-dist.txt', @@ -162,8 +160,8 @@ def main(): 'doc/test-features.txt', 'doc/test-plugins.txt', 'doc/test-quickstart.txt', + 'doc/test-statemanage.txt', 'doc/test.txt', - 'doc/why_py.txt', 'doc/xml.txt', 'env.cmd', 'execnet/NOTES',