Skip to content

Commit

Permalink
[repo-helper] Configuration Update (#7)
Browse files Browse the repository at this point in the history
* Updated files with 'repo_helper'.

* Updated files with 'repo_helper'.

* Updated files with 'repo_helper'.

Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
  • Loading branch information
repo-helper[bot] authored Feb 3, 2022
1 parent 383a066 commit 5c4a8ba
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 49 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/cleanup.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v1"
uses: "actions/checkout@v2"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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-rc.2,pypy-3.6,pypy-3.7'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'

strategy:
fail-fast: False
Expand All @@ -31,7 +31,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-rc.2", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10", testenvs: "py310-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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-rc.2,pypy-3.6,pypy-3.7'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.6,pypy-3.7'

strategy:
fail-fast: False
Expand All @@ -32,7 +32,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-rc.2", testenvs: "py310-dev,build", experimental: True}
- {python-version: "3.10", testenvs: "py310-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}

Expand Down Expand Up @@ -101,21 +101,26 @@ jobs:
path: coverage

- name: Display structure of downloaded files
id: show
run: ls -R
working-directory: coverage
continue-on-error: true

- name: Combine Coverage 👷
if: ${{ steps.show.outcome != 'failure' }}
run: |
shopt -s globstar
python -m coverage combine coverage/**/.coverage
- name: "Upload Combined Coverage Artefact 🚀"
if: ${{ steps.show.outcome != 'failure' }}
uses: actions/upload-artifact@v2
with:
name: "combined-coverage"
path: .coverage

- name: "Upload Combined Coverage to Coveralls"
if: ${{ steps.show.outcome != 'failure' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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-rc.2,pypy-3.6,pypy-3.7'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,pypy-3.7'

strategy:
fail-fast: False
Expand All @@ -31,8 +31,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-rc.2", testenvs: "py310-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "3.10", testenvs: "py310-dev,build", experimental: True}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}

steps:
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ repos:
- id: end-of-file-fixer

- repo: https://github.com/domdfcoding/pre-commit-hooks
rev: v0.2.1
rev: v0.3.0
hooks:
- id: requirements-txt-sorter
args:
Expand All @@ -40,7 +40,7 @@ repos:
- id: bind-requirements

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.1.7
rev: v0.1.8
hooks:
- id: ensure-dunder-all
files: ^pyproject_devenv/.*\.py$
Expand Down Expand Up @@ -73,7 +73,7 @@ repos:
- id: forbid-crlf

- repo: https://github.com/python-formate/snippet-fmt
rev: v0.1.3
rev: v0.1.4
hooks:
- id: snippet-fmt

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ pyproject-devenv
:target: https://github.com/repo-helper/pyproject-devenv/commit/master
:alt: GitHub last commit

.. |maintained| image:: https://img.shields.io/maintenance/yes/2021
.. |maintained| image:: https://img.shields.io/maintenance/yes/2022
:alt: Maintenance

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/pyproject-devenv
Expand Down
16 changes: 0 additions & 16 deletions __pkginfo__.py

This file was deleted.

2 changes: 1 addition & 1 deletion doc-source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pyproject-devenv
:last-commit:
:alt: GitHub last commit

.. |maintained| maintained-shield:: 2021
.. |maintained| maintained-shield:: 2022
:alt: Maintenance

.. |pypi-downloads| pypi-shield::
Expand Down
1 change: 1 addition & 0 deletions doc-source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ git+https://github.com/sphinx-toolbox/sphinx-toolbox-experimental
default-values>=0.5.0
extras-require>=0.2.0
furo>=2020.11.19b18
html-section>=0.1.0
seed-intersphinx-mapping>=0.3.1
sphinx>=3.0.3
sphinx-copybutton>=0.2.12
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ extensions = [
"sphinx_debuginfo",
"sphinx_licenseinfo",
"seed_intersphinx_mapping",
"html_section",
"sphinx_click",
"sphinx_toolbox_experimental.html_section",
"sphinx_toolbox_experimental.autosummary_widths",
Expand Down
17 changes: 11 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ envlist = py36, py37, py38, py39, py310-dev, pypy36, pypy37, mypy, build
skip_missing_interpreters = True
isolated_build = True
requires =
pip>=20.3.3
pip>=21
tox-envlist>=0.2.1
tox-pip-version>=0.0.7

[envlists]
test = py36, py37, py38, py39, py310-dev, pypy36, pypy37
qa = mypy, lint
cov = py36, coverage

[testenv]
setenv = PYTHONDEVMODE = 1
setenv =
PYTHONDEVMODE=1
PIP_DISABLE_PIP_VERSION_CHECK=1
deps = -r{toxinidir}/tests/requirements.txt
commands =
python --version
Expand All @@ -39,7 +40,6 @@ commands =
[testenv:docs]
setenv = SHOW_TODOS = 1
basepython = python3.8
pip_version = pip>=21
changedir = {toxinidir}/doc-source
deps = -r{toxinidir}/doc-source/requirements.txt
commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}
Expand Down Expand Up @@ -72,13 +72,14 @@ deps =
flake8-noqa>=1.1.0
flake8-pyi>=20.10.0
flake8-pytest-style>=1.3.0
flake8-quotes>=3.3.0
flake8-slots>=0.1.0
flake8-sphinx-links>=0.0.4
flake8-strftime>=0.1.1
flake8-typing-imports>=1.10.0
git+https://github.com/domdfcoding/flake8-quotes.git
git+https://github.com/domdfcoding/flake8-rst-docstrings-sphinx.git
git+https://github.com/domdfcoding/flake8-rst-docstrings.git
git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods
pydocstyle>=6.0.0
pygments>=2.7.1
importlib_metadata<4.5.0; python_version<'3.8'
Expand All @@ -89,7 +90,7 @@ basepython = python3.6
ignore_errors = True
changedir = {toxinidir}
deps =
mypy==0.910
mypy==0.931
-r{toxinidir}/tests/requirements.txt
commands = mypy pyproject_devenv tests {posargs}

Expand Down Expand Up @@ -139,6 +140,10 @@ multiline-quotes = """
docstring-quotes = """
count = True
min_python_version = 3.6.1
unused-arguments-ignore-abstract-functions = True
unused-arguments-ignore-overload-functions = True
unused-arguments-ignore-magic-methods = True
unused-arguments-ignore-variadic-names = True
[coverage:run]
plugins = coverage_pyver_pragma
Expand Down

0 comments on commit 5c4a8ba

Please sign in to comment.