[Checkins] SVN: transaction/trunk/ Moved to github
jim
cvs-admin at zope.org
Sat Jan 5 19:00:47 UTC 2013
Log message for revision 129019:
Moved to github
Changed:
D transaction/trunk/.bzrignore
D transaction/trunk/CHANGES.txt
D transaction/trunk/COPYRIGHT.txt
D transaction/trunk/LICENSE.txt
A transaction/trunk/MOVED_TO_GITHUB
D transaction/trunk/README.txt
D transaction/trunk/bootstrap.py
D transaction/trunk/buildout.cfg
D transaction/trunk/docs/
D transaction/trunk/ez_setup.py
D transaction/trunk/setup.cfg
D transaction/trunk/setup.py
D transaction/trunk/tox.ini
D transaction/trunk/transaction/
-=-
Deleted: transaction/trunk/.bzrignore
===================================================================
--- transaction/trunk/.bzrignore 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/.bzrignore 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,7 +0,0 @@
-.tox
-__pycache__
-*.egg-info
-.coverage
-nosetests.xml
-coverage.xml
-_build
Deleted: transaction/trunk/CHANGES.txt
===================================================================
--- transaction/trunk/CHANGES.txt 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/CHANGES.txt 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,152 +0,0 @@
-Changes
-=======
-
-1.4.1 (unreleased)
-------------------
-
-- TBD
-
-1.4.0 (2013-01-03)
-------------------
-
-- Updated Trove classifiers.
-
-1.4.0b1 (2012-12-18)
---------------------
-
-- Converted existing doctests into Sphinx documentation (snippets are
- exercised via 'tox').
-
-- 100% unit test coverage.
-
-- Backward incompatibility: raise ValueError rather than AssertionError
- for runtime errors:
-
- - In ``Transaction.doom`` if the transaction is in a non-doomable state.
-
- - In ``TransactionManager.attempts`` if passed a non-positive value.
-
- - In ``TransactionManager.free`` if passed a foreign transaction.
-
-- Declared support for Python 3.3 in ``setup.py``, and added ``tox`` testing.
-
-- When a non-retryable exception was raised as the result of a call to
- ``transaction.manager.commit`` within the "attempts" machinery, the
- exception was not reraised properly. Symptom: an unrecoverable exception
- such as ``Unsupported: Storing blobs in <somestorage> is not supported.``
- would be swallowed inappropriately.
-
-1.3.0 (2012-05-16)
-------------------
-
-- Added Sphinx API docuementation.
-
-- Added explicit support for PyPy.
-
-- Dropped use of Python3-impatible ``zope.interface.implements`` class
- advisor in favor of ``zope.interface.implementer`` class decorator.
-
-- Added support for continuous integration using ``tox`` and ``jenkins``.
-
-- Added ``setup.py docs`` alias (installs ``Sphinx`` and dependencies).
-
-- Added ``setup.py dev`` alias (runs ``setup.py develop`` plus installs
- ``nose`` and ``coverage``).
-
-- Python 3.3 compatibility.
-
-- Fix "for attempt in transaction.attempts(x)" machinery, which would not
- retry a transaction if its implicit call to ``.commit()`` itself raised a
- transient error. Symptom: seeing conflict errors even though you thought
- you were retrying some number of times via the "attempts" machinery (the
- first attempt to generate an exception during commit would cause that
- exception to be raised).
-
-1.2.0 (2011-12-05)
-------------------
-
-New Features:
-
-- Python 3.2 compatibility.
-
-- Dropped Python 2.4 and 2.5 compatibility (use 1.1.1 if you need to use
- "transaction" under these Python versions).
-
-1.1.1 (2010-09-16)
-------------------
-
-Bug Fixes:
-
-- Code in ``_transaction.py`` held on to local references to traceback
- objects after calling ``sys.exc_info()`` to get one, causing
- potential reference leakages.
-
-- Fixed ``hexlify`` NameError in ``transaction._transaction.oid_repr``
- and add test.
-
-1.1.0 (1010-05-12)
-------------------
-
-New Features:
-
-- Transaction managers and the transaction module can be used with the
- with statement to define transaction boundaries, as in::
-
- with transaction:
- ... do some things ...
-
- See transaction/tests/convenience.txt for more details.
-
-- There is a new iterator function that automates dealing with
- transient errors (such as ZODB confict errors). For example, in::
-
- for attempt in transaction.attempts(5):
- with attempt:
- ... do some things ..
-
- If the work being done raises transient errors, the transaction will
- be retried up to 5 times.
-
- See transaction/tests/convenience.txt for more details.
-
-Bugs fixed:
-
-- Fixed a bug that caused extra commit calls to be made on data
- managers under certain special circumstances.
-
- https://mail.zope.org/pipermail/zodb-dev/2010-May/013329.html
-
-- When threads were reused, transaction data could leak accross them,
- causing subtle application bugs.
-
- https://bugs.launchpad.net/zodb/+bug/239086
-
-1.0.1 (2010-05-07)
-------------------
-
-- LP #142464: remove double newline between log entries: it makes doing
- smarter formatting harder.
-
-- Updated tests to remove use of deprecated ``zope.testing.doctest``.
-
-1.0.0 (2009-07-24)
-------------------
-
-- Fix test that incorrectly relied on the order of a list that was generated
- from a dict.
-
-- Remove crufty DEPENDENCIES.cfg left over from zpkg.
-
-1.0a1 (2007-12-18)
-------------------
-
-= Initial release, branched from ZODB trunk on 2007-11-08 (aka
- "3.9.0dev").
-
-- Remove (deprecated) support for beforeCommitHook alias to
- addBeforeCommitHook.
-
-- Add weakset tests.
-
-- Remove unit tests that depend on ZODB.tests.utils from
- test_transaction (these are actually integration tests).
Deleted: transaction/trunk/COPYRIGHT.txt
===================================================================
--- transaction/trunk/COPYRIGHT.txt 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/COPYRIGHT.txt 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1 +0,0 @@
-Zope Foundation and Contributors
\ No newline at end of file
Deleted: transaction/trunk/LICENSE.txt
===================================================================
--- transaction/trunk/LICENSE.txt 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/LICENSE.txt 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,44 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that identifies the
-copyright holders.
-
-This license has been certified as open source. It has also been designated as
-GPL compatible by the Free Software Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions in source code must retain the accompanying copyright
-notice, this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying copyright
-notice, this list of conditions, and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to endorse or promote
-products derived from this software without prior written permission from the
-copyright holders.
-
-4. The right to distribute this software or to use it for any purpose does not
-give you the right to use Servicemarks (sm) or Trademarks (tm) of the
-copyright
-holders. Use of them is covered by separate agreement with the copyright
-holders.
-
-5. If any files are modified, you must cause the modified files to carry
-prominent notices stating that you changed the files and the date of any
-change.
-
-Disclaimer
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: transaction/trunk/MOVED_TO_GITHUB
===================================================================
--- transaction/trunk/MOVED_TO_GITHUB (rev 0)
+++ transaction/trunk/MOVED_TO_GITHUB 2013-01-05 19:00:47 UTC (rev 129019)
@@ -0,0 +1,2 @@
+See https://github.com/zopefoundation/transaction
+
Property changes on: transaction/trunk/MOVED_TO_GITHUB
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: transaction/trunk/README.txt
===================================================================
--- transaction/trunk/README.txt 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/README.txt 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,10 +0,0 @@
-============
-Transactions
-============
-
-This package contains a generic transaction implementation for Python. It is
-mainly used by the ZODB.
-
-See http://www.zodb.org/zodbbook/transactions.html for narrative
-documentation on its usage.
-
Deleted: transaction/trunk/bootstrap.py
===================================================================
--- transaction/trunk/bootstrap.py 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/bootstrap.py 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,278 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os, shutil, sys, tempfile, textwrap
-try:
- import urllib.request as urllib2
-except ImportError:
- import urllib2
-import subprocess
-from optparse import OptionParser
-
-if sys.platform == 'win32':
- def quote(c):
- if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
- else:
- return c
-else:
- quote = str
-
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
- [sys.executable, '-S', '-c',
- 'try:\n'
- ' import pickle\n'
- 'except ImportError:\n'
- ' print(1)\n'
- 'else:\n'
- ' print(0)\n'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-has_broken_dash_S = bool(int(stdout.strip()))
-
-# In order to be more robust in the face of system Pythons, we want to
-# run without site-packages loaded. This is somewhat tricky, in
-# particular because Python 2.6's distutils imports site, so starting
-# with the -S flag is not sufficient. However, we'll start with that:
-if not has_broken_dash_S and 'site' in sys.modules:
- # We will restart with python -S.
- args = sys.argv[:]
- args[0:0] = [sys.executable, '-S']
- args = list(map(quote, args))
- os.execv(sys.executable, args)
-
-# Now we are running with -S. We'll get the clean sys.path, import site
-# because distutils will do it later, and then reset the path and clean
-# out any namespace packages from site-packages that might have been
-# loaded by .pth files.
-clean_path = sys.path[:]
-import site
-sys.path[:] = clean_path
-for k, v in list(sys.modules.items()):
- if k in ('setuptools', 'pkg_resources') or (
- hasattr(v, '__path__') and
- len(v.__path__)==1 and
- not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
- # This is a namespace package. Remove it.
- sys.modules.pop(k)
-
-is_jython = sys.platform.startswith('java')
-
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
-
-# parsing arguments
-def normalize_to_url(option, opt_str, value, parser):
- if value:
- if '://' not in value: # It doesn't smell like a URL.
- value = 'file://%s' % (
- urllib2.pathname2url(
- os.path.abspath(os.path.expanduser(value))),)
- if opt_str == '--download-base' and not value.endswith('/'):
- # Download base needs a trailing slash to make the world happy.
- value += '/'
- else:
- value = None
- name = opt_str[2:].replace('-', '_')
- setattr(parser.values, name, value)
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
- help="use a specific zc.buildout version")
-parser.add_option("--setup-version", dest="setup_version",
- help="The version of setuptools or distribute to use.")
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute",
- default= sys.version_info[0] >= 3,
- help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or file location for the setup file. "
- "If you use Setuptools, this will default to " +
- setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
-parser.add_option("--download-base", action="callback", dest="download_base",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or directory for downloading "
- "zc.buildout and either Setuptools or Distribute. "
- "Defaults to PyPI."))
-parser.add_option("--eggs",
- help=("Specify a directory for storing eggs. Defaults to "
- "a temporary directory that is deleted when the "
- "bootstrap script completes."))
-parser.add_option("-t", "--accept-buildout-test-releases",
- dest='accept_buildout_test_releases',
- action="store_true",
- default=sys.version_info[0] > 2,
- help=("Normally, if you do not specify a --version, the "
- "bootstrap script and buildout gets the newest "
- "*final* versions of zc.buildout and its recipes and "
- "extensions for you. If you use this flag, "
- "bootstrap and buildout will get the newest releases "
- "even if they are alphas or betas."))
-parser.add_option("-c", None, action="store", dest="config_file",
- help=("Specify the path to the buildout configuration "
- "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
- args += ['-c', options.config_file]
-
-if options.eggs:
- eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
- eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
- if options.use_distribute:
- options.setup_source = distribute_source
- else:
- options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
-try:
- import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
- if not hasattr(pkg_resources, '_distribute'):
- raise ImportError
-except ImportError:
- ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n'.encode(), '\n'.encode())
- ez = {}
- exec(ez_code, ez)
- setup_args = dict(to_dir=eggs_dir, download_delay=0)
- if options.download_base:
- setup_args['download_base'] = options.download_base
- if options.setup_version:
- setup_args['version'] = options.setup_version
- if options.use_distribute:
- setup_args['no_fake'] = True
- ez['use_setuptools'](**setup_args)
- if 'pkg_resources' in sys.modules:
- if sys.version_info[0] >= 3:
- import imp
- reload_ = imp.reload
- else:
- reload_ = reload
-
- reload_(sys.modules['pkg_resources'])
- import pkg_resources
- # This does not (always?) update the default working set. We will
- # do it.
- for path in sys.path:
- if path not in pkg_resources.working_set.entries:
- pkg_resources.working_set.add_entry(path)
-
-cmd = [quote(sys.executable),
- '-c',
- quote('from setuptools.command.easy_install import main; main()'),
- '-mqNxd',
- quote(eggs_dir)]
-
-if not has_broken_dash_S:
- cmd.insert(1, '-S')
-
-find_links = options.download_base
-if not find_links:
- find_links = os.environ.get('bootstrap-testing-find-links')
-if find_links:
- cmd.extend(['-f', quote(find_links)])
-
-if options.use_distribute:
- setup_requirement = 'distribute'
-else:
- setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
- pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
- os.environ,
- PYTHONPATH=setup_requirement_path)
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
- # Figure out the most recent final version of zc.buildout.
- import setuptools.package_index
- _final_parts = '*final-', '*final'
- def _final_version(parsed_version):
- for part in parsed_version:
- if (part[:1] == '*') and (part not in _final_parts):
- return False
- return True
- index = setuptools.package_index.PackageIndex(
- search_path=[setup_requirement_path])
- if find_links:
- index.add_find_links((find_links,))
- req = pkg_resources.Requirement.parse(requirement)
- if index.obtain(req) is not None:
- best = []
- bestv = None
- for dist in index[req.project_name]:
- distv = dist.parsed_version
- if _final_version(distv):
- if bestv is None or distv > bestv:
- best = [dist]
- bestv = distv
- elif distv == bestv:
- best.append(dist)
- if best:
- best.sort()
- version = best[-1].version
-if version:
- requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-if is_jython:
- import subprocess
- exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
- exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
- sys.stdout.flush()
- sys.stderr.flush()
- print("An error occurred when trying to install zc.buildout. "
- "Look above this message for any errors that "
- "were output by easy_install.")
- sys.exit(exitcode)
-
-ws.add_entry(eggs_dir)
-ws.require(requirement)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
- shutil.rmtree(eggs_dir)
Deleted: transaction/trunk/buildout.cfg
===================================================================
--- transaction/trunk/buildout.cfg 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/buildout.cfg 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,7 +0,0 @@
-[buildout]
-develop = .
-parts = test
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = transaction
Deleted: transaction/trunk/ez_setup.py
===================================================================
--- transaction/trunk/ez_setup.py 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/ez_setup.py 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,234 +0,0 @@
-#!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.6c7"
-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',
-}
-
-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.
- """
- try:
- import setuptools
- 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)
- except ImportError:
- egg = download_setuptools(version, download_base, to_dir, download_delay)
- sys.path.insert(0, egg)
- import setuptools; setuptools.bootstrap_install_from = egg
-
- import pkg_resources
- try:
- pkg_resources.require("setuptools>="+version)
-
- except pkg_resources.VersionConflict, e:
- # XXX could we install in a subprocess here?
- 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.\n\n(Currently using %r)"
- ) % (version, e.args[0])
- sys.exit(2)
-
-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':
- # tell the user to uninstall obsolete version
- use_setuptools(version)
-
- 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:])
-
-
-
-
-
Deleted: transaction/trunk/setup.cfg
===================================================================
--- transaction/trunk/setup.cfg 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/setup.cfg 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,9 +0,0 @@
-[nosetests]
-nocapture=1
-cover-package=transaction
-cover-erase=1
-where=transaction
-
-[aliases]
-dev = develop easy_install transaction[testing]
-docs = develop easy_install transaction[docs]
Deleted: transaction/trunk/setup.py
===================================================================
--- transaction/trunk/setup.py 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/setup.py 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,70 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-
-__version__ = '1.4.1dev'
-
-import os
-
-from setuptools import setup, find_packages
-
-here = os.path.abspath(os.path.dirname(__file__))
-README = (open(os.path.join(here, 'README.txt')).read()
- + '\n\n' +
- open(os.path.join(here, 'CHANGES.txt')).read())
-
-setup(name='transaction',
- version=__version__,
- description='Transaction management for Python',
- long_description=README,
- classifiers=[
- "Development Status :: 6 - Mature",
- "License :: OSI Approved :: Zope Public License",
- "Programming Language :: Python",
- "Topic :: Database",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Operating System :: Microsoft :: Windows",
- "Operating System :: Unix",
- "Programming Language :: Python",
- "Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.6",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.2",
- "Programming Language :: Python :: 3.3",
- "Programming Language :: Python :: Implementation :: CPython",
- "Programming Language :: Python :: Implementation :: PyPy",
- "Framework :: ZODB",
- ],
- author="Zope Corporation",
- author_email="zodb-dev at zope.org",
- url="http://www.zope.org/Products/ZODB",
- license="ZPL 2.1",
- platforms=["any"],
- packages=find_packages(),
- include_package_data=True,
- zip_safe=False,
- test_suite="transaction.tests",
- tests_require = [
- 'zope.interface',
- ],
- install_requires=[
- 'zope.interface',
- ],
- extras_require = {
- 'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
- 'testing': ['nose', 'coverage'],
- },
- entry_points = """\
- """
-)
Deleted: transaction/trunk/tox.ini
===================================================================
--- transaction/trunk/tox.ini 2013-01-05 18:57:01 UTC (rev 129018)
+++ transaction/trunk/tox.ini 2013-01-05 19:00:47 UTC (rev 129019)
@@ -1,35 +0,0 @@
-[tox]
-envlist =
-# Jython support pending 2.7 support, due 2012-07-15 or so. See:
-# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
-# py26,py27,py32,pypy,jython,coverage
- py26,py27,py32,py33,pypy,coverage,docs
-
-[testenv]
-commands =
- python setup.py test -q
-deps = transaction
-
-[testenv:jython]
-commands =
- jython setup.py test -q
-
-[testenv:coverage]
-basepython =
- python2.6
-commands =
- nosetests --with-xunit --with-xcoverage
-deps =
- nose
- coverage
- nosexcover
-
-[testenv:docs]
-basepython =
- python2.6
-commands =
- sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
- sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
-deps =
- Sphinx
- repoze.sphinx.autointerface
More information about the checkins
mailing list