From 962b76d9f1ddb25de1dcd04ba6732b33afabc07e Mon Sep 17 00:00:00 2001 From: Steffen Allner Date: Fri, 15 May 2020 16:04:14 +0200 Subject: [PATCH] Configuring for pure-python --- .coveragerc | 8 - .editorconfig | 39 ++++ .gitignore | 30 ++- .meta.cfg | 7 + .travis.yml | 34 +-- MANIFEST.in | 21 +- bootstrap.py | 210 ------------------ setup.cfg | 11 + setup.py | 9 +- .../tests/locales/de/LC_MESSAGES/formtest.mo | Bin 860 -> 0 bytes .../browser/tests/testlabeltranslation.mo | Bin 395 -> 0 bytes tox.ini | 56 ++++- 12 files changed, 171 insertions(+), 254 deletions(-) delete mode 100644 .coveragerc create mode 100644 .editorconfig create mode 100644 .meta.cfg delete mode 100644 bootstrap.py delete mode 100644 src/zope/app/form/browser/tests/locales/de/LC_MESSAGES/formtest.mo delete mode 100644 src/zope/app/form/browser/tests/testlabeltranslation.mo diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 9a40dd5..0000000 --- a/.coveragerc +++ /dev/null @@ -1,8 +0,0 @@ -[run] -source = src - -[report] -exclude_lines = - pragma: no cover - raise NotImplementedError - if __name__ == '__main__': diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f3e46f5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,39 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python +# +# 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 f25457c..3978512 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,25 @@ -bin/ -eggs/ -develop-eggs/ -parts/ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python +*.egg-info/ +*.mo +*.profraw +*.pyc +*.pyo +.coverage +.coverage.* .installed.cfg -*.py[co] +.mr.developer.cfg +.tox/ __pycache__/ +bin/ build/ +coverage.xml +develop-eggs/ dist/ -*.egg-info/ -.tox/ -.coverage -htmlcov +docs/_build +eggs/ +htmlcov/ +lib/ +lib64 +parts/ +pyvenv.cfg diff --git a/.meta.cfg b/.meta.cfg new file mode 100644 index 0000000..8012f8c --- /dev/null +++ b/.meta.cfg @@ -0,0 +1,7 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python +[meta] +template = pure-python +commit-id = 4f6e46d28989b99f6dd6ee49829060a6720b79b9 +fail-under = 94 + diff --git a/.travis.yml b/.travis.yml index 6a6a5cb..3ca6074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,34 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python language: python - python: - 2.7 + - pypy - 3.5 - 3.6 - 3.7 - 3.8 - - pypy - pypy3 -script: - - coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress +matrix: + include: + - name: "lint" + python: 3.7 + env: TOXENV="lint" + - name: "coverage" + python: 3.7 + env: TOXENV="coverage" + after_success: + - coveralls -after_success: - - coveralls +install: + - pip install -U pip + - pip install -U tox-travis coveralls + +script: + - tox notifications: email: false -install: - - pip install -U pip setuptools - - pip install -U coveralls coverage - - pip install -U -e ".[test]" - - cache: pip - -before_cache: - - rm -f $HOME/.cache/pip/log/debug.log diff --git a/MANIFEST.in b/MANIFEST.in index f720b0b..f7320aa 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,12 +1,23 @@ -include *.py -include *.txt +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python include *.rst -include .coveragerc -include tox.ini +include *.txt include buildout.cfg +include tox.ini + +exclude MANIFEST.in + +recursive-include docs *.bat +recursive-include docs *.py +recursive-include docs *.rst +recursive-include docs Makefile + +recursive-include src *.gif recursive-include src *.po -recursive-include src *.mo recursive-include src *.pot recursive-include src *.pt +recursive-include src *.py 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 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/setup.cfg b/setup.cfg index 2a9acf1..9f7321c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,13 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python [bdist_wheel] universal = 1 + +[flake8] +doctests = 1 + +[check-manifest] +ignore = + .editorconfig + .meta.cfg + .travis.yml diff --git a/setup.py b/setup.py index a9856f8..0ae6cfd 100644 --- a/setup.py +++ b/setup.py @@ -26,16 +26,17 @@ def read(*rnames): return f.read() tests_require = [ + 'webtest', 'zc.sourcefactory', + 'zope.app.appsetup', + 'zope.app.wsgi >= 4.1.0', 'zope.container', + 'zope.i18n[compile]', 'zope.principalregistry', 'zope.site', - 'zope.traversing', - 'zope.app.appsetup', 'zope.testing', 'zope.testrunner', - 'zope.app.wsgi >= 4.1.0', - 'webtest', + 'zope.traversing', ] setup(name='zope.app.form', diff --git a/src/zope/app/form/browser/tests/locales/de/LC_MESSAGES/formtest.mo b/src/zope/app/form/browser/tests/locales/de/LC_MESSAGES/formtest.mo deleted file mode 100644 index d06381adc3d2148f3b87a813d3812d4843489348..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 860 zcmaixy^a$x6om~ee**|e0|kYlLP8Fc4Tuna1Z*Z!q^wvi(H3-0=FW^^#*S=H#HOc# znx|nq-h+wu0vMVwec(%m3ZEXHD z+8ymCYj>S?95r7cCWmvF@$}B$otIMSM|@UD>&QQ;eI|PAykHjvso?6MlE$w)JC7e0os=d*Y! z;y%ug9LRTaKJtCE_vL|hfn(qd*arqcs|+{*?tzmX&wGON5cq^1>R;{rug1opLb+Oc znKiGnbU0ezxwMTkIzSm6-O&j{bCyq|H1V^vz#}V#gIgR5Cj-;x{x5 zb2gn0!K$mZs3b0=cnc7x$z;}M8*qM8tB$eN(2t{-ZPRx<#2*>$q=p@v6@+#2!=0~c vq4X6hUxaO>yIwa~G^J8oYa3@NEoQnj3#F?7T|O)4d&Vrq2DP8%#K!vp8o6e0 diff --git a/tox.ini b/tox.ini index 6ba4768..8c2d37f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,65 @@ +# Generated from: +# https://github.com/zopefoundation/meta/tree/master/config/pure-python [tox] envlist = + lint, py27, + pypy, py35, py36, py37, py38, - pypy, - pypy3 + pypy3, + coverage [testenv] +usedevelop = true +deps = + zope.testrunner commands = zope-testrunner --test-path=src [] +extras = test +setenv = + zope_i18n_compile_mo_files = true + zope_i18n_allowed_languages = de,en + +[testenv:lint] +basepython = python3 +skip_install = true deps = - .[test] + flake8 + check-manifest + check-python-versions +commands = + flake8 src setup.py + check-manifest + check-python-versions + +[testenv:coverage] +basepython = python3 +deps = + coverage + coverage-python-version + zope.testrunner +commands = + coverage run -m zope.testrunner --test-path=src [] + coverage html + coverage report -m --fail-under=94 + +[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__': + self.fail + raise AssertionError + +[coverage:html] +directory = htmlcov