diff -Nru zope.app.zcmlfiles-3.7.1/CHANGES.txt zope.app.zcmlfiles-3.8.0/CHANGES.txt --- zope.app.zcmlfiles-3.7.1/CHANGES.txt 2011-07-26 14:25:44.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/CHANGES.txt 2013-08-27 16:07:18.000000000 +0000 @@ -1,6 +1,14 @@ Change History ============== +3.8.0 (2013-08-27) +------------------ + +- Remove include of ``zope.app.zopeappgenerations`` that is not useful unless + upgrading a database older than Zope 3.4. This cuts the last dependency on + ``zope.app.authentication`` from the ZTK. + + 3.7.1 (2011-07-26) ------------------ diff -Nru zope.app.zcmlfiles-3.7.1/MANIFEST.in zope.app.zcmlfiles-3.8.0/MANIFEST.in --- zope.app.zcmlfiles-3.7.1/MANIFEST.in 1970-01-01 00:00:00.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/MANIFEST.in 2013-08-27 16:07:18.000000000 +0000 @@ -0,0 +1,7 @@ +include *.txt +include *.py +include buildout.cfg + +recursive-include src *.zcml + +global-exclude *.pyc diff -Nru zope.app.zcmlfiles-3.7.1/PKG-INFO zope.app.zcmlfiles-3.8.0/PKG-INFO --- zope.app.zcmlfiles-3.7.1/PKG-INFO 2011-07-26 14:27:32.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/PKG-INFO 2013-08-27 16:07:26.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: zope.app.zcmlfiles -Version: 3.7.1 +Version: 3.8.0 Summary: Zope application server ZCML files Home-page: http://pypi.python.org/pypi/zope.app.zcmlfiles Author: Zope Corporation and Contributors @@ -15,6 +15,14 @@ Change History ============== + 3.8.0 (2013-08-27) + ------------------ + + - Remove include of ``zope.app.zopeappgenerations`` that is not useful unless + upgrading a database older than Zope 3.4. This cuts the last dependency on + ``zope.app.authentication`` from the ZTK. + + 3.7.1 (2011-07-26) ------------------ diff -Nru zope.app.zcmlfiles-3.7.1/bootstrap.py zope.app.zcmlfiles-3.8.0/bootstrap.py --- zope.app.zcmlfiles-3.7.1/bootstrap.py 2011-07-26 14:25:44.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/bootstrap.py 2013-08-27 16:07:18.000000000 +0000 @@ -18,33 +18,260 @@ use the -c option to specify an alternate configuration file. """ -import os, shutil, sys, tempfile, urllib2 +import os, shutil, sys, tempfile, urllib, urllib2, subprocess +from optparse import OptionParser -tmpeggs = tempfile.mkdtemp() +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 -ez = {} -exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py' - ).read() in ez -ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) +# 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())) -import pkg_resources +# 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 # imported because of its side effects +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) -cmd = 'from setuptools.command.easy_install import main; main()' -if sys.platform == 'win32': - cmd = '"%s"' % cmd # work around spawn lamosity on windows +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] + +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("-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("-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", None, action="store", dest="config_file", + help=("Specify the path to the buildout configuration " + "file to be used.")) + +options, args = parser.parse_args() + +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.insert(0, 'buildout:accept-buildout-test-releases=true') +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', '\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 + if sys.version_info[:2] == (2, 4): + setup_args['version'] = '0.6.32' + ez['use_setuptools'](**setup_args) + if 'pkg_resources' in sys.modules: + 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 not find_links and options.accept_buildout_test_releases: + find_links = 'http://downloads.buildout.org/' +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 -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 +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 distv >= pkg_resources.parse_version('2dev'): + continue + 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 += '=='+version +else: + requirement += '<2dev' -ws.add_entry(tmpeggs) -ws.require('zc.buildout') +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(sys.argv[1:] + ['bootstrap']) -shutil.rmtree(tmpeggs) + +# If there isn't already a command in the args, add 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's 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) diff -Nru zope.app.zcmlfiles-3.7.1/debian/changelog zope.app.zcmlfiles-3.8.0/debian/changelog --- zope.app.zcmlfiles-3.7.1/debian/changelog 2011-12-31 08:19:15.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/debian/changelog 2013-08-27 16:36:40.000000000 +0000 @@ -1,3 +1,14 @@ +zope.app.zcmlfiles (3.8.0-0ubuntu1) saucy; urgency=low + + * New upstream release. + - Remove dependency on zope.app.zopeappgenerations and + zope.app.authentication. + * debian/control: + - bump Standards-Version to 3.9.4 + * debian/tests: switch to zope.testrunner + + -- Gediminas Paulauskas Tue, 27 Aug 2013 19:32:38 +0300 + zope.app.zcmlfiles (3.7.1-0ubuntu2) precise; urgency=low * Rebuild to drop python2.6 dependencies. diff -Nru zope.app.zcmlfiles-3.7.1/debian/control zope.app.zcmlfiles-3.8.0/debian/control --- zope.app.zcmlfiles-3.7.1/debian/control 2011-07-27 16:42:18.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/debian/control 2013-08-27 16:36:20.000000000 +0000 @@ -3,9 +3,11 @@ Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Gediminas Paulauskas -Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), - python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4) -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 7), + python-all (>= 2.6.6-3~), + python-setuptools, + python-van.pydeb, +Standards-Version: 3.9.4 X-Python-Version: >= 2.4 Package: python-zope.app.zcmlfiles diff -Nru zope.app.zcmlfiles-3.7.1/debian/tests/all zope.app.zcmlfiles-3.8.0/debian/tests/all --- zope.app.zcmlfiles-3.7.1/debian/tests/all 2011-07-26 09:53:37.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/debian/tests/all 2013-08-27 16:35:12.000000000 +0000 @@ -1,2 +1,3 @@ #!/bin/bash -. /usr/share/python-zope.testing/test_helper +testfilter='-s zope.app.zcmlfiles' +. /usr/share/python-zope.testrunner/test_helper diff -Nru zope.app.zcmlfiles-3.7.1/debian/tests/control zope.app.zcmlfiles-3.8.0/debian/tests/control --- zope.app.zcmlfiles-3.7.1/debian/tests/control 2011-07-26 09:53:37.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/debian/tests/control 2013-08-27 16:34:27.000000000 +0000 @@ -1,3 +1,2 @@ Tests: all -Features: no-build-needed -Depends: @, python-zope.testing, python-zope.app.testing +Depends: @, python-zope.testrunner, python-zope.app.testing diff -Nru zope.app.zcmlfiles-3.7.1/setup.py zope.app.zcmlfiles-3.8.0/setup.py --- zope.app.zcmlfiles-3.7.1/setup.py 2011-07-26 14:25:44.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/setup.py 2013-08-27 16:07:18.000000000 +0000 @@ -37,7 +37,7 @@ setup( name='zope.app.zcmlfiles', - version='3.7.1', + version='3.8.0', url='http://pypi.python.org/pypi/zope.app.zcmlfiles', author='Zope Corporation and Contributors', author_email='zope-dev@zope.org', @@ -98,7 +98,6 @@ 'zope.app.schema', 'zope.app.security', 'zope.app.wsgi', - 'zope.app.zopeappgenerations', ], zip_safe=False, ) diff -Nru zope.app.zcmlfiles-3.7.1/src/zope/app/zcmlfiles/configure.zcml zope.app.zcmlfiles-3.8.0/src/zope/app/zcmlfiles/configure.zcml --- zope.app.zcmlfiles-3.7.1/src/zope/app/zcmlfiles/configure.zcml 2011-07-26 14:25:44.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/src/zope/app/zcmlfiles/configure.zcml 2013-08-27 16:07:18.000000000 +0000 @@ -50,7 +50,6 @@ - diff -Nru zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/PKG-INFO zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/PKG-INFO --- zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/PKG-INFO 2011-07-26 14:27:30.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/PKG-INFO 2013-08-27 16:07:22.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: zope.app.zcmlfiles -Version: 3.7.1 +Version: 3.8.0 Summary: Zope application server ZCML files Home-page: http://pypi.python.org/pypi/zope.app.zcmlfiles Author: Zope Corporation and Contributors @@ -15,6 +15,14 @@ Change History ============== + 3.8.0 (2013-08-27) + ------------------ + + - Remove include of ``zope.app.zopeappgenerations`` that is not useful unless + upgrading a database older than Zope 3.4. This cuts the last dependency on + ``zope.app.authentication`` from the ZTK. + + 3.7.1 (2011-07-26) ------------------ diff -Nru zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/SOURCES.txt zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/SOURCES.txt --- zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/SOURCES.txt 2011-07-26 14:27:30.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/SOURCES.txt 2013-08-27 16:07:22.000000000 +0000 @@ -1,6 +1,7 @@ CHANGES.txt COPYRIGHT.txt LICENSE.txt +MANIFEST.in README.txt bootstrap.py buildout.cfg diff -Nru zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/requires.txt zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/requires.txt --- zope.app.zcmlfiles-3.7.1/src/zope.app.zcmlfiles.egg-info/requires.txt 2011-07-26 14:27:30.000000000 +0000 +++ zope.app.zcmlfiles-3.8.0/src/zope.app.zcmlfiles.egg-info/requires.txt 2013-08-27 16:07:22.000000000 +0000 @@ -34,7 +34,6 @@ zope.app.schema zope.app.security zope.app.wsgi -zope.app.zopeappgenerations [test] zope.app.testing \ No newline at end of file