diff --git a/CHANGELOG b/CHANGELOG index 7ccacbc79..2bc8d69cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -$Id: CHANGELOG 64077 2009-04-14 21:04:57Z hpk $ +$Id: CHANGELOG 65791 2009-06-16 16:23:18Z hpk $ Changes between 1.0.0b1 and 1.0.0b2 ============================================= diff --git a/MANIFEST b/MANIFEST index 658b84f10..9d2113b5b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -5,6 +5,58 @@ MANIFEST README.txt TODO.txt _findpy.py +doc/announce/release-0.9.0.txt +doc/announce/release-0.9.2.txt +doc/announce/release-1.0.0.txt +doc/announce/releases.txt +doc/bin.txt +doc/code.txt +doc/confrest.py +doc/conftest.py +doc/contact.txt +doc/download.txt +doc/execnet.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.txt +doc/test/dist.txt +doc/test/examples.txt +doc/test/extend.txt +doc/test/features.txt +doc/test/funcargs.txt +doc/test/quickstart.txt +doc/test/test.txt +doc/test/xunit_setup.txt +doc/xml.txt +example/execnet/popen_read_multiple.py +example/funcarg/costlysetup/conftest.py +example/funcarg/costlysetup/sub1/test_quick.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 +example/pytest/failure_demo.py +example/pytest/test_failures.py +example/pytest/test_setup_flow_example.py py/LICENSE py/__init__.py py/_com.py @@ -236,7 +288,6 @@ py/test/collect.py py/test/compat.py py/test/config.py py/test/conftesthandle.py -py/test/custompdb.py py/test/defaultconftest.py py/test/dist/__init__.py py/test/dist/dsession.py @@ -258,19 +309,17 @@ py/test/looponfail/util.py py/test/outcome.py py/test/parseopt.py py/test/plugin/__init__.py -py/test/plugin/api.py py/test/plugin/conftest.py +py/test/plugin/hookspec.py py/test/plugin/pytest__pytest.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_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 -py/test/plugin/pytest_plugintester.py py/test/plugin/pytest_pocoo.py py/test/plugin/pytest_pylint.py py/test/plugin/pytest_pytester.py @@ -283,9 +332,9 @@ 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_runner.py py/test/pluginmanager.py py/test/pycollect.py -py/test/runner.py py/test/session.py py/test/testing/__init__.py py/test/testing/acceptance_test.py @@ -295,7 +344,6 @@ 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 @@ -309,8 +357,6 @@ 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_runner.py -py/test/testing/test_runner_functional.py py/test/testing/test_session.py py/test/testing/test_setup_functional.py py/test/testing/test_traceback.py diff --git a/ez_setup.py b/ez_setup.py new file mode 100644 index 000000000..89cf056d9 --- /dev/null +++ b/ez_setup.py @@ -0,0 +1,272 @@ +#!python +"""Bootstrap setuptools installation + +If you want to use setuptools in your package's setup.py, just include this +file in the same directory with it, and add this to the top of your setup.py:: + + from ez_setup import use_setuptools + use_setuptools() + +If you want to require a specific version of setuptools, set a download +mirror, or use an alternate download directory, you can do so by supplying +the appropriate options to ``use_setuptools()``. + +This file can also be run as a script to install or upgrade setuptools. +""" +import sys +DEFAULT_VERSION = "0.6c8" +DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] + +md5_data = { + 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', + 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', + 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', + 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', + 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', + 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', + 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', + 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', + 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', + 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', + 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', + 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', + 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', + 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', + 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', + 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', + 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', + 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', + 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', + 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', + 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', + 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', + 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', + 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', + 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', + 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', + 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', + 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', + 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', + 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', +} + +import sys, os + +def _validate_md5(egg_name, data): + if egg_name in md5_data: + from md5 import md5 + digest = md5(data).hexdigest() + if digest != md5_data[egg_name]: + print >>sys.stderr, ( + "md5 validation of %s failed! (Possible download problem?)" + % egg_name + ) + sys.exit(2) + return data + + +def use_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + download_delay=15 +): + """Automatically find/download setuptools and make it available on sys.path + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end with + a '/'). `to_dir` is the directory where setuptools will be downloaded, if + it is not already available. If `download_delay` is specified, it should + be the number of seconds that will be paused before initiating a download, + should one be required. If an older version of setuptools is installed, + this routine will print a message to ``sys.stderr`` and raise SystemExit in + an attempt to abort the calling script. + """ + was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules + def do_download(): + egg = download_setuptools(version, download_base, to_dir, download_delay) + sys.path.insert(0, egg) + import setuptools; setuptools.bootstrap_install_from = egg + try: + import pkg_resources + except ImportError: + return do_download() + try: + pkg_resources.require("setuptools>="+version); return + except pkg_resources.VersionConflict, e: + if was_imported: + print >>sys.stderr, ( + "The required version of setuptools (>=%s) is not available, and\n" + "can't be installed while this script is running. Please install\n" + " a more recent version first, using 'easy_install -U setuptools'." + "\n\n(Currently using %r)" + ) % (version, e.args[0]) + sys.exit(2) + else: + del pkg_resources, sys.modules['pkg_resources'] # reload ok + return do_download() + except pkg_resources.DistributionNotFound: + return do_download() + +def download_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + delay = 15 +): + """Download setuptools from a specified location and return its filename + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end + with a '/'). `to_dir` is the directory where the egg will be downloaded. + `delay` is the number of seconds to pause before an actual download attempt. + """ + import urllib2, shutil + egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) + url = download_base + egg_name + saveto = os.path.join(to_dir, egg_name) + src = dst = None + if not os.path.exists(saveto): # Avoid repeated downloads + try: + from distutils import log + if delay: + log.warn(""" +--------------------------------------------------------------------------- +This script requires setuptools version %s to run (even to display +help). I will attempt to download it for you (from +%s), but +you may need to enable firewall access for this script first. +I will start the download in %d seconds. + +(Note: if this machine does not have network access, please obtain the file + + %s + +and place it in this directory before rerunning this script.) +---------------------------------------------------------------------------""", + version, download_base, delay, url + ); from time import sleep; sleep(delay) + log.warn("Downloading %s", url) + src = urllib2.urlopen(url) + # Read/write all in one block, so we don't create a corrupt file + # if the download is interrupted. + data = _validate_md5(egg_name, src.read()) + dst = open(saveto,"wb"); dst.write(data) + finally: + if src: src.close() + if dst: dst.close() + return os.path.realpath(saveto) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +def main(argv, version=DEFAULT_VERSION): + """Install or upgrade setuptools and EasyInstall""" + try: + import setuptools + except ImportError: + egg = None + try: + egg = download_setuptools(version, delay=0) + sys.path.insert(0,egg) + from setuptools.command.easy_install import main + return main(list(argv)+[egg]) # we're done here + finally: + if egg and os.path.exists(egg): + os.unlink(egg) + else: + if setuptools.__version__ == '0.0.1': + print >>sys.stderr, ( + "You have an obsolete version of setuptools installed. Please\n" + "remove it from your system entirely before rerunning this script." + ) + sys.exit(2) + + req = "setuptools>="+version + import pkg_resources + try: + pkg_resources.require(req) + except pkg_resources.VersionConflict: + try: + from setuptools.command.easy_install import main + except ImportError: + from easy_install import main + main(list(argv)+[download_setuptools(delay=0)]) + sys.exit(0) # try to force an exit + else: + if argv: + from setuptools.command.easy_install import main + main(argv) + else: + print "Setuptools version",version,"or greater has been installed." + print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' + +def update_md5(filenames): + """Update our built-in md5 registry""" + + import re + from md5 import md5 + + for name in filenames: + base = os.path.basename(name) + f = open(name,'rb') + md5_data[base] = md5(f.read()).hexdigest() + f.close() + + data = [" %r: %r,\n" % it for it in md5_data.items()] + data.sort() + repl = "".join(data) + + import inspect + srcfile = inspect.getsourcefile(sys.modules[__name__]) + f = open(srcfile, 'rb'); src = f.read(); f.close() + + match = re.search("\nmd5_data = {\n([^}]+)}", src) + if not match: + print >>sys.stderr, "Internal error!" + sys.exit(2) + + src = src[:match.start(1)] + repl + src[match.end(1):] + f = open(srcfile,'w') + f.write(src) + f.close() + + +if __name__=='__main__': + if len(sys.argv)>2 and sys.argv[1]=='--md5update': + update_md5(sys.argv[2:]) + else: + main(sys.argv[1:]) + + + + + diff --git a/setup.py b/setup.py index 7b460506b..ba7bd2b24 100644 --- a/setup.py +++ b/setup.py @@ -7,21 +7,21 @@ """ import os, sys -from distutils.core import setup - +import ez_setup +ez_setup.use_setuptools() +from setuptools import setup, Extension + long_description = """ -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 @@ -42,14 +42,13 @@ def main(): author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others', author_email='holger at merlinux.eu, py-dev at codespeak.net', - py_modules=['_findpy'], - scripts=['py/bin/py.cleanup', - 'py/bin/py.countloc', - 'py/bin/py.lookup', - 'py/bin/py.rest', - 'py/bin/py.svnwcrevert', - 'py/bin/py.test', - 'py/bin/py.which'], + entry_points={'console_scripts': ['py.cleanup = py.cmdline:pycleanup', + 'py.countloc = py.cmdline:pycountloc', + 'py.lookup = py.cmdline:pylookup', + 'py.rest = py.cmdline:pyrest', + 'py.svnwcrevert = py.cmdline:pysvnwcrevert', + 'py.test = py.cmdline:pytest', + 'py.which = py.cmdline:pywhich']}, classifiers=['Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', @@ -61,7 +60,9 @@ def main(): 'Topic :: System :: Distributed Computing', 'Topic :: Utilities', 'Programming Language :: Python'], - packages=['py', + packages=['example.funcarg.mysetup', + 'example.funcarg.mysetup2', + 'py', 'py.builtin', 'py.builtin.testing', 'py.cmdline', @@ -145,6 +146,7 @@ def main(): 'rest/testing/data/part1.txt', 'rest/testing/data/part2.txt', 'rest/testing/data/tocdepth.rst2pdfconfig']}, + zip_safe=False, ) if __name__ == '__main__':