Skip to content

Commit

Permalink
Updated files with 'repo_helper'. (#79)
Browse files Browse the repository at this point in the history
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
  • Loading branch information
repo-helper[bot] committed Mar 12, 2024
1 parent ba69ae6 commit 0a51dfb
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 44 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ updates:
directory: /
schedule:
interval: weekly
open-pull-requests-limit: 0
reviewers:
- domdfcoding
6 changes: 3 additions & 3 deletions .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ jobs:

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

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

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

Expand Down
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@v3"
uses: "actions/checkout@v4"

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

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

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

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
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,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'

strategy:
fail-fast: False
Expand All @@ -35,15 +35,15 @@ jobs:
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", testenvs: "py311,build", experimental: False}
- {python-version: "3.12", testenvs: "py312,build", experimental: False}
- {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True}
- {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}

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

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

Expand All @@ -75,7 +75,7 @@ jobs:
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
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,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'

strategy:
fail-fast: False
Expand All @@ -36,15 +36,15 @@ jobs:
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", testenvs: "py311,build", experimental: False}
- {python-version: "3.12", testenvs: "py312,build", experimental: False}
- {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True}
- {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True}
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}

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

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

Expand All @@ -77,7 +77,7 @@ jobs:
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

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

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

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

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

- name: Setup Python 🐍
uses: "actions/setup-python@v4"
uses: "actions/setup-python@v5"
if: startsWith(github.ref, 'refs/tags/')
with:
python-version: 3.8
Expand Down Expand Up @@ -183,18 +183,18 @@ jobs:
if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"

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

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

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
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,3.12,3.13.0-alpha.2,pypy-3.7,pypy-3.8,pypy-3.9'
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9'

strategy:
fail-fast: False
Expand All @@ -35,14 +35,14 @@ jobs:
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", testenvs: "py311,build", experimental: False}
- {python-version: "3.12", testenvs: "py312,build", experimental: False}
- {python-version: "3.13.0-alpha.2", testenvs: "py313-dev,build", experimental: True}
- {python-version: "3.13.0-alpha.4", testenvs: "py313-dev,build", experimental: True}
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}

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

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

Expand All @@ -74,7 +74,7 @@ jobs:
run: python -m tox -e "${{ matrix.config.testenvs }}" -s false

- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && steps.setup-python.outcome == 'success' }}
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci:

repos:
- repo: https://github.com/repo-helper/pyproject-parser
rev: v0.9.0
rev: v0.9.1
hooks:
- id: reformat-pyproject

Expand Down Expand Up @@ -43,13 +43,13 @@ repos:
- id: bind-requirements

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.3.0
rev: v0.3.1
hooks:
- id: ensure-dunder-all
files: ^shippinglabel/.*\.py$

- repo: https://github.com/domdfcoding/flake2lint
rev: v0.4.2
rev: v0.4.3
hooks:
- id: flake2lint

Expand All @@ -76,18 +76,18 @@ repos:
- id: forbid-crlf

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

- repo: https://github.com/python-formate/formate
rev: v0.5.0
rev: v0.7.0
hooks:
- id: formate
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$

- repo: https://github.com/domdfcoding/dep_checker
rev: v0.7.1
rev: v0.8.0
hooks:
- id: dep_checker
args:
Expand Down
3 changes: 3 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ build:
jobs:
post_create_environment:
- pip install .
post_install:
- pip install sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5
2 changes: 1 addition & 1 deletion formate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ known_third_party = [
"trove_classifiers",
"typing_extensions",
]
known_first_party = "shippinglabel"
known_first_party = [ "shippinglabel",]
extra_standard_library = "_hashlib"
2 changes: 1 addition & 1 deletion tests/test_requirements_win.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# stdlib
import sys
from coincidence.regressions import AdvancedDataRegressionFixture

# 3rd party
import pytest
from coincidence import only_windows
from coincidence.regressions import AdvancedDataRegressionFixture

# this package
from shippinglabel.requirements import list_requirements
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sdist.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 3rd party
from coincidence.regressions import AdvancedDataRegressionFixture
import pytest
from coincidence.regressions import AdvancedDataRegressionFixture
from packaging.utils import InvalidSdistFilename
from pytest_regressions.data_regression import DataRegressionFixture

Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ changedir = {toxinidir}
deps =
build[virtualenv]>=0.3.1
check-wheel-contents>=0.1.0
twine>=3.2.0; python_version < "3.13"
twine@git+https://github.com/pypa/twine; python_version >= "3.13"
twine>=3.2.0
cryptography<40; implementation_name == "pypy" and python_version <= "3.7"
commands =
python -m build --sdist --wheel "{toxinidir}"
Expand All @@ -124,7 +123,7 @@ deps =
flake8-dunder-all>=0.1.1
flake8-encodings>=0.1.0
flake8-github-actions>=0.1.0
flake8-noqa>=1.1.0
flake8-noqa>=1.1.0,<=1.2.2
flake8-pyi>=20.10.0,<=22.8.0
flake8-pytest-style>=1.3.0
flake8-quotes>=3.3.0
Expand Down

0 comments on commit 0a51dfb

Please sign in to comment.