Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit ea86b0d

Browse files
jaracojaraco
committed
Merge branch '2020-handoff' of https://github.com/jaraco/skeleton 
2 parents 0880a98 + a11446d commit ea86b0d

16 files changed

+202
-124
lines changed

‎.github/workflows/automerge.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: automerge
2+
on:
3+
pull_request:
4+
types:
5+
- labeled
6+
- unlabeled
7+
- synchronize
8+
- opened
9+
- edited
10+
- ready_for_review
11+
- reopened
12+
- unlocked
13+
pull_request_review:
14+
types:
15+
- submitted
16+
check_suite:
17+
types:
18+
- completed
19+
status: {}
20+
jobs:
21+
automerge:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: automerge
25+
uses: "pascalgn/automerge-action@v0.12.0"
26+
env:
27+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/main.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Automated Tests
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
strategy:
8+
matrix:
9+
python: [3.6, 3.8, 3.9]
10+
platform: [ubuntu-latest, macos-latest, windows-latest]
11+
runs-on: ${{ matrix.platform }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Setup Python
15+
uses: actions/setup-python@v2
16+
with:
17+
python-version: ${{ matrix.python }}
18+
- name: Install tox
19+
run: |
20+
python -m pip install tox
21+
- name: Run tests
22+
run: tox
23+
24+
release:
25+
needs: test
26+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
27+
runs-on: ubuntu-latest
28+
29+
steps:
30+
- uses: actions/checkout@v2
31+
- name: Setup Python
32+
uses: actions/setup-python@v2
33+
with:
34+
python-version: 3.9
35+
- name: Install tox
36+
run: |
37+
python -m pip install tox
38+
- name: Release
39+
run: tox -e release
40+
env:
41+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.pre-commit-config.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
repos:
2-
- repo: https://github.com/ambv/black
3-
rev: 18.9b0
2+
- repo: https://github.com/psf/black
3+
rev: stable
44
hooks:
55
- id: black
6+
7+
- repo: https://github.com/asottile/blacken-docs
8+
rev: v1.8.0
9+
hooks:
10+
- id: blacken-docs

‎.readthedocs.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
version: 2
12
python:
2-
version: 3
3-
extra_requirements:
4-
- docs
5-
pip_install: true
3+
install:
4+
- path: .
5+
extra_requirements:
6+
- docs

‎.travis.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎LICENSE

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
Copyright Jason R. Coombs
22

3-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to
5+
deal in the Software without restriction, including without limitation the
6+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
sell copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
49

5-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
612

7-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
IN THE SOFTWARE.

‎README.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
.. image:: https://img.shields.io/pypi/v/pytest-runner.svg
2-
:target: https://pypi.org/project/pytest-runner
2+
:target: `PyPI link`_
33

44
.. image:: https://img.shields.io/pypi/pyversions/pytest-runner.svg
5+
:target: `PyPI link`_
56

6-
.. image:: https://img.shields.io/travis/pytest-dev/pytest-runner/master.svg
7-
:target: https://travis-ci.org/pytest-dev/pytest-runner
7+
.. _PyPI link: https://pypi.org/project/pytest-runner
8+
9+
.. image:: https://github.com/jaraco/pytest-runner/workflows/Automated%20Tests/badge.svg
10+
:target: https://github.com/jaraco/pytest-runner/actions?query=workflow%3A%22Automated+Tests%22
11+
:alt: Automated Tests
812

913
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
10-
:target: https://github.com/ambv/black
14+
:target: https://github.com/psf/black
1115
:alt: Code style: Black
1216

13-
.. .. image:: https://img.shields.io/appveyor/ci/pytest-dev/pytest-runner/master.svg
14-
.. :target: https://ci.appveyor.com/project/pytest-dev/pytest-runner/branch/master
15-
16-
.. .. image:: https://readthedocs.org/projects/pytest-runner/badge/?version=latest
17-
.. :target: https://pytest-runner.readthedocs.io/en/latest/?badge=latest
17+
.. .. image:: https://readthedocs.org/projects/skeleton/badge/?version=latest
18+
.. :target: https://skeleton.readthedocs.io/en/latest/?badge=latest
1819
1920
.. image:: https://tidelift.com/badges/package/pypi/pytest-runner
2021
:target: https://tidelift.com/subscription/pkg/pypi-pytest-runner?utm_source=pypi-pytest-runner&utm_medium=readme

‎appveyor.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
url='{package_url}/issues/{issue}',
1515
),
1616
dict(
17-
pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
17+
pattern=r'(?m:^((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n)',
1818
with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
1919
),
2020
dict(

‎mypy.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[mypy]
2+
ignore_missing_imports = True

‎pyproject.toml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
[build-system]
2-
requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
2+
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.black]
66
skip-string-normalization = true
7+
8+
[tool.setuptools_scm]
9+
10+
# jaraco/skeleton#22
11+
[tool.jaraco.pytest.plugins.black]
12+
addopts = "--black"
13+
14+
# jaraco/skeleton#22
15+
[tool.jaraco.pytest.plugins.mypy]
16+
addopts = "--mypy"
17+
18+
[tool.jaraco.pytest.plugins.flake8]
19+
addopts = "--flake8"
20+
21+
[tool.jaraco.pytest.plugins.cov]
22+
addopts = "--cov"

‎pytest.ini

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[pytest]
22
norecursedirs=dist build .tox .eggs
3-
addopts=--doctest-modules --flake8 --black --cov
3+
addopts=--doctest-modules
44
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
5+
# workaround for warning pytest-dev/pytest#6178
6+
junit_family=xunit2
57
filterwarnings=
6-
ignore:Possible nested set::pycodestyle:113
7-
ignore:Using or importing the ABCs::flake8:410
8-
# workaround for https://sourceforge.net/p/docutils/bugs/348/
9-
ignore:'U' mode is deprecated::docutils.io
10-
# workaround for https://gitlab.com/pycqa/flake8/issues/275
11-
ignore:You passed a bytestring as `filenames`.::flake8
8+
# https://github.com/pytest-dev/pytest/issues/6928
9+
ignore:direct construction of .*Item has been deprecated:DeprecationWarning

‎setup.cfg

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[bdist_wheel]
2-
universal = 1
3-
41
[metadata]
52
license_file = LICENSE
63
name = pytest-runner
@@ -13,25 +10,30 @@ classifiers =
1310
Development Status :: 5 - Production/Stable
1411
Intended Audience :: Developers
1512
License :: OSI Approved :: MIT License
16-
Programming Language :: Python :: 2.7
1713
Programming Language :: Python :: 3
14+
Programming Language :: Python :: 3 :: Only
1815
Framework :: Pytest
1916

2017
[options]
18+
packages = find:
2119
py_modules = ptr
22-
python_requires = >=2.7
20+
include_package_data = true
21+
python_requires = >=3.6
2322
install_requires =
2423
# setuptools 27.3 is required at run time
25-
setup_requires = setuptools_scm >= 1.15.0
24+
setup_requires = setuptools_scm[toml] >= 3.4.1
2625

2726
[options.extras_require]
2827
testing =
2928
# upstream
3029
pytest >= 3.5, !=3.7.3
31-
pytest-checkdocs
30+
pytest-checkdocs >= 1.2.3
3231
pytest-flake8
33-
pytest-black-multipy
32+
pytest-black >= 0.3.7; python_implementation != "PyPy"
3433
pytest-cov
34+
pytest-mypy; python_implementation != "PyPy"
35+
# jaraco/skeleton#22
36+
jaraco.test >= 3.2.0
3537

3638
# local
3739
pytest-virtualenv

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
"""
1919

2020
if __name__ == "__main__":
21-
setuptools.setup(use_scm_version=True, **compat)
21+
setuptools.setup(**compat)

0 commit comments

Comments
 (0)