[Checkins] SVN: zc.lockfile/trunk/ - Added Trove classifiers and made setup.py zest.releaser friendly.
Stephen Richter
cvs-admin at zope.org
Tue Feb 12 17:32:32 UTC 2013
Log message for revision 129318:
- Added Trove classifiers and made setup.py zest.releaser friendly.
- Added Python 3.2, 3.3 and PyPy 1.9 support.
- Removed Python 2.4 and Python 2.5 support.
Changed:
_U zc.lockfile/trunk/
U zc.lockfile/trunk/CHANGES.txt
A zc.lockfile/trunk/MANIFEST.in
U zc.lockfile/trunk/bootstrap.py
U zc.lockfile/trunk/setup.py
U zc.lockfile/trunk/src/zc/lockfile/README.txt
U zc.lockfile/trunk/src/zc/lockfile/tests.py
A zc.lockfile/trunk/tox.ini
-=-
Property changes on: zc.lockfile/trunk
___________________________________________________________________
Modified: svn:ignore
- .installed.cfg
bin
develop-eggs
dist
doc.txt
parts
+ .coverage
.installed.cfg
.tox
bin
develop-eggs
dist
doc.txt
parts
*.xml
Modified: zc.lockfile/trunk/CHANGES.txt
===================================================================
--- zc.lockfile/trunk/CHANGES.txt 2013-02-12 14:52:01 UTC (rev 129317)
+++ zc.lockfile/trunk/CHANGES.txt 2013-02-12 17:32:32 UTC (rev 129318)
@@ -1,12 +1,23 @@
Change History
***************
+1.1.0 (unreleased)
+==================
+
+- Added Trove classifiers and made setup.py zest.releaser friendly.
+
+- Added Python 3.2, 3.3 and PyPy 1.9 support.
+
+- Removed Python 2.4 and Python 2.5 support.
+
+
1.0.2 (2012-12-02)
==================
- Fixed: the fix included in 1.0.1 caused multiple pids to be written
to the lock file
+
1.0.1 (2012-11-30)
==================
Added: zc.lockfile/trunk/MANIFEST.in
===================================================================
--- zc.lockfile/trunk/MANIFEST.in (rev 0)
+++ zc.lockfile/trunk/MANIFEST.in 2013-02-12 17:32:32 UTC (rev 129318)
@@ -0,0 +1,9 @@
+include *.rst
+include *.txt
+include tox.ini
+include bootstrap.py
+include buildout.cfg
+
+recursive-include src *
+
+global-exclude *.pyc
Modified: zc.lockfile/trunk/bootstrap.py
===================================================================
--- zc.lockfile/trunk/bootstrap.py 2013-02-12 14:52:01 UTC (rev 129317)
+++ zc.lockfile/trunk/bootstrap.py 2013-02-12 17:32:32 UTC (rev 129318)
@@ -18,75 +18,11 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+import os, shutil, sys, tempfile
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
+tmpeggs = tempfile.mkdtemp()
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
- [sys.executable, '-Sc',
- 'try:\n'
- ' import ConfigParser\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 = 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 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' % (
- urllib.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]
@@ -100,26 +36,8 @@
'''
parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
- help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute", default=False,
- 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("-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,
@@ -129,49 +47,38 @@
"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",
+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()
-# 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]
+######################################################################
+# load/install distribute
-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')
-
+to_reload = False
try:
- import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ import pkg_resources, setuptools
if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
raise ImportError
except ImportError:
- ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n', '\n')
ez = {}
- exec ez_code in ez
- setup_args = dict(to_dir=eggs_dir, download_delay=0)
- if options.download_base:
- setup_args['download_base'] = options.download_base
- if options.use_distribute:
- setup_args['no_fake'] = True
+
+ 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 'pkg_resources' in sys.modules:
- reload(sys.modules['pkg_resources'])
+
+ if to_reload:
+ reload(pkg_resources)
import pkg_resources
# This does not (always?) update the default working set. We will
# do it.
@@ -179,31 +86,26 @@
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)]
+######################################################################
+# Install buildout
-if not has_broken_dash_S:
- cmd.insert(1, '-S')
+ws = pkg_resources.working_set
-find_links = options.download_base
-if not find_links:
- find_links = os.environ.get('bootstrap-testing-find-links')
+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', quote(find_links)])
+ cmd.extend(['-f', 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)
+distribute_path = ws.find(
+ pkg_resources.Requirement.parse('distribute')).location
requirement = 'zc.buildout'
version = options.version
@@ -217,7 +119,7 @@
return False
return True
index = setuptools.package_index.PackageIndex(
- search_path=[setup_requirement_path])
+ search_path=[distribute_path])
if find_links:
index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement)
@@ -239,22 +141,25 @@
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)
+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])
-ws.add_entry(eggs_dir)
+######################################################################
+# Import and run buildout
+
+ws.add_entry(tmpeggs)
ws.require(requirement)
import zc.buildout.buildout
+
+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)
-if not options.eggs: # clean up temporary egg directory
- shutil.rmtree(eggs_dir)
+shutil.rmtree(tmpeggs)
Modified: zc.lockfile/trunk/setup.py
===================================================================
--- zc.lockfile/trunk/setup.py 2013-02-12 14:52:01 UTC (rev 129317)
+++ zc.lockfile/trunk/setup.py 2013-02-12 17:32:32 UTC (rev 129318)
@@ -11,8 +11,6 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-name, version = "zc.lockfile", '0'
-
import os
from setuptools import setup, find_packages
@@ -36,15 +34,15 @@
open('doc.txt', 'w').write(long_description)
setup(
- name = name, version=version,
+ name = 'zc.lockfile',
+ version = '1.1.0dev0',
author = "Jim Fulton",
author_email = "jim at zope.com",
description = "Basic inter-process locks",
long_description=long_description,
license = "ZPL 2.1",
keywords = "lock",
- url='http://www.python.org/pypi/'+name,
-
+ url='http://www.python.org/pypi/zc.lockfile',
packages = find_packages('src'),
package_dir = {'': 'src'},
namespace_packages = ['zc'],
@@ -53,13 +51,27 @@
test=[
'zope.testing',
]),
- include_package_data = True,
- zip_safe=False,
classifiers = [
- 'Programming Language :: Python',
+ 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
+ 'Natural Language :: English',
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
+ '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',
+ 'Topic :: Software Development',
],
+ test_suite="zc.lockfile.tests.test_suite",
+ tests_require=[
+ 'zope.testing'],
+ include_package_data = True,
+ zip_safe=False,
)
Modified: zc.lockfile/trunk/src/zc/lockfile/README.txt
===================================================================
--- zc.lockfile/trunk/src/zc/lockfile/README.txt 2013-02-12 14:52:01 UTC (rev 129317)
+++ zc.lockfile/trunk/src/zc/lockfile/README.txt 2013-02-12 17:32:32 UTC (rev 129318)
@@ -16,11 +16,11 @@
>>> try:
... zc.lockfile.LockFile('lock')
... except zc.lockfile.LockError:
- ... print "Can't lock file"
+ ... print("Can't lock file")
Can't lock file
>>> for record in handler.records: # doctest: +ELLIPSIS
- ... print record.levelname, record.getMessage()
+ ... print(record.levelname+' '+record.getMessage())
ERROR Error locking file lock; pid=...
To release the lock, use it's close method:
Modified: zc.lockfile/trunk/src/zc/lockfile/tests.py
===================================================================
--- zc.lockfile/trunk/src/zc/lockfile/tests.py 2013-02-12 14:52:01 UTC (rev 129317)
+++ zc.lockfile/trunk/src/zc/lockfile/tests.py 2013-02-12 17:32:32 UTC (rev 129318)
@@ -11,10 +11,15 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-from zope.testing import setupstack
-import os, sys, unittest, doctest
+import os, re, sys, unittest, doctest
import zc.lockfile, time, threading
+from zope.testing import renormalizing, setupstack
+checker = renormalizing.RENormalizing([
+ # Python 3 adds module path to error class name.
+ (re.compile("zc\.lockfile\.LockError:"),
+ r"LockError:"),
+ ])
def inc():
while 1:
@@ -29,20 +34,23 @@
time.sleep(0.01)
v += 1
f.seek(0)
- f.write('%d\n' % v)
+ f.write(('%d\n' % v).encode('ASCII'))
f.close()
lock.close()
def many_threads_read_and_write():
r"""
- >>> open('f', 'w+b').write('0\n')
- >>> open('f.lock', 'w+b').write('0\n')
+ >>> with open('f', 'w+b') as file:
+ ... _ = file.write(b'0\n')
+ >>> with open('f.lock', 'w+b') as file:
+ ... _ = file.write(b'0\n')
>>> n = 50
>>> threads = [threading.Thread(target=inc) for i in range(n)]
>>> _ = [thread.start() for thread in threads]
>>> _ = [thread.join() for thread in threads]
- >>> saved = int(open('f', 'rb').readline().strip())
+ >>> with open('f', 'rb') as file:
+ ... saved = int(file.read().strip())
>>> saved == n
True
@@ -65,7 +73,7 @@
>>> pid = os.getpid()
>>> lock = zc.lockfile.LockFile("f.lock")
>>> f = open("f.lock")
- >>> f.seek(1)
+ >>> _ = f.seek(1)
>>> f.read().strip() == str(pid)
True
>>> f.close()
@@ -78,7 +86,7 @@
LockError: Couldn't lock 'f.lock'
>>> f = open("f.lock")
- >>> f.seek(1)
+ >>> _ = f.seek(1)
>>> f.read().strip() == str(pid)
True
>>> f.close()
@@ -89,8 +97,9 @@
def test_suite():
suite = unittest.TestSuite()
suite.addTest(doctest.DocFileSuite(
- 'README.txt',
+ 'README.txt', checker=checker,
setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown))
suite.addTest(doctest.DocTestSuite(
- setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown))
+ setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown,
+ checker=checker))
return suite
Added: zc.lockfile/trunk/tox.ini
===================================================================
--- zc.lockfile/trunk/tox.ini (rev 0)
+++ zc.lockfile/trunk/tox.ini 2013-02-12 17:32:32 UTC (rev 129318)
@@ -0,0 +1,25 @@
+[tox]
+envlist =
+ py26,py27,py32,py33
+
+[testenv]
+commands =
+ python setup.py test -q
+# without explicit deps, setup.py test will download a bunch of eggs into $PWD
+deps =
+ zope.testing
+
+[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 zc.lockfile
+ pip install -e .
+ nosetests --with-xunit --with-xcoverage
+deps =
+ nose
+ coverage
+ nosexcover
More information about the checkins
mailing list