From b5c8aede3116b747ea8b31a0c0305d42f610000b Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Oct 2020 17:25:47 +0100 Subject: [PATCH 1/5] Test against Zope 5. Python 2.7 and 3.5 are still tested against Zope 4, the newer versions against Zope 5. --- bootstrap.py | 210 -------------------------------------------------- buildout.cfg | 2 +- buildout4.cfg | 4 + tox.ini | 5 +- 4 files changed, 8 insertions(+), 213 deletions(-) delete mode 100644 bootstrap.py create mode 100644 buildout4.cfg diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index 1f59b213..00000000 --- a/bootstrap.py +++ /dev/null @@ -1,210 +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 -import shutil -import sys -import tempfile - -from optparse import OptionParser - -__version__ = '2015-07-01' -# See zc.buildout's changelog if this version is up to date. - -tmpeggs = tempfile.mkdtemp(prefix='bootstrap-') - -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 --find-links to point to local resources, you can keep -this script from going over the network. -''' - -parser = OptionParser(usage=usage) -parser.add_option("--version", - action="store_true", default=False, - help=("Return bootstrap.py 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 --buildout-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")) -parser.add_option("--allow-site-packages", - action="store_true", default=False, - help=("Let bootstrap.py use existing site packages")) -parser.add_option("--buildout-version", - help="Use a specific zc.buildout version") -parser.add_option("--setuptools-version", - help="Use a specific setuptools version") -parser.add_option("--setuptools-to-dir", - help=("Allow for re-use of existing directory of " - "setuptools versions")) - -options, args = parser.parse_args() -if options.version: - print("bootstrap.py version %s" % __version__) - sys.exit(0) - - -###################################################################### -# load/install setuptools - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - -ez = {} -if os.path.exists('ez_setup.py'): - exec(open('ez_setup.py').read(), ez) -else: - exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez) - -if not options.allow_site_packages: - # ez_setup imports site, which adds site packages - # this will remove them from the path to ensure that incompatible versions - # of setuptools are not in the path - import site - # inside a virtualenv, there is no 'getsitepackages'. - # We can't remove these reliably - if hasattr(site, 'getsitepackages'): - for sitepackage_path in site.getsitepackages(): - # Strip all site-packages directories from sys.path that - # are not sys.prefix; this is because on Windows - # sys.prefix is a site-package directory. - if sitepackage_path != sys.prefix: - sys.path[:] = [x for x in sys.path - if sitepackage_path not in x] - -setup_args = dict(to_dir=tmpeggs, download_delay=0) - -if options.setuptools_version is not None: - setup_args['version'] = options.setuptools_version -if options.setuptools_to_dir is not None: - setup_args['to_dir'] = options.setuptools_to_dir - -ez['use_setuptools'](**setup_args) -import setuptools -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 - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -# Fix sys.path here as easy_install.pth added before PYTHONPATH -cmd = [sys.executable, '-c', - 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path + - '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]) - -requirement = 'zc.buildout' -version = options.buildout_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): - try: - return not parsed_version.is_prerelease - except AttributeError: - # Older setuptools - 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=[setuptools_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) != 0: - raise Exception( - "Failed to execute command:\n%s" % repr(cmd)[1:-1]) - -###################################################################### -# 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) -shutil.rmtree(tmpeggs) diff --git a/buildout.cfg b/buildout.cfg index 247ce681..30a48b7d 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,6 +1,6 @@ [buildout] extends = - http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg + http://zopefoundation.github.io/Zope/releases/master/versions.cfg develop = . parts = test diff --git a/buildout4.cfg b/buildout4.cfg new file mode 100644 index 00000000..d39da265 --- /dev/null +++ b/buildout4.cfg @@ -0,0 +1,4 @@ +[buildout] +extends = + buildout.cfg + http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg diff --git a/tox.ini b/tox.ini index d55a54e2..f07f5673 100644 --- a/tox.ini +++ b/tox.ini @@ -9,9 +9,10 @@ envlist = coverage, [testenv] +commands_pre = + py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} -c buildout4.cfg install test + !py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test commands = - {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap - {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test coverage run {envbindir}/test skip_install = true deps = From 5ca956cdbab87be651843c2987b3b0f456edd0cc Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Oct 2020 17:41:37 +0100 Subject: [PATCH 2/5] Try to pin Zope version here. --- buildout4.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildout4.cfg b/buildout4.cfg index d39da265..f51e037f 100644 --- a/buildout4.cfg +++ b/buildout4.cfg @@ -2,3 +2,6 @@ extends = buildout.cfg http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg + +[versions] +Zope = < 5.0.dev0 From cd4db8dcaf2fbd9602c07eb5647e81d95722a991 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Oct 2020 17:44:56 +0100 Subject: [PATCH 3/5] The version range got ignored, let's see what happens with a pin. --- .travis.yml | 6 +++--- buildout4.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbf42f35..bf2e7ebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,11 @@ matrix: env: TOXENV=py38 install: - - travis_retry pip install -U pip setuptools - - travis_retry pip install -U tox coveralls coverage + - pip install -U pip setuptools + - pip install -U tox coveralls coverage script: - - travis_retry tox + - tox after_success: - coverage combine diff --git a/buildout4.cfg b/buildout4.cfg index f51e037f..967954ed 100644 --- a/buildout4.cfg +++ b/buildout4.cfg @@ -4,4 +4,4 @@ extends = http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg [versions] -Zope = < 5.0.dev0 +Zope = 4.5.1 From 243f692c0f5399b1cbfc620415d84916f2054585 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Oct 2020 17:49:57 +0100 Subject: [PATCH 4/5] On Py35 buildout ran twice. Once with buildout4.cfg and once with buildout.cfg. --- tox.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index f07f5673..8685dd09 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,16 @@ [tox] envlist = - py27, - py35, - py36, - py37, - py38, - lint, - coverage, + py27 + py35 + py36 + py37 + py38 + lint + coverage [testenv] commands_pre = - py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} -c buildout4.cfg install test + py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test !py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test commands = coverage run {envbindir}/test From 94c7a99f8c94c1b328cde27aeaafd4403699e228 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Thu, 29 Oct 2020 17:54:05 +0100 Subject: [PATCH 5/5] Try another syntax. --- buildout4.cfg | 2 -- tox.ini | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildout4.cfg b/buildout4.cfg index 967954ed..b4bc6229 100644 --- a/buildout4.cfg +++ b/buildout4.cfg @@ -3,5 +3,3 @@ extends = buildout.cfg http://zopefoundation.github.io/Zope/releases/4.x/versions.cfg -[versions] -Zope = 4.5.1 diff --git a/tox.ini b/tox.ini index 8685dd09..e67467a3 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ envlist = [testenv] commands_pre = py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test - !py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test + !py27,!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test commands = coverage run {envbindir}/test skip_install = true