merging 1.0.x branch

--HG--
branch : trunk

MANIFEST

@@ -1,397 +0,0 @@
-CHANGELOG
-LICENSE
-MANIFEST
-README.txt
-_findpy.py
-bin-for-dist/all-plat.sh
-bin-for-dist/findmissingdocstrings.py
-bin-for-dist/gendoc.py
-bin-for-dist/genscripts.py
-bin-for-dist/gensetup.py
-bin-for-dist/makepluginlist.py
-doc/announce/release-0.9.0.txt
-doc/announce/release-0.9.2.txt
-doc/announce/release-1.0.0.txt
-doc/announce/release-1.0.1.txt
-doc/announce/releases.txt
-doc/bin.txt
-doc/changelog.txt
-doc/code.txt
-doc/confrest.py
-doc/conftest.py
-doc/contact.txt
-doc/download.txt
-doc/execnet.txt
-doc/faq.txt
-doc/img/pylib.png
-doc/index.txt
-doc/io.txt
-doc/log.txt
-doc/misc.txt
-doc/path.txt
-doc/style.css
-doc/test/attic.txt
-doc/test/config.html
-doc/test/customize.txt
-doc/test/dist.txt
-doc/test/examples.txt
-doc/test/extend.html
-doc/test/features.txt
-doc/test/funcargs.txt
-doc/test/index.txt
-doc/test/mission.txt
-doc/test/plugin/capture.txt
-doc/test/plugin/doctest.txt
-doc/test/plugin/figleaf.txt
-doc/test/plugin/helpconfig.txt
-doc/test/plugin/hooklog.txt
-doc/test/plugin/hookspec.txt
-doc/test/plugin/index.txt
-doc/test/plugin/keyword.txt
-doc/test/plugin/links.txt
-doc/test/plugin/monkeypatch.txt
-doc/test/plugin/nose.txt
-doc/test/plugin/oejskit.txt
-doc/test/plugin/pastebin.txt
-doc/test/plugin/pdb.txt
-doc/test/plugin/recwarn.txt
-doc/test/plugin/restdoc.txt
-doc/test/plugin/resultlog.txt
-doc/test/plugin/terminal.txt
-doc/test/plugin/unittest.txt
-doc/test/plugin/xfail.txt
-doc/test/quickstart.txt
-doc/test/talks.txt
-doc/test/test.html
-doc/test/xunit_setup.txt
-doc/xml.txt
-example/assertion/failure_demo.py
-example/assertion/test_failures.py
-example/assertion/test_setup_flow_example.py
-example/execnet/popen_read_multiple.py
-example/execnet/redirect_remote_output.py
-example/execnet/svn-sync-repo.py
-example/execnet/sysinfo.py
-example/funcarg/conftest.py
-example/funcarg/costlysetup/conftest.py
-example/funcarg/costlysetup/sub1/__init__.py
-example/funcarg/costlysetup/sub1/test_quick.py
-example/funcarg/costlysetup/sub2/__init__.py
-example/funcarg/costlysetup/sub2/test_two.py
-example/funcarg/mysetup/__init__.py
-example/funcarg/mysetup/conftest.py
-example/funcarg/mysetup/myapp.py
-example/funcarg/mysetup/test_sample.py
-example/funcarg/mysetup2/__init__.py
-example/funcarg/mysetup2/conftest.py
-example/funcarg/mysetup2/myapp.py
-example/funcarg/mysetup2/test_sample.py
-example/funcarg/mysetup2/test_ssh.py
-example/funcarg/parametrize/test_parametrize.py
-example/funcarg/parametrize/test_parametrize2.py
-example/funcarg/parametrize/test_parametrize3.py
-example/funcarg/test_simpleprovider.py
-example/genhtml.py
-example/genhtmlcss.py
-example/genxml.py
-py/LICENSE
-py/__init__.py
-py/_com.py
-py/bin/_findpy.py
-py/bin/py.cleanup
-py/bin/py.convert_unittest
-py/bin/py.countloc
-py/bin/py.lookup
-py/bin/py.rest
-py/bin/py.svnwcrevert
-py/bin/py.test
-py/bin/py.which
-py/bin/win32/py.cleanup.cmd
-py/bin/win32/py.convert_unittest.cmd
-py/bin/win32/py.countloc.cmd
-py/bin/win32/py.lookup.cmd
-py/bin/win32/py.rest.cmd
-py/bin/win32/py.svnwcrevert.cmd
-py/bin/win32/py.test.cmd
-py/bin/win32/py.which.cmd
-py/builtin/__init__.py
-py/builtin/enumerate.py
-py/builtin/exception.py
-py/builtin/reversed.py
-py/builtin/set.py
-py/builtin/sorted.py
-py/builtin/testing/__init__.py
-py/builtin/testing/test_enumerate.py
-py/builtin/testing/test_exception.py
-py/builtin/testing/test_reversed.py
-py/builtin/testing/test_set.py
-py/builtin/testing/test_sorted.py
-py/cmdline/__init__.py
-py/cmdline/pycleanup.py
-py/cmdline/pyconvert_unittest.py
-py/cmdline/pycountloc.py
-py/cmdline/pylookup.py
-py/cmdline/pyrest.py
-py/cmdline/pysvnwcrevert.py
-py/cmdline/pytest.py
-py/cmdline/pywhich.py
-py/cmdline/testing/__init__.py
-py/cmdline/testing/test_cmdline.py
-py/cmdline/testing/test_convert_unittest.py
-py/cmdline/testing/test_generic.py
-py/code/__init__.py
-py/code/code.py
-py/code/excinfo.py
-py/code/frame.py
-py/code/safe_repr.py
-py/code/source.py
-py/code/testing/__init__.py
-py/code/testing/test_code.py
-py/code/testing/test_excinfo.py
-py/code/testing/test_frame.py
-py/code/testing/test_safe_repr.py
-py/code/testing/test_source.py
-py/code/traceback2.py
-py/compat/LICENSE
-py/compat/__init__.py
-py/compat/conftest.py
-py/compat/doctest.py
-py/compat/optparse.py
-py/compat/subprocess.py
-py/compat/testing/__init__.py
-py/compat/testing/test_doctest.py
-py/compat/testing/test_doctest.txt
-py/compat/testing/test_doctest2.py
-py/compat/testing/test_doctest2.txt
-py/compat/testing/test_optparse.py
-py/compat/testing/test_subprocess.py
-py/compat/testing/test_textwrap.py
-py/compat/textwrap.py
-py/conftest.py
-py/env.cmd
-py/env.py
-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
-py/execnet/script/__init__.py
-py/execnet/script/loop_socketserver.py
-py/execnet/script/quitserver.py
-py/execnet/script/shell.py
-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/capture.py
-py/io/terminalwriter.py
-py/io/testing/__init__.py
-py/io/testing/test_capture.py
-py/io/testing/test_terminalwriter.py
-py/log/__init__.py
-py/log/log.py
-py/log/testing/__init__.py
-py/log/testing/test_log.py
-py/log/testing/test_warning.py
-py/log/warning.py
-py/magic/__init__.py
-py/magic/assertion.py
-py/magic/autopath.py
-py/magic/exprinfo.py
-py/magic/invoke.py
-py/magic/patch.py
-py/magic/testing/__init__.py
-py/magic/testing/test_assertion.py
-py/magic/testing/test_autopath.py
-py/magic/testing/test_exprinfo.py
-py/magic/testing/test_invoke.py
-py/magic/testing/test_patch.py
-py/magic/testing/test_viewtype.py
-py/magic/viewtype.py
-py/misc/__init__.py
-py/misc/cache.py
-py/misc/error.py
-py/misc/rest.py
-py/misc/std.py
-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_install.py
-py/misc/testing/test_std.py
-py/path/__init__.py
-py/path/common.py
-py/path/gateway/TODO.txt
-py/path/gateway/__init__.py
-py/path/gateway/channeltest.py
-py/path/gateway/channeltest2.py
-py/path/gateway/remotepath.py
-py/path/local.py
-py/path/notes-svn-quoting.txt
-py/path/svnurl.py
-py/path/svnwc.py
-py/path/testing/__init__.py
-py/path/testing/common.py
-py/path/testing/fscommon.py
-py/path/testing/repotest.dump
-py/path/testing/svntestbase.py
-py/path/testing/test_local.py
-py/path/testing/test_svnauth.py
-py/path/testing/test_svnurl.py
-py/path/testing/test_svnwc.py
-py/process/__init__.py
-py/process/cmdexec.py
-py/process/forkedfunc.py
-py/process/killproc.py
-py/process/testing/__init__.py
-py/process/testing/test_cmdexec.py
-py/process/testing/test_forkedfunc.py
-py/process/testing/test_killproc.py
-py/rest/__init__.py
-py/rest/convert.py
-py/rest/directive.py
-py/rest/latex.py
-py/rest/rest.sty.template
-py/rest/rst.py
-py/rest/testing/__init__.py
-py/rest/testing/data/example.rst2pdfconfig
-py/rest/testing/data/example1.dot
-py/rest/testing/data/formula.txt
-py/rest/testing/data/formula1.txt
-py/rest/testing/data/graphviz.txt
-py/rest/testing/data/part1.txt
-py/rest/testing/data/part2.txt
-py/rest/testing/data/tocdepth.rst2pdfconfig
-py/rest/testing/setup.py
-py/rest/testing/test_convert.py
-py/rest/testing/test_directive.py
-py/rest/testing/test_htmlrest.py
-py/rest/testing/test_rst.py
-py/rest/testing/test_rst2pdf.py
-py/rest/testing/test_transform.py
-py/rest/transform.py
-py/test/__init__.py
-py/test/cmdline.py
-py/test/collect.py
-py/test/compat.py
-py/test/config.py
-py/test/conftesthandle.py
-py/test/defaultconftest.py
-py/test/dist/__init__.py
-py/test/dist/dsession.py
-py/test/dist/mypickle.py
-py/test/dist/nodemanage.py
-py/test/dist/testing/__init__.py
-py/test/dist/testing/acceptance_test.py
-py/test/dist/testing/test_dsession.py
-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
-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/hookspec.py
-py/test/plugin/pytest__pytest.py
-py/test/plugin/pytest_capture.py
-py/test/plugin/pytest_default.py
-py/test/plugin/pytest_doctest.py
-py/test/plugin/pytest_execnetcleanup.py
-py/test/plugin/pytest_figleaf.py
-py/test/plugin/pytest_helpconfig.py
-py/test/plugin/pytest_hooklog.py
-py/test/plugin/pytest_keyword.py
-py/test/plugin/pytest_monkeypatch.py
-py/test/plugin/pytest_nose.py
-py/test/plugin/pytest_pastebin.py
-py/test/plugin/pytest_pdb.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_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
-py/test/plugin/test_pytest_capture.py
-py/test/plugin/test_pytest_helpconfig.py
-py/test/plugin/test_pytest_nose.py
-py/test/plugin/test_pytest_runner.py
-py/test/plugin/test_pytest_runner_xunit.py
-py/test/plugin/test_pytest_terminal.py
-py/test/pluginmanager.py
-py/test/pycollect.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/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_funcargs.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_pluginmanager.py
-py/test/testing/test_pycollect.py
-py/test/testing/test_recording.py
-py/test/testing/test_session.py
-py/test/testing/test_traceback.py
-py/test/web/__init__.py
-py/test/web/exception.py
-py/test/web/post_multipart.py
-py/test/web/webcheck.py
-py/thread/__init__.py
-py/thread/io.py
-py/thread/pool.py
-py/thread/testing/__init__.py
-py/thread/testing/test_io.py
-py/thread/testing/test_pool.py
-py/xmlobj/__init__.py
-py/xmlobj/html.py
-py/xmlobj/misc.py
-py/xmlobj/testing/__init__.py
-py/xmlobj/testing/test_html.py
-py/xmlobj/testing/test_xml.py
-py/xmlobj/visit.py
-py/xmlobj/xml.py
-setup.py

MANIFEST.in

@@ -0,0 +1,16 @@
+include CHANGELOG
+include README.txt
+include setup.py
+include LICENSE 
+include py/LICENSE 
+include py/path/testing/repotest.dump
+include py/rest/rest.sty.template
+graft doc
+graft contrib
+graft example
+graft py/bin 
+graft py/rest/testing/data
+exclude *.orig 
+exclude *.rej 
+prune .svn 
+prune .hg 

README.txt

@@ -6,14 +6,4 @@ the following tools and modules:
 * py.code: dynamic code generation and introspection
 * py.path:  uniform local and svn path objects 
 
-It includes code and contributions from several people, 
-listed in the LICENSE file. 
-
-For questions, please see py/doc/index.txt, refer to the website
-http://pylib.org or come to the #pylib IRC freenode channel or subscribe to 
-http://codespeak.net/mailman/listinfo/py-dev .
-
-have fun, 
-
-holger krekel, holger at merlinux eu
-
+For questions and more information please visit http://pylib.org

_findpy.py

@@ -1,39 +0,0 @@
-#!/usr/bin/env python 
-
-#
-# try to find and import a nearby version of the 'py' package. 
-# otherwise use the system global default 
-# XXX turn this into a developer-only thing? 
-#
-import sys
-import os
-from os.path import dirname as opd, exists, join, basename, abspath
-
-def searchpy(current):
-    while 1:
-        last = current
-        initpy = join(current, '__init__.py')
-        if not exists(initpy):
-            pydir = join(current, 'py')
-            # recognize py-package and ensure it is importable
-            if exists(pydir) and exists(join(pydir, '__init__.py')):
-                #for p in sys.path:
-                #    if p == current:
-                #        return True
-                if current != sys.path[0]:  # if we are already first, then ok
-                    print >>sys.stderr, "inserting into sys.path:", current
-                    sys.path.insert(0, current)
-                return True
-        current = opd(current)
-        if last == current:
-            return False
-
-if not searchpy(abspath(os.curdir)):
-    if not searchpy(opd(abspath(sys.argv[0]))):
-        if not searchpy(opd(__file__)):
-            pass # let's hope it is just on sys.path 
-
-import py
-
-if __name__ == '__main__': 
-    print "py lib is at", py.__file__

bin-for-dist/gensetup.py

@@ -317,7 +317,7 @@ class SetupWriter(object):
         print "wrote",  targetfile
 
     def write_all(self):
-        self.write_manifest()
+        #self.write_manifest()
         self.write_setup()
 
 def parseargs():

doc/announce/release-1.0.2.txt

@@ -0,0 +1,5 @@
+1.0.2: packaging fixes 
+-----------------------------------------------------------------------
+
+this release is purely a release for fixing packaging issues.
+

doc/path.txt

@@ -255,9 +255,7 @@ of platform-dependencies as much as possible).
 
 There is some experimental small approach 
 (:source:`py/path/gateway/`) aiming at having
-a convenient Remote Path implementation
-and some considerations about future 
-works in the according :source:`py/path/gateway/TODO.txt`
+a convenient Remote Path implementation. 
 
 There are various hacks out there to have
 Memory-Filesystems and even path objects

py/__init__.py

@@ -20,7 +20,7 @@ For questions please check out http://pylib.org/contact.html
 from py.initpkg import initpkg
 trunk = "trunk"
 
-version = trunk or "1.0.1"
+version = trunk or "1.0.2"
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 

py/rest/resthtml.py

@@ -31,7 +31,7 @@ def convert_rest_html(source, source_path, stylesheet=None, encoding='latin1'):
     source_path = os.path.abspath(str(source_path))
     prevdir = os.getcwd()
     try:
-        os.chdir(os.path.dirname(source_path))
+        #os.chdir(os.path.dirname(source_path))
         return publish_string(source, source_path, writer_name='html',
                               settings_overrides=kwargs)
     finally:

setup.py

@@ -58,6 +58,7 @@ def main():
                      'Topic :: Utilities',
                      'Programming Language :: Python'],
         packages=['py',
+                  'py._testing',
                   'py.builtin',
                   'py.builtin.testing',
                   'py.cmdline',
@@ -75,8 +76,6 @@ def main():
                   'py.log.testing',
                   'py.magic',
                   'py.magic.testing',
-                  'py.misc',
-                  'py.misc.testing',
                   'py.path',
                   'py.path.gateway',
                   'py.path.testing',
@@ -99,6 +98,8 @@ def main():
                   'py.xmlobj.testing'],
         package_data={'py': ['LICENSE',
                              'bin/_findpy.py',
+                             'bin/env.cmd',
+                             'bin/env.py',
                              'bin/py.cleanup',
                              'bin/py.convert_unittest',
                              'bin/py.countloc',
@@ -118,10 +119,8 @@ def main():
                              'compat/LICENSE',
                              'compat/testing/test_doctest.txt',
                              'compat/testing/test_doctest2.txt',
-                             'env.cmd',
                              'execnet/NOTES',
                              'execnet/improve-remote-tracebacks.txt',
-                             'misc/testing/data/svnlookrepo.dump',
                              'path/gateway/TODO.txt',
                              'path/notes-svn-quoting.txt',
                              'path/testing/repotest.dump',