diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..cfcdf25 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,39 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy +# +# EditorConfig Configuration file, for more details see: +# http://EditorConfig.org +# EditorConfig is a convention description, that could be interpreted +# by multiple editors to enforce common coding conventions for specific +# file types + +# top-most EditorConfig file: +# Will ignore other EditorConfig files in Home directory or upper tree level. +root = true + + +[*] # For All Files +# Unix-style newlines with a newline ending every file +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +# Set default charset +charset = utf-8 +# Indent style default +indent_style = space +# Max Line Length - a hard line wrap, should be disabled +max_line_length = off + +[*.{py,cfg,ini}] +# 4 space indentation +indent_size = 4 + +[*.{yml,zpt,pt,dtml}] +# 2 space indentation +indent_size = 2 + +[{Makefile,.gitmodules}] +# Tab indentation (no size specified, but view as 4 spaces) +indent_style = tab +indent_size = unset +tab_width = unset diff --git a/.gitignore b/.gitignore index 742f170..12eb07c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,22 @@ -bin -build -develop-eggs -dist -lib -include -man -parts - -__pycache__ -.* -*.dll +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy +*.egg-info/ +*.profraw *.pyc *.pyo -*.so -eggs/ -*.egg-info +.coverage +.installed.cfg +.mr.developer.cfg +.tox/ +__pycache__/ +bin/ +build/ coverage.xml -nosetests.xml +develop-eggs/ +dist/ +eggs/ +htmlcov/ +lib/ +lib64 +parts/ +pyvenv.cfg diff --git a/.travis.yml b/.travis.yml index 1aaa80b..e050df5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,32 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy language: python -sudo: false python: - - 2.7 - - 3.4 - - 3.5 - - 3.6 + - 2.7 + - 3.5 + - 3.6 + - 3.7 + - 3.8 + +matrix: + include: + - name: "lint" + python: 3.7 + env: TOXENV="lint" + - name: "coverage" + python: 3.7 + env: TOXENV="coverage" + after_success: + - coveralls + install: - - python bootstrap.py - - bin/buildout + - pip install -U pip + - pip install -U tox-travis coveralls + script: - - bin/test -v1 + - tox + notifications: - email: false + email: false + +cache: pip diff --git a/CHANGES.rst b/CHANGES.rst index 334ed7f..e5d814c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,9 @@ Changelog 4.2 (unreleased) ---------------- -- Nothing changed yet. +- Add support for Python 3.7 and 3.8. + +- Drop support for Python 3.4. 4.1 (2017-05-26) diff --git a/MANIFEST.in b/MANIFEST.in index 509e179..8d7661e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,17 +1,14 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy include *.rst - -recursive-include src * - -include bootstrap.py -exclude bootstrap.py - +include *.txt include buildout.cfg -exclude buildout.cfg - include tox.ini -exclude tox.ini exclude MANIFEST.in -global-exclude *.pyc -global-exclude *.pyo +recursive-include src *.pt +recursive-include src *.rst +recursive-include src *.txt +recursive-include src *.xml +recursive-include src *.zcml diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index a629566..0000000 --- a/bootstrap.py +++ /dev/null @@ -1,189 +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 - -tmpeggs = tempfile.mkdtemp() - -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("-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, - 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("--setuptools-version", - help="use a specific setuptools version") - - -options, args = parser.parse_args() - -###################################################################### -# load/install setuptools - -try: - if options.allow_site_packages: - import setuptools - import pkg_resources - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - -ez = {} -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(): - 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 - -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 - -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', find_links]) - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -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): - 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, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 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/setup.cfg b/setup.cfg index c228834..4392d63 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,12 @@ -[nosetests] -nocapture=1 -cover-package=zope.mkzeoinstance -cover-erase=1 -cover-min-percentage=100 -where=src +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy +[bdist_wheel] +universal = 1 +[flake8] +doctests = 1 + +[check-manifest] +ignore = + .travis.yml + .editorconfig diff --git a/setup.py b/setup.py index c98823d..690170d 100644 --- a/setup.py +++ b/setup.py @@ -34,9 +34,10 @@ "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", ], keywords="ZEO ZODB instance script", @@ -44,6 +45,14 @@ package_dir={'': 'src'}, namespace_packages=['zope'], include_package_data=True, + python_requires=', '.join([ + '>=2.7', + '!=3.0.*', + '!=3.1.*', + '!=3.2.*', + '!=3.3.*', + '!=3.4.*', + ]), install_requires=[ 'setuptools', 'zdaemon', diff --git a/src/zope/mkzeoinstance/__init__.py b/src/zope/mkzeoinstance/__init__.py index 9c22197..c6094b7 100644 --- a/src/zope/mkzeoinstance/__init__.py +++ b/src/zope/mkzeoinstance/__init__.py @@ -46,7 +46,7 @@ try: text_type = unicode -except NameError: # pragma: NO COVER Py3k +except NameError: # pragma: PY3 text_type = str @@ -186,10 +186,10 @@ def run(self, argv, ): try: opts, args = getopt.getopt(argv, "h", ["help"]) - except getopt.error as msg: # pragma: NO COVER + except getopt.error as msg: # pragma: nocover usage(msg, 1) - for k, v in opts: # pragma: NO COVER + for k, v in opts: # pragma: nocover if k in ('-h', '--help'): usage(rc=2) @@ -265,6 +265,6 @@ def makexfile(template, *args, **kwds): return path -def main(): # pragma: NO COVER +def main(): # pragma: nocover ZEOInstanceBuilder().run(sys.argv[1:]) print_("All done.") diff --git a/src/zope/mkzeoinstance/tests/test_unix.py b/src/zope/mkzeoinstance/tests/test_unix.py index 5a30b08..ee36f97 100644 --- a/src/zope/mkzeoinstance/tests/test_unix.py +++ b/src/zope/mkzeoinstance/tests/test_unix.py @@ -233,8 +233,8 @@ def test_zeo_conf_content(self): " zdrun %(zdaemon_home)s/zdaemon/zdrun.py", "", " # This logfile should match the one in the zeo.conf file.", - " # It is used by zdctl's logtail command, " - "zdrun/zdctl doesn't write it.", + (" # It is used by zdctl's logtail command, " + "zdrun/zdctl doesn't write it."), " logfile $INSTANCE/log/zeo.log", "", '', @@ -257,11 +257,11 @@ def test_zeoctl_content(self): '#!/bin/sh', '# ZEO instance control script', '', - '# The following two lines are for chkconfig. ' - 'On Red Hat Linux (and', + ('# The following two lines are for chkconfig. ' + 'On Red Hat Linux (and'), '# some other systems), you can copy or symlink this script into', - '# /etc/rc.d/init.d/ and then use chkconfig(8) to ' - 'automatically start', + ('# /etc/rc.d/init.d/ and then use chkconfig(8) to ' + 'automatically start'), '# ZEO at boot time.', '', '# chkconfig: 345 90 10', diff --git a/tox.ini b/tox.ini index ea61d81..d15c784 100644 --- a/tox.ini +++ b/tox.ini @@ -1,26 +1,56 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy [tox] -envlist = - py27,py34,py35,py36,coverage +envlist = + lint, + py27, + py35, + py36, + py37, + py38, + coverage [testenv] +usedevelop = true +deps = + zope.testrunner +commands = + zope-testrunner --test-path=src [] +extras = test + +[testenv:lint] +basepython = python3 +skip_install = true deps = - zdaemon - zope.interface - ZODB - ZEO -commands = - python setup.py -q test -q + flake8 + check-manifest +commands = + flake8 src setup.py + check-manifest [testenv:coverage] -basepython = - python2.7 -commands = - pip -q uninstall -y zope.mkzeoinstance - python -c "import shutil; shutil.copyfile('src/zope/__init__.py', '{envdir}/lib/python2.7/site-packages/zope/__init__.py')" - pip -q install -e . - nosetests --with-xunit --with-xcoverage +basepython = python3 deps = - {[testenv]deps} - nose coverage - nosexcover + coverage-python-version + zope.testrunner +commands = + coverage run -m zope.testrunner --test-path=src [] + coverage html + coverage report -m + +[coverage:run] +branch = True +plugins = coverage_python_version +source = src + +[coverage:report] +precision = 2 +exclude_lines = + pragma: nocover + except ImportError: + raise NotImplementedError + if __name__ == '__main__': + +[coverage:html] +directory = htmlcov