Skip to content

Commit

Permalink
Updated files with 'repo_helper'.
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Apr 11, 2023
1 parent 96078ea commit fb8b7d4
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 54 deletions.
2 changes: 2 additions & 0 deletions .bumpversion.cfg
Expand Up @@ -18,3 +18,5 @@ search = : str = "{current_version}"
replace = : str = "{new_version}"

[bumpversion:file:.github/workflows/conda_ci.yml]
search = ={current_version}=py_1
replace = ={new_version}=py_1
10 changes: 6 additions & 4 deletions .github/workflows/conda_ci.yml
Expand Up @@ -12,25 +12,27 @@ permissions:
jobs:
tests:
name: "Conda"
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "3.8"

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: env
conda-build-version: 3.21.0
conda-build-version: 3.23.3
python-version: "3.8"
miniforge-variant: Mambaforge

- name: Install dependencies 🔧
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_test_action.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/flake8.yml
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand All @@ -33,17 +33,17 @@ jobs:
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "3.6"
python-version: "3.8"

- name: Install dependencies 🔧
if: steps.changes.outputs.code == 'true'
run: |
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install tox
python -m pip install tox~=3.0
- name: "Run Flake8"
if: steps.changes.outputs.code == 'true'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mypy.yml
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
uses: dorny/paths-filter@v2
Expand All @@ -38,16 +38,16 @@ jobs:
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "3.6"
python-version: "3.8"

- name: Install dependencies 🔧
run: |
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run mypy"
if: steps.changes.outputs.code == 'true'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/python_ci.yml
Expand Up @@ -22,7 +22,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,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8'

strategy:
fail-fast: False
Expand All @@ -33,14 +33,14 @@ jobs:
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11.0-rc.1", testenvs: "py311-dev,build", experimental: True}
- {python-version: "3.11", testenvs: "py311-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Setup Python 🐍
id: setup-python
if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -65,14 +65,14 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
36 changes: 19 additions & 17 deletions .github/workflows/python_ci_linux.yml
Expand Up @@ -23,7 +23,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,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8'

strategy:
fail-fast: False
Expand All @@ -34,14 +34,14 @@ jobs:
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11.0-rc.1", testenvs: "py311-dev,build", experimental: True}
- {python-version: "3.11", testenvs: "py311-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Setup Python 🐍
id: setup-python
if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -66,15 +66,15 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
python -m pip install --upgrade coverage_pyver_pragma
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand All @@ -86,10 +86,10 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: 3.8

Expand All @@ -99,7 +99,7 @@ jobs:
python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma
- name: "Download Coverage 🪂"
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: coverage

Expand All @@ -117,7 +117,7 @@ jobs:
- name: "Upload Combined Coverage Artefact 🚀"
if: ${{ steps.show.outcome != 'failure' }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: "combined-coverage"
path: .coverage
Expand All @@ -135,11 +135,11 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"
if: startsWith(github.ref, 'refs/tags/')

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
if: startsWith(github.ref, 'refs/tags/')
with:
python-version: 3.8
Expand All @@ -148,7 +148,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/')
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox
python -m pip install --upgrade tox~=3.0
- name: Build distributions 📦
if: startsWith(github.ref, 'refs/tags/')
Expand Down Expand Up @@ -176,22 +176,24 @@ jobs:

Conda:
needs: deploy
runs-on: "ubuntu-18.04"
runs-on: ubuntu-22.04
if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: 3.8

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: env
conda-build-version: 3.21.0
conda-build-version: 3.23.3
python-version: "3.8"
miniforge-variant: Mambaforge

- name: Install dependencies 🔧
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/python_ci_macos.yml
Expand Up @@ -22,7 +22,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,3.11.0-rc.1,pypy-3.7,pypy-3.8'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8'

strategy:
fail-fast: False
Expand All @@ -33,13 +33,13 @@ jobs:
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11.0-rc.1", testenvs: "py311-dev,build", experimental: True}
- {python-version: "3.11", testenvs: "py311-dev,build", experimental: True}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
uses: "actions/checkout@v3"

- name: Check for changed files
if: startsWith(github.ref, 'refs/tags/') != true
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Setup Python 🐍
id: setup-python
if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }}
uses: "actions/setup-python@v2"
uses: "actions/setup-python@v4"
with:
python-version: "${{ matrix.config.python-version }}"

Expand All @@ -64,14 +64,14 @@ jobs:
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox virtualenv!=20.16.0
python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
if: steps.setup-python.outcome == 'success'
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
7 changes: 5 additions & 2 deletions .pre-commit-config.yaml
Expand Up @@ -3,6 +3,9 @@

exclude: ^$

ci:
autoupdate_schedule: quarterly

repos:
- repo: https://github.com/repo-helper/pyproject-parser
rev: v0.7.0
Expand Down Expand Up @@ -51,7 +54,7 @@ repos:
- id: flake2lint

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.10.0
hooks:
- id: python-no-eval
- id: rst-backticks
Expand All @@ -67,7 +70,7 @@ repos:
- --keep-runtime-typing

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.3.1
rev: v1.5.1
hooks:
- id: remove-crlf
- id: forbid-crlf
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -109,7 +109,7 @@ dom_toml
:target: https://github.com/domdfcoding/dom_toml/commit/master
:alt: GitHub last commit

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

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/dom_toml
Expand Down
2 changes: 1 addition & 1 deletion doc-source/index.rst
Expand Up @@ -114,7 +114,7 @@ dom_toml
:last-commit:
:alt: GitHub last commit

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

.. |pypi-downloads| pypi-shield::
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -141,7 +141,7 @@ platforms = [ "Windows", "macOS", "Linux",]
license-key = "MIT"

[tool.mypy]
python_version = "3.6"
python_version = "3.8"
namespace_packages = true
check_untyped_defs = true
warn_unused_ignores = true
Expand Down

0 comments on commit fb8b7d4

Please sign in to comment.