Skip to content

Commit

Permalink
Merge f1291cf into dcf2188
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Jan 29, 2021
2 parents dcf2188 + f1291cf commit ca2e065
Show file tree
Hide file tree
Showing 16 changed files with 227 additions and 140 deletions.
11 changes: 0 additions & 11 deletions .coveragerc

This file was deleted.

39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
58 changes: 58 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
name: tests

on:
push:
branches: [ master ]
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday

jobs:
build:
strategy:
matrix:
config:
# [Python version, tox env]
- ["3.8", "lint"]
- ["2.7", "py27"]
- ["3.5", "py35"]
- ["3.6", "py36"]
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["pypy2", "pypy"]
- ["pypy3", "pypy3"]
- ["3.8", "coverage"]
- ["3.8", "py38-slim"]

runs-on: ubuntu-latest
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.config[0] }}
- name: Pip cache
uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config[0] }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: Test
run: tox -e ${{ matrix.config[1] }}
- name: Coverage
if: matrix.config[1] == 'coverage'
run: |
pip install coveralls coverage-python-version
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
*.egg-info/
*.py[co]
*.profraw
*.pyc
*.pyo
.coverage
.coverage.*
.eggs/
.installed.cfg
.mr.developer.cfg
.tox/
__pycache__/
bin/
build/
coverage.xml
develop-eggs/
dist/
docs/_build
eggs/
htmlcov/
lib/
lib64
parts/
pyvenv.cfg
36 changes: 36 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "e1a6d19b7bd98050e5ddfeb73206e1989bc56071"

[python]
with-appveyor = false
with-pypy = true
with-legacy-python = true
with-docs = false
with-sphinx-doctests = false

[coverage]
fail-under = 63

[tox]
additional-envlist = [
"py38-slim",
]
testenv-additional = [
"",
"# Test without mruwidget dependencies",
"[testenv:slim]",
"extras = slimtest",
]

[manifest]
additional-rules = [
"recursive-include src *.js",
]

[github-actions]
additional-config = [
"- [\"3.8\", \"py38-slim\"]",
]
31 changes: 0 additions & 31 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Changes
1.2 (unreleased)
----------------

- Nothing changed yet.
- Add support for Python 3.8 and 3.9.


1.1 (2019-02-11)
Expand Down
8 changes: 5 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
include *.py
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
include *.rst
include *.txt
include .coveragerc
include buildout.cfg
include tox.ini

recursive-include src *.js
recursive-include src *.pt
recursive-include src *.py
recursive-include src *.rst
recursive-include src *.txt
recursive-include src *.zcml
recursive-include src *.js
52 changes: 0 additions & 52 deletions bootstrap.py

This file was deleted.

10 changes: 10 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[bdist_wheel]
universal = 1

[flake8]
doctests = 1

[check-manifest]
ignore =
.editorconfig
.meta.toml
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def read(filepath):
package_dir={'': 'src'},
namespace_packages=['zc'],
url='https://github.com/zopefoundation/zc.form',
author='Zope Corporation and Contributors',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
include_package_data=True,
description=(
Expand All @@ -57,6 +57,8 @@ def read(filepath):
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Natural Language :: English',
Expand Down
8 changes: 1 addition & 7 deletions src/zc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
# this is a namespace package
try:
import pkg_resources
pkg_resources.declare_namespace(__name__)
except ImportError:
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
__import__('pkg_resources').declare_namespace(__name__) # pragma: no cover
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_suite():
pass
else:
suite = doctest.DocFileSuite(
"mruwidget.rst",
"../mruwidget.rst",
globs={'AvailableColors': AvailableColors(),
'getRootFolder': ZCFormLayer.getRootFolder},
optionflags=(doctest.NORMALIZE_WHITESPACE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ class TestUnionWidget(
zope.component.testing.PlacelessSetup, unittest.TestCase):

assertRegex = getattr(unittest.TestCase, 'assertRegex',
unittest.TestCase.assertRegexpMatches)
unittest.TestCase.assertRegexpMatches) # PY2

assertNotRegex = getattr(unittest.TestCase, 'assertNotRegex',
unittest.TestCase.assertNotRegexpMatches)
unittest.TestCase.assertNotRegexpMatches) # PY2

def setUp(self):
super(TestUnionWidget, self).setUp()
Expand Down Expand Up @@ -208,7 +208,7 @@ def test_suite():
return unittest.TestSuite([
unittest.defaultTestLoader.loadTestsFromName(__name__),
doctest.DocFileSuite(
'combinationwidget.rst',
'../combinationwidget.rst',
optionflags=optionflags,
setUp=pageSetUp,
tearDown=zope.component.testing.tearDown),
Expand Down

0 comments on commit ca2e065

Please sign in to comment.