[Checkins] SVN: zope.minmax/trunk/ Added Py 3.3 and PyPy support.
Stephen Richter
cvs-admin at zope.org
Wed Feb 20 04:36:56 UTC 2013
Log message for revision 129512:
Added Py 3.3 and PyPy support.
Changed:
_U zope.minmax/trunk/
U zope.minmax/trunk/CHANGES.txt
A zope.minmax/trunk/MANIFEST.in
U zope.minmax/trunk/bootstrap.py
U zope.minmax/trunk/setup.py
U zope.minmax/trunk/src/zope/minmax/_minmax.py
U zope.minmax/trunk/src/zope/minmax/minmax.txt
A zope.minmax/trunk/tox.ini
-=-
Property changes on: zope.minmax/trunk
___________________________________________________________________
Modified: svn:ignore
- bin
parts
develop-eggs
.installed.cfg
+ bin
coverage
parts
develop-eggs
.installed.cfg
.tox
.coverage
*.xml
Modified: zope.minmax/trunk/CHANGES.txt
===================================================================
--- zope.minmax/trunk/CHANGES.txt 2013-02-20 03:42:16 UTC (rev 129511)
+++ zope.minmax/trunk/CHANGES.txt 2013-02-20 04:36:56 UTC (rev 129512)
@@ -5,6 +5,8 @@
2.0.0 (unreleased)
------------------
+- Added Python 3.3 and PyPy 1.9 support.
+
- Replaced deprecated ``zope.interface.implements`` usage with equivalent
``zope.interface.implementer`` decorator.
Added: zope.minmax/trunk/MANIFEST.in
===================================================================
--- zope.minmax/trunk/MANIFEST.in (rev 0)
+++ zope.minmax/trunk/MANIFEST.in 2013-02-20 04:36:56 UTC (rev 129512)
@@ -0,0 +1,9 @@
+include *.rst
+include *.txt
+include bootstrap.py
+include buildout.cfg
+include tox.ini
+
+recursive-include src *
+
+global-exclude *.pyc
Modified: zope.minmax/trunk/bootstrap.py
===================================================================
--- zope.minmax/trunk/bootstrap.py 2013-02-20 03:42:16 UTC (rev 129511)
+++ zope.minmax/trunk/bootstrap.py 2013-02-20 04:36:56 UTC (rev 129512)
@@ -18,33 +18,148 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile
+from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-import pkg_resources
+Bootstraps a buildout-based project.
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
-ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+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", help="use a specific zc.buildout version")
+
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ 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", "--config-file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+parser.add_option("-f", "--find-links",
+ help=("Specify a URL to search for buildout releases"))
+
+
+options, args = parser.parse_args()
+
+######################################################################
+# load/install distribute
+
+to_reload = False
+try:
+ import pkg_resources, setuptools
+ if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
+ raise ImportError
+except ImportError:
+ ez = {}
+
+ try:
+ from urllib.request import urlopen
+ except ImportError:
+ from urllib2 import urlopen
+
+ exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
+ setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
+ ez['use_setuptools'](**setup_args)
+
+ if to_reload:
+ reload(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)
+
+######################################################################
+# Install buildout
+
+ws = pkg_resources.working_set
+
+cmd = [sys.executable, '-c',
+ 'from setuptools.command.easy_install import main; main()',
+ '-mZqNxd', tmpeggs]
+
+find_links = os.environ.get(
+ 'bootstrap-testing-find-links',
+ options.find_links or
+ ('http://downloads.buildout.org/'
+ if options.accept_buildout_test_releases else None)
+ )
+if find_links:
+ cmd.extend(['-f', find_links])
+
+distribute_path = ws.find(
+ pkg_resources.Requirement.parse('distribute')).location
+
+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=[distribute_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)
+
+import subprocess
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+ raise Exception(
+ "Failed to execute command:\n%s",
+ repr(cmd)[1:-1])
+
+######################################################################
+# Import and run buildout
+
ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require(requirement)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+
+if not [a for a in args if '=' not in a]:
+ args.append('bootstrap')
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args[0:0] = ['-c', options.config_file]
+
+zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
Modified: zope.minmax/trunk/setup.py
===================================================================
--- zope.minmax/trunk/setup.py 2013-02-20 03:42:16 UTC (rev 129511)
+++ zope.minmax/trunk/setup.py 2013-02-20 04:36:56 UTC (rev 129512)
@@ -58,6 +58,10 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
],
@@ -69,10 +73,11 @@
test=[], # removed zope.testing; leaving for backward compatibility
),
install_requires=[
+ 'persistent',
'setuptools',
- 'ZODB3',
'zope.interface',
],
+ test_suite = 'zope.minmax.tests.test_suite',
include_package_data=True,
zip_safe=False,
)
Modified: zope.minmax/trunk/src/zope/minmax/_minmax.py
===================================================================
--- zope.minmax/trunk/src/zope/minmax/_minmax.py 2013-02-20 03:42:16 UTC (rev 129511)
+++ zope.minmax/trunk/src/zope/minmax/_minmax.py 2013-02-20 04:36:56 UTC (rev 129512)
@@ -15,9 +15,12 @@
def __setstate__(self, value):
self.value = value
- def __nonzero__(self):
+ def __bool__(self):
return bool(self.value)
+ # Py3: __nonzero__ is the old Python 2 name.
+ __nonzero__ = __bool__
+
def _p_resolveConflict(self, old, commited, new):
raise NotImplementedError()
Modified: zope.minmax/trunk/src/zope/minmax/minmax.txt
===================================================================
--- zope.minmax/trunk/src/zope/minmax/minmax.txt 2013-02-20 03:42:16 UTC (rev 129511)
+++ zope.minmax/trunk/src/zope/minmax/minmax.txt 2013-02-20 04:36:56 UTC (rev 129512)
@@ -27,13 +27,13 @@
>>> bool(max_favored)
False
- >>> print max_favored.value
+ >>> print(max_favored.value)
None
Now, we can store a new value in the object.
>>> max_favored.value = 11
- >>> print max_favored.value
+ >>> print(max_favored.value)
11
>>> bool(max_favored)
True
@@ -43,7 +43,7 @@
>>> max_favored.__setstate__(4532)
>>> max_favored.__getstate__()
4532
- >>> print max_favored.value
+ >>> print(max_favored.value)
4532
>>> bool(max_favored)
True
@@ -67,13 +67,13 @@
>>> bool(min_favored)
False
- >>> print min_favored.value
+ >>> print(min_favored.value)
None
Let's populate this one too.
>>> min_favored.value = 22
- >>> print min_favored.value
+ >>> print(min_favored.value)
22
>>> bool(min_favored)
True
@@ -83,7 +83,7 @@
>>> min_favored.__setstate__(8796)
>>> min_favored.__getstate__()
8796
- >>> print min_favored.value
+ >>> print(min_favored.value)
8796
>>> bool(min_favored)
True
@@ -138,7 +138,7 @@
How about an example that is not numerical?
>>> max_word = zope.minmax.Maximum('joy')
- >>> print max_word.value
+ >>> print(max_word.value)
joy
>>> bool(max_word)
True
@@ -147,7 +147,7 @@
>>> max_word._p_resolveConflict(max_word.value, 'exuberance', 'happiness')
'happiness'
>>> min_word = zope.minmax.Minimum(max_word.value)
- >>> print min_word.value
+ >>> print(min_word.value)
joy
>>> bool(min_word)
True
Added: zope.minmax/trunk/tox.ini
===================================================================
--- zope.minmax/trunk/tox.ini (rev 0)
+++ zope.minmax/trunk/tox.ini 2013-02-20 04:36:56 UTC (rev 129512)
@@ -0,0 +1,29 @@
+[tox]
+envlist =
+ py26,py27,py33,pypy
+
+[testenv]
+commands =
+ python setup.py test -q
+# without explicit deps, setup.py test will download a bunch of eggs into $PWD
+# (and it seems I can't use zope.dottedname[testing] here, so forget DRY)
+deps =
+ persistent
+ zope.interface
+
+[testenv:coverage]
+basepython =
+ python2.7
+commands =
+# The installed version messes up nose's test discovery / coverage reporting
+# So, we uninstall that from the environment, and then install the editable
+# version, before running nosetests.
+ pip uninstall -y zope.minmax
+ pip install -e .
+ nosetests --with-xunit --with-xcoverage
+deps =
+ nose
+ coverage
+ nosexcover
+ persistent
+ zope.interface
More information about the checkins
mailing list