Skip to content

Commit ea605f5

Browse files
jaracojaraco
committed
Merge https://github.com/jaraco/skeleton into feature/skeleton
2 parents b6bbe23 + c681f67 commit ea605f5

16 files changed

+345
-342
lines changed

‎.coveragerc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
[run]
2-
source=
3-
pkg_resources
4-
setuptools
5-
omit=
6-
*/_vendor/*
2+
omit = .tox/*
73

84
[report]
5+
show_missing = True

‎.flake8

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
[flake8]
2-
exclude=
3-
.tox
4-
setuptools/_vendor,
5-
pkg_resources/_vendor
2+
max-line-length = 88
3+
exclude =
4+
setuptools/_vendor
5+
pkg_resources/_vendor
66
ignore =
7-
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
8-
W503
9-
# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
10-
W504
11-
setuptools/site-patch.py F821
12-
setuptools/py*compat.py F811
7+
# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
8+
W503
9+
# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
10+
W504
11+
# Black creates whitespace before colon
12+
E203
13+
setuptools/site-patch.py F821
14+
setuptools/py*compat.py F811

‎.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 }}

‎.github/workflows/python-tests.yml

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

‎.pre-commit-config.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
repos:
2+
- repo: https://github.com/psf/black
3+
rev: stable
4+
hooks:
5+
- 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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# Read the Docs configuration file
2-
# https://docs.readthedocs.io/en/stable/config-file/v2.html
3-
41
version: 2
5-
62
python:
73
install:
84
- requirements: docs/requirements.txt

‎LICENSE

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Copyright (C) 2016 Jason R Coombs <[email protected]>
1+
Copyright Jason R. Coombs
22

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

10-
The above copyright notice and this permission notice shall be included in all
11-
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.
1212

1313
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1414
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1515
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1616
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19-
SOFTWARE.
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: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66

77
.. _PyPI link: https://pypi.org/project/setuptools
88

9-
.. image:: https://dev.azure.com/jaraco/setuptools/_apis/build/status/pypa.setuptools?branchName=master
10-
:target: https://dev.azure.com/jaraco/setuptools/_build/latest?definitionId=1&branchName=master
9+
.. image:: https://github.com/jaraco/setuptools/workflows/Automated%20Tests/badge.svg
10+
:target: https://github.com/jaraco/setuptools/actions?query=workflow%3A%22Automated+Tests%22
11+
:alt: Automated Tests
1112

12-
.. image:: https://img.shields.io/travis/pypa/setuptools/master.svg?label=Linux%20CI&logo=travis&logoColor=white
13-
:target: https://travis-ci.org/pypa/setuptools
14-
15-
.. image:: https://img.shields.io/appveyor/ci/pypa/setuptools/master.svg?label=Windows%20CI&logo=appveyor&logoColor=white
16-
:target: https://ci.appveyor.com/project/pypa/setuptools/branch/master
13+
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
14+
:target: https://github.com/psf/black
15+
:alt: Code style: Black
1716

1817
.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
1918
:target: https://setuptools.readthedocs.io

0 commit comments

Comments
 (0)