diff --git a/.travis.yml b/.travis.yml index 7adfcce..965af70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,19 @@ language: python -sudo: false python: - 2.7 - - 3.4 - 3.5 - 3.6 + - 3.7 + - 3.8 - pypy - pypy3 env: - - DEP=test -matrix: - include: - - python: "3.7" - dist: xenial - sudo: true - - python: 2.7 - env: DEP=no_such_extra + - DEP: test + - DEP: no_such_extra + # Cannot yet set this globally pending + # https://github.com/zopefoundation/zope.publisher/issues/49 + ZOPE_INTERFACE_STRICT_IRO: 1 + install: - pip install -U pip setuptools - pip install -U coverage coveralls zope.testing zope.testrunner diff --git a/CHANGES.rst b/CHANGES.rst index d601033..5eb081a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,10 +2,15 @@ Changes ========= -2.4.1 (unreleased) +2.5.0 (unreleased) ================== -- Nothing changed yet. +- Add support for Python 3.8. + +- Drop support for Python 3.4. + +- Ensure all objects have consistent interface resolution orders. See + `issue 17 `_. 2.4.0 (2018-10-16) diff --git a/MANIFEST.in b/MANIFEST.in index 470140c..2789643 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,6 @@ include *.rst include *.txt include *.py -include buildout.cfg include tox.ini include .travis.yml include .coveragerc diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index a459921..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 --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 deleted file mode 100644 index 7bf35a3..0000000 --- a/buildout.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[buildout] -develop = . -parts = test coverage-test coverage-report - -[test] -recipe = zc.recipe.testrunner -eggs = zope.mimetype [test] - -[coverage-test] -recipe = zc.recipe.testrunner -eggs = ${test:eggs} -defaults = ['--coverage', '../../coverage'] - -[coverage-report] -recipe = zc.recipe.egg -eggs = z3c.coverage -scripts = coverage=coverage-report -arguments = ('coverage', 'coverage/report') diff --git a/setup.py b/setup.py index 862d4d1..9539578 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ def read(*rnames): ] setup(name='zope.mimetype', - version='2.4.1.dev0', + version='2.5.0.dev0', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', description="A simple package for working with MIME content types", @@ -57,10 +57,10 @@ def read(*rnames): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Natural Language :: English', diff --git a/src/zope/mimetype/interfaces.py b/src/zope/mimetype/interfaces.py index 89c1cd9..29910a3 100644 --- a/src/zope/mimetype/interfaces.py +++ b/src/zope/mimetype/interfaces.py @@ -160,8 +160,8 @@ class IContentTypeTerm(zope.schema.interfaces.ITitledTokenizedTerm): readonly=True, ) -class IContentTypeSource(zope.schema.interfaces.ISource, - zope.schema.interfaces.IIterableSource): +class IContentTypeSource(zope.schema.interfaces.IIterableSource, + zope.schema.interfaces.ISource): """Source for content types.""" diff --git a/tox.ini b/tox.ini index 8c718d6..9ead6da 100644 --- a/tox.ini +++ b/tox.ini @@ -1,32 +1,35 @@ [tox] envlist = - py27,py34,py35,py36,py37,pypy,pypy3,coverage,minimal,docs + py27,py35,py36,py37,py38,pypy,pypy3,coverage,minimal,docs [testenv] +usedevelop = true commands = zope-testrunner --test-path=src [] -deps = - .[test] +extras = + test [testenv:minimal] +extras = deps = - . zope.testrunner zope.testing +# Cannot yet set this globally, pending +# https://github.com/zopefoundation/zope.publisher/issues/49 +setenv = + ZOPE_INTERFACE_STRICT_IRO=1 [testenv:coverage] -usedevelop = true basepython = python2.7 commands = coverage run -m zope.testrunner --test-path=src [] coverage report --fail-under=100 deps = - {[testenv]deps} coverage [testenv:docs] commands = sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html -deps = - .[docs] +extras = + docs