From 9d1fdec3eae7d8c3ef4281d9e6a722476c0cd2aa Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 30 Oct 2020 09:52:12 +0100 Subject: [PATCH 1/3] Test Python 3.6+ against Zope 5. Keep older versions running against Zope 4. --- buildout.cfg | 5 +---- buildout4.cfg | 7 +++++++ tox.ini | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 buildout4.cfg diff --git a/buildout.cfg b/buildout.cfg index fe8e673..d4ad845 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,6 +1,6 @@ [buildout] extends = - https://zopefoundation.github.io/Zope/releases/4.x/versions-prod.cfg + https://zopefoundation.github.io/Zope/releases/master/versions.cfg parts = zopepy test @@ -9,9 +9,6 @@ parts = docs develop = . -[versions] -SoupSieve = <2 - [zopepy] recipe = zc.recipe.egg interpreter = zopepy diff --git a/buildout4.cfg b/buildout4.cfg new file mode 100644 index 0000000..ae67261 --- /dev/null +++ b/buildout4.cfg @@ -0,0 +1,7 @@ +[buildout] +extends = + buildout.cfg + https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg + +[versions] +SoupSieve = <2 diff --git a/tox.ini b/tox.ini index 457246e..b66b24f 100644 --- a/tox.ini +++ b/tox.ini @@ -22,9 +22,22 @@ skip_install = true setenv = COVERAGE_FILE=.coverage.{envname} +[testenv:py27] +buildout = {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} +commands = + {[testenv:py27]buildout} install test + {envbindir}/test {posargs:-vc1} + +[testenv:py35] +buildout = {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} +commands = + {[testenv:py35]buildout} install test + {envbindir}/test {posargs:-vc1} + + [testenv:py27-zserver] commands = - {[testenv]buildout} install test-zserver + {[testenv:py27]buildout} install test-zserver coverage run {envbindir}/test-zserver {posargs:-vc1} [testenv:py37-ip_range] From 93b3f4d8dc507eebac76bae6f447de396de57be2 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 30 Oct 2020 09:52:35 +0100 Subject: [PATCH 2/3] Drop no longer needed bootstrap.py file. --- MANIFEST.in | 5 -- bootstrap.py | 210 --------------------------------------------------- 2 files changed, 215 deletions(-) delete mode 100644 bootstrap.py diff --git a/MANIFEST.in b/MANIFEST.in index 4f5d3cb..3d0a31b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,11 +3,6 @@ include *.txt include buildout.cfg include tox.ini -include bootstrap.py -exclude bootstrap.py - -exclude MANIFEST.in - recursive-include Products *.gif recursive-include Products *.objects recursive-include Products *.png diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index 1f59b21..0000000 --- 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) From c19cc8ec93fc54bc9460de1c45ae4d067e9ee899 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 30 Oct 2020 09:56:01 +0100 Subject: [PATCH 3/3] Add classifier. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e9b9dd6..1e9dec2 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ def _package_doc(name): 'Development Status :: 5 - Production/Stable', 'Framework :: Plone', 'Framework :: Zope :: 4', + 'Framework :: Zope :: 5', 'Intended Audience :: Developers', 'License :: OSI Approved :: Zope Public License', 'Programming Language :: Python',