From 80cc521e820e6139f50153092b14a3d17a4f3bcb Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 19 Feb 2020 08:53:32 +0100 Subject: [PATCH] Configuring for pure-python-without-pypy (#5) --- .coveragerc | 10 --- .editorconfig | 36 ++++++++++ .gitignore | 31 ++++----- .travis.yml | 33 ++++++++- MANIFEST.in | 7 +- bootstrap.py | 189 -------------------------------------------------- setup.cfg | 5 ++ tox.ini | 28 +++++--- 8 files changed, 107 insertions(+), 232 deletions(-) delete mode 100644 .coveragerc create mode 100644 .editorconfig delete mode 100644 bootstrap.py create mode 100644 setup.cfg diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index ba46d1c..0000000 --- a/.coveragerc +++ /dev/null @@ -1,10 +0,0 @@ -[run] -branch = True -source = src - -[report] -precision = 2 -exclude_lines = pragma: no cover - -[html] -directory = htmlcov diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f6f28c4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,36 @@ +# EditorConfig Configurtaion 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 e9bf45f..83bd530 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,17 @@ -bin -build -/develop-eggs/ -/eggs -dist -lib -parts -/src/zope.testrunner -.eggs -.tox +*.egg-info +*.profraw +*.pyc +*.pyo .coverage .installed.cfg .mr.developer.cfg +.tox/ +bin/ coverage.xml -nosetests.xml -htmlcov - -*.dll -*.pyc -*.pyo -*.so -*.egg-info +develop-eggs/ +dist/ +htmlcov/ +lib/ +lib64 +parts/ +pyvenv.cfg diff --git a/.travis.yml b/.travis.yml index 4f150d4..1506236 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,32 @@ -version: ~> 1.0 +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python-without-pypy language: python -import: zopefoundation/meta:travis-ci-config/minimal-no-pypy.yml +python: + - 2.7 + - 3.5 + - 3.6 + - 3.7 + - 3.8 + +matrix: + include: + - name: "flake8" + python: 3.7 + env: TOXENV="flake8" + - name: "coverage" + python: 3.7 + env: TOXENV="coverage" + after_success: + - coveralls + +install: + - pip install -U pip + - pip install -U tox-travis coveralls + +script: + - tox + +notifications: + email: false + +cache: pip diff --git a/MANIFEST.in b/MANIFEST.in index d60df4e..bc77ca1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,4 @@ include *.rst include *.txt - -recursive-include src * - -global-exclude *.pyc -global-exclude *.pyo +include buildout.cfg +include tox.ini 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 new file mode 100644 index 0000000..27efeb7 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,5 @@ +[zest.releaser] +create-wheel = yes + +[flake8] +doctests = 1 diff --git a/tox.ini b/tox.ini index d30d95b..0a65c1f 100644 --- a/tox.ini +++ b/tox.ini @@ -13,16 +13,28 @@ commands = zope-testrunner --test-path=src [] extras = test -[testenv:coverage] -basepython = python3 -commands = - coverage run -m zope.testrunner --test-path=src [] - coverage report --fail-under=100 -deps = - coverage - [testenv:flake8] basepython = python3 skip_install = true deps = flake8 commands = flake8 src setup.py + +[testenv:coverage] +basepython = python3 +deps = + coverage +commands = + coverage run -m zope.testrunner --test-path=src [] + coverage html + coverage report + +[coverage:run] +branch = True +source = src + +[coverage:report] +precision = 2 +exclude_lines = pragma: no cover + +[coverage:html] +directory = htmlcov