Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo-helper] Configuration Update #25

Merged
merged 1 commit into from
Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: "windows-2019"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.4'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5'

strategy:
fail-fast: False
Expand All @@ -23,7 +23,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand All @@ -43,3 +43,10 @@ jobs:

- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
if: ${{ always() }}
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
6 changes: 3 additions & 3 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: "ubuntu-20.04"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.4'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5'

strategy:
fail-fast: False
Expand All @@ -23,7 +23,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand All @@ -45,9 +45,9 @@ jobs:
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"


- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
if: ${{ always() }}
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: "macos-latest"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.4'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5'

strategy:
fail-fast: False
Expand All @@ -23,7 +23,7 @@ jobs:
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10.0-alpha.4", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand All @@ -43,3 +43,10 @@ jobs:

- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
if: ${{ always() }}
with:
name: "coverage-${{ matrix.config.python-version }}"
path: .coverage
7 changes: 4 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,20 @@ repos:
- id: flake2lint

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.7.0
rev: v1.7.1
hooks:
- id: python-no-eval
- id: rst-backticks
- id: rst-directive-colons
- id: rst-inline-touching-normal

- repo: https://github.com/asottile/pyupgrade
rev: v2.9.0
rev: v2.10.0
hooks:
- id: pyupgrade
args:
- --py36-plus
- --keep-runtime-typing

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.9
Expand All @@ -67,7 +68,7 @@ repos:
- id: forbid-crlf

- repo: https://github.com/repo-helper/formate
rev: v0.2.5
rev: v0.3.1
hooks:
- id: formate
exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.(_)?py$
Expand Down
5 changes: 3 additions & 2 deletions formate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ collections-import-rewrite = 20
reformat-generics = 40
noqa-reformat = 60
ellipsis-reformat = 70
squish_stubs = 80

[config]
indent = "\t"
Expand All @@ -19,8 +20,7 @@ priority = 50
yapf_style = ".style.yapf"

[hooks.isort.kwargs]
line_length = 115
indent = "\"\t\t\""
indent = "\t\t"
multi_line_output = 8
import_heading_stdlib = "stdlib"
import_heading_thirdparty = "3rd party"
Expand Down Expand Up @@ -58,3 +58,4 @@ known_third_party = [
"virtualenv",
]
known_first_party = "repo_helper_github"
line_length = 115
17 changes: 9 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
[tox]
envlist = py36, py37, py38, py39, py310-dev, mypy, build
skip_missing_interpreters = True
isolated_build = True
requires =
pip>=20.3.3
tox-envlist>=0.1.0
isolated_build = True
tox-envlist>=0.2.1
tox-pip-version==0.0.7

[envlists]
test = py36, py37, py38, py39, py310-dev
Expand All @@ -38,10 +39,9 @@ commands =
[testenv:docs]
setenv = SHOW_TODOS = 1
basepython = python3.8
pip_version = pip>=21
changedir = {toxinidir}/doc-source
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc-source/requirements.txt
deps = -r{toxinidir}/doc-source/requirements.txt
commands = sphinx-build -M html . ./build {posargs}

[testenv:build]
Expand Down Expand Up @@ -73,6 +73,7 @@ deps =
flake8-sphinx-links>=0.0.4
flake8-strftime>=0.1.1
flake8-typing-imports>=1.10.0
flake8-encodings>=0.1.0
git+https://github.com/PyCQA/pydocstyle@5118faa7173b0e5bbc230c4adf628758e13605bf
git+https://github.com/domdfcoding/flake8-quotes.git
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
Expand All @@ -85,7 +86,7 @@ basepython = python3.6
ignore_errors = True
changedir = {toxinidir}
deps =
mypy==0.790
mypy==0.800
-r{toxinidir}/tests/requirements.txt
-r{toxinidir}/stubs.txt
commands = mypy repo_helper_github tests {posargs}
Expand Down Expand Up @@ -114,15 +115,15 @@ commands =

[flake8]
max-line-length = 120
select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E301 E303 E304 E305 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT005 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 E302 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E303 E304 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT005 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 ENC001 ENC002 ENC003 ENC004 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 E301 E302 E305 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
exclude = doc-source,.git,__pycache__,old,build,dist,__pkginfo__.py,setup.py,.tox,venv
rst-directives =
TODO
envvar
extras-require
per-file-ignores =
tests/*: D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
*/*.pyi: E302 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
*/*.pyi: E301 E302 E305 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000
pytest-parametrize-names-type = csv
inline-quotes = "
multiline-quotes = """
Expand Down