Skip to content

Commit

Permalink
Merge 7605d97 into 8b28d43
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Dec 13, 2021
2 parents 8b28d43 + 7605d97 commit 586cfc1
Show file tree
Hide file tree
Showing 13 changed files with 231 additions and 266 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,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
63 changes: 63 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# 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"]
- ["2.7", "py27"]
- ["3.5", "py35"]
- ["3.6", "py36"]
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["pypy2", "pypy"]
- ["pypy3", "pypy3"]
- ["3.9", "coverage"]

runs-on: ${{ matrix.os }}-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 }}
24 changes: 20 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
*.dll
*.egg-info/
*.py[co]
.coverage*
*.profraw
*.pyc
*.pyo
*.so
.coverage
.coverage.*
.eggs/
.installed.cfg
.mr.developer.cfg
.tox/
.vscode/
__pycache__/
bin/
build/
coverage.xml
develop-eggs/
develop/
dist/
docs/_build
eggs/
htmlcov/
etc/
lib/
pip-selfcheck.json
lib64
log/
parts/
pyvenv.cfg
var/
27 changes: 27 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
[meta]
template = "pure-python"
commit-id = "fba6d957ba447b6fa369d872e803756bd5176391"

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

[tox]
use-flake8 = true
testenv-deps = [
"zope.testrunner",
]

[coverage]
fail-under = 91

[manifest]
additional-rules = [
"recursive-include src *.pt",
"recursive-include src *.rst",
]
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ CHANGES

- Drop support for Python 3.4.

- Add support for Python 3.9 and 3.10.


1.4 (2020-02-23)
================
Expand Down
10 changes: 6 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
include *.rst
include *.txt
include bootstrap.py
include buildout.cfg
include tox.ini
include .travis.yml
include .coveragerc
recursive-include src/martian *.rst *.pt *.py

recursive-include src *.py
recursive-include src *.pt
recursive-include src *.rst
8 changes: 2 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
Martian
*******

.. image:: https://travis-ci.com/zopefoundation/martian.svg?branch=master
:target: https://travis-ci.com/zopefoundation/martian

.. image:: https://readthedocs.org/projects/martian/badge/?version=latest
:target: https://martian.readthedocs.org/en/latest/
:alt: Documentation Status
.. image:: https://github.com/zopefoundation/martian/actions/workflows/tests.yml/badge.svg
:target: https://github.com/zopefoundation/martian/actions/workflows/tests.yml

.. image:: https://img.shields.io/pypi/v/martian.svg
:target: https://pypi.python.org/pypi/martian
Expand Down
Loading

0 comments on commit 586cfc1

Please sign in to comment.