Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Sep 8, 2022
2 parents 467309c + fe8a2d4 commit 1575d98
Show file tree
Hide file tree
Showing 50 changed files with 1,456 additions and 759 deletions.
4 changes: 0 additions & 4 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,zcml}]
# 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
61 changes: 61 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
name: tests

on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
# [Python version, tox env]
- ["3.9", "lint"]
- ["3.6", "py36"]
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["3.9", "coverage"]

runs-on: ${{ matrix.os }}-latest
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
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
sudo apt-get update && sudo apt-get install -y ghostscript
- name: Test
run: tox -e ${{ matrix.config[1] }}
- name: Coverage
if: matrix.config[1] == 'coverage'
run: |
pip install coveralls
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37 changes: 28 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
*.dll
*.egg-info/
*.profraw
*.pyc
__pycache__

*.pyo
*.so
.coverage
.coverage.*
.eggs/
.installed.cfg
.tox
bin
.mr.developer.cfg
.tox/
.vscode/
__pycache__/
bin/
build/
coverage.xml
dist

src/*.egg-info
src/z3c/rml/tests/expected/*.png
src/z3c/rml/tests/output/*
develop-eggs/
develop/
dist/
docs/_build
eggs/
etc/
lib/
lib64
log/
parts/
pyvenv.cfg
testing.log
var/
38 changes: 38 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "d5b6c610d0ec7f0b8f6bbba49353eb89288f62b1"

[python]
with-windows = false
with-pypy = false
with-future-python = false
with-legacy-python = false
with-sphinx-doctests = false

[tox]
use-flake8 = true

[coverage]
fail-under = 82

[manifest]
additional-rules = [
"recursive-include src *.dtd",
"recursive-include src *.eps",
"recursive-include src *.gif",
"recursive-include src *.pdf",
"recursive-include src *.png",
"recursive-include src *.pt",
"recursive-include src *.rml",
"recursive-include src *.svg",
"recursive-include src *.svgz",
"recursive-include src *.ttf",
"recursive-include src *.txt",
]

[github-actions]
additional-install = [
"sudo apt-get update && sudo apt-get install -y ghostscript",
]
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ CHANGES
4.2.1 (unreleased)
------------------

- Add support for Python 3.10.

- Add back support for Python 3.6.

- Fix name clash in repository on file systems which are not case sensitive but
just case preserving.

- Move output directory of tests to a temporary directory.


4.2.0 (2021-10-14)
------------------
Expand Down
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
Generated from:
https://github.com/zopefoundation/meta/tree/master/config/pure-python
-->
# Contributing to zopefoundation projects

The projects under the zopefoundation GitHub organization are open source and
welcome contributions in different forms:

* bug reports
* code improvements and bug fixes
* documentation improvements
* pull request reviews

For any changes in the repository besides trivial typo fixes you are required
to sign the contributor agreement. See
https://www.zope.dev/developer/becoming-a-committer.html for details.

Please visit our [Developer
Guidelines](https://www.zope.dev/developer/guidelines.html) if you'd like to
contribute code changes and our [guidelines for reporting
bugs](https://www.zope.dev/developer/reporting-bugs.html) if you want to file a
bug report.
25 changes: 16 additions & 9 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
include *.md
include *.rst
include *.txt
include *.py
include .coveragerc
include .travis.yml
include buildout.cfg
include tox.ini

recursive-include src *
recursive-exclude src/z3c/rml/tests/output *.png *.pdf
recursive-exclude src/z3c/rml/tests/expected *.png

global-exclude *.pyc

recursive-include src *.py
recursive-include src *.dtd
recursive-include src *.eps
recursive-include src *.gif
recursive-include src *.pdf
recursive-include src *.png
recursive-include src *.pt
recursive-include src *.rml
recursive-include src *.svg
recursive-include src *.svgz
recursive-include src *.ttf
recursive-include src *.txt
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
:target: https://pypi.org/project/z3c.rml/
:alt: Supported Python versions

.. image:: https://travis-ci.com/zopefoundation/z3c.rml.svg?branch=master
:target: https://travis-ci.com/zopefoundation/z3c.rml
.. image:: https://github.com/zopefoundation/z3c.rml/actions/workflows/tests.yml/badge.svg
:target: https://github.com/zopefoundation/z3c.rml/actions/workflows/tests.yml
:alt: Build Status

.. image:: https://coveralls.io/repos/github/zopefoundation/z3c.rml/badge.svg?branch=master
Expand Down
23 changes: 23 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[bdist_wheel]
universal = 0

[flake8]
doctests = 1

[check-manifest]
ignore =
.editorconfig
.meta.toml

[isort]
force_single_line = True
combine_as_imports = True
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
known_third_party = six, docutils, pkg_resources
known_zope =
known_first_party =
default_section = ZOPE
line_length = 79
lines_after_imports = 2

0 comments on commit 1575d98

Please sign in to comment.