Skip to content

Commit 3a5681d

Browse files
committed
Merge remote-tracking branch 'origin/master' into mypy
2 parents 0282f61 + e69ab2d commit 3a5681d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1855
-342
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ Fixes #(ISSUE_NUMBER_HERE)
1616
- [ ] Bug fix (non-breaking change which fixes an issue)
1717
- [ ] New feature (non-breaking change which adds functionality)
1818
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
19+
- [ ] (Code) style fix or documentation update
1920
- [ ] This change requires a documentation update

.github/workflows/automerge.yml

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

.github/workflows/coverage.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: coverage
2+
3+
on:
4+
- push
5+
6+
jobs:
7+
coverage:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v1
11+
- name: Set up Python ${{ matrix.python-version }}
12+
uses: actions/setup-python@v2
13+
with:
14+
python-version: 3.7
15+
- name: Install dependencies
16+
run: pip install tox codecov
17+
- name: Test with tox
18+
run: tox -e py37-alldeps,report
19+
- name: Upload test coverage
20+
run: codecov -t ${{ secrets.CODECOV_TOKEN }} -f .coverage.xml
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "python",
5+
"pattern": [
6+
{
7+
"regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
8+
"file": 1,
9+
"line": 2
10+
},
11+
{
12+
"regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
13+
"message": 2
14+
}
15+
]
16+
}
17+
]
18+
}

.github/workflows/pre-commit.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: pre-commit
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master]
7+
8+
jobs:
9+
pre-commit:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-python@v2
14+
- uses: pre-commit/[email protected]

.github/workflows/pythonpublish.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# This workflows will upload a Python Package using Twine when a release is created
2+
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
3+
4+
name: Upload Python Package
5+
6+
on:
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
deploy:
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Python
18+
uses: actions/setup-python@v2
19+
with:
20+
python-version: '3.x'
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install setuptools wheel twine
25+
- name: Build and publish
26+
env:
27+
TWINE_USERNAME: __token__
28+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
29+
run: |
30+
python setup.py sdist bdist_wheel
31+
twine upload dist/*

.github/workflows/tox.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: tox
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master]
7+
8+
jobs:
9+
test:
10+
runs-on: ${{ matrix.platform }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
platform: [ubuntu-latest, macos-latest, windows-latest]
15+
python-version: [3.7, 3.8, 3.9]
16+
17+
steps:
18+
- uses: actions/checkout@v1
19+
- name: Set up Python ${{ matrix.python-version }}
20+
uses: actions/setup-python@v2
21+
with:
22+
python-version: ${{ matrix.python-version }}
23+
- name: Set Python version for tox
24+
run: echo "PY_VERSION=$(echo py${version//./})" >> $GITHUB_ENV
25+
shell: bash
26+
env:
27+
version: ${{ matrix.python-version }}
28+
- name: Register Python problem matcher
29+
run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
30+
- name: Install dependencies
31+
run: pip install tox pytest-github-actions-annotate-failures
32+
- name: Test with tox using minimal dependencies
33+
run: tox -e ${{ env.PY_VERSION }}-mindeps
34+
- name: Clean
35+
run: tox -e clean
36+
- name: Test with tox with all dependencies
37+
run: tox -e ${{ env.PY_VERSION }}-alldeps

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.3.0
3+
rev: v3.4.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
@@ -13,15 +13,15 @@ repos:
1313
hooks:
1414
- id: black
1515
- repo: https://github.com/asottile/pyupgrade
16-
rev: v2.7.3
16+
rev: v2.11.0
1717
hooks:
1818
- id: pyupgrade
19-
args: ['--py36-plus']
19+
args: ['--py37-plus']
2020
- repo: https://github.com/timothycrosley/isort
21-
rev: 5.6.4
21+
rev: 5.8.0
2222
hooks:
2323
- id: isort
2424
- repo: https://gitlab.com/pycqa/flake8
25-
rev: 3.8.4
25+
rev: 3.9.0
2626
hooks:
2727
- id: flake8

0 commit comments

Comments
 (0)