Skip to content

Commit ab6959f

Browse files
Updated files with 'repo_helper'. (#27)
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
1 parent aba47ae commit ab6959f

12 files changed

+48
-58
lines changed

.dependabot/config.yml

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

.github/workflows/flake8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
Run:
1818
name: "Flake8"
19-
runs-on: "ubuntu-20.04"
19+
runs-on: "ubuntu-22.04"
2020

2121
steps:
2222
- name: Checkout 🛎️

.github/workflows/mypy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: ['ubuntu-20.04', 'windows-2019']
23+
os: ['ubuntu-22.04', 'windows-2019']
2424
fail-fast: false
2525

2626
steps:

.github/workflows/python_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False}
3838
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
3939
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
40-
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}
40+
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True}
4141

4242
steps:
4343
- name: Checkout 🛎️

.github/workflows/python_ci_linux.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ permissions:
1919

2020
jobs:
2121
tests:
22-
name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
23-
runs-on: "ubuntu-20.04"
22+
name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
23+
runs-on: "ubuntu-22.04"
2424
continue-on-error: ${{ matrix.config.experimental }}
2525
env:
2626
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
@@ -29,13 +29,11 @@ jobs:
2929
fail-fast: False
3030
matrix:
3131
config:
32-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
3332
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3433
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3534
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
3635
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
3736
- {python-version: "3.11", testenvs: "py311-dev,build", experimental: True}
38-
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3937
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
4038
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
4139
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}
@@ -79,7 +77,7 @@ jobs:
7977
Deploy:
8078
needs: tests
8179

82-
runs-on: "ubuntu-20.04"
80+
runs-on: "ubuntu-22.04"
8381
steps:
8482
- name: Checkout 🛎️
8583
uses: "actions/checkout@v4"

.github/workflows/python_ci_macos.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ permissions:
1818

1919
jobs:
2020
tests:
21-
name: "macos-latest / Python ${{ matrix.config.python-version }}"
22-
runs-on: "macos-latest"
21+
name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
22+
runs-on: "macos-${{ matrix.config.os-ver }}"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
2525
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9'
@@ -28,15 +28,15 @@ jobs:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
32-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
33-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
34-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
35-
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
36-
- {python-version: "3.11", testenvs: "py311-dev,build", experimental: True}
37-
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
38-
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
39-
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}
31+
- {python-version: "3.6", os-ver: "13", testenvs: "py36,build", experimental: False}
32+
- {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False}
33+
- {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
34+
- {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
35+
- {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
36+
- {python-version: "3.11", os-ver: "14", testenvs: "py311-dev,build", experimental: True}
37+
- {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37,build", experimental: False}
38+
- {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38,build", experimental: False}
39+
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39,build", experimental: True}
4040

4141
steps:
4242
- name: Checkout 🛎️

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ci:
88

99
repos:
1010
- repo: https://github.com/repo-helper/pyproject-parser
11-
rev: v0.9.1
11+
rev: v0.13.0
1212
hooks:
1313
- id: reformat-pyproject
1414

@@ -42,8 +42,8 @@ repos:
4242
exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$
4343
- id: bind-requirements
4444

45-
- repo: https://github.com/domdfcoding/flake8-dunder-all
46-
rev: v0.3.1
45+
- repo: https://github.com/python-formate/flake8-dunder-all
46+
rev: v0.4.1
4747
hooks:
4848
- id: ensure-dunder-all
4949
files: ^webcolors-stubs/.*\.py$
@@ -81,7 +81,7 @@ repos:
8181
- id: snippet-fmt
8282

8383
- repo: https://github.com/python-formate/formate
84-
rev: v0.7.0
84+
rev: v0.8.0
8585
hooks:
8686
- id: formate
8787
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ Automated tests
3838
-------------------
3939

4040
Tests are run with ``tox`` and ``pytest``.
41-
To run tests for a specific Python version, such as Python 3.6:
41+
To run tests for a specific Python version, such as Python 3.10:
4242

4343
.. code-block:: bash
4444
45-
$ tox -e py36
45+
$ tox -e py310
4646
4747
4848
To run tests for all Python versions, simply run:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ webcolors-stubs
8686
:target: https://github.com/domdfcoding/webcolors-stubs/commit/master
8787
:alt: GitHub last commit
8888

89-
.. |maintained| image:: https://img.shields.io/maintenance/yes/2024
89+
.. |maintained| image:: https://img.shields.io/maintenance/yes/2025
9090
:alt: Maintenance
9191

9292
.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/webcolors-stubs

formate.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@ noqa-reformat = 60
66
ellipsis-reformat = 70
77
squish_stubs = 80
88

9-
[config]
10-
indent = "\t"
11-
line_length = 115
12-
139
[hooks.yapf]
1410
priority = 30
1511

16-
[hooks.isort]
17-
priority = 50
18-
1912
[hooks.yapf.kwargs]
2013
yapf_style = ".style.yapf"
2114

15+
[hooks.isort]
16+
priority = 50
17+
2218
[hooks.isort.kwargs]
23-
indent = "\t\t"
19+
indent = " "
2420
multi_line_output = 8
2521
import_heading_stdlib = "stdlib"
2622
import_heading_thirdparty = "3rd party"
@@ -46,3 +42,7 @@ known_third_party = [
4642
"requests",
4743
]
4844
known_first_party = [ "webcolors",]
45+
46+
[config]
47+
indent = " "
48+
line_length = 115

pyproject.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = [ "setuptools!=61.*,>=40.6.0", "wheel>=0.34.2",]
2+
requires = [ "setuptools!=61.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -28,14 +28,13 @@ classifiers = [
2828
]
2929
dynamic = [ "dependencies",]
3030

31+
[project.license]
32+
file = "LICENSE"
33+
3134
[[project.authors]]
3235
name = "Dominic Davis-Foster"
3336
email = "dominic@davis-foster.co.uk"
3437

35-
36-
[project.license]
37-
file = "LICENSE"
38-
3938
[project.urls]
4039
Homepage = "https://github.com/domdfcoding/webcolors-stubs"
4140
"Issue Tracker" = "https://github.com/domdfcoding/webcolors-stubs/issues"
@@ -71,13 +70,6 @@ show_error_codes = true
7170
[tool.snippet-fmt]
7271
directives = [ "code-block",]
7372

74-
[tool.dependency-dash."requirements.txt"]
75-
order = 10
76-
77-
[tool.dependency-dash."tests/requirements.txt"]
78-
order = 20
79-
include = false
80-
8173
[tool.snippet-fmt.languages.python]
8274
reformat = true
8375

@@ -87,3 +79,10 @@ reformat = true
8779
[tool.snippet-fmt.languages.ini]
8880

8981
[tool.snippet-fmt.languages.json]
82+
83+
[tool.dependency-dash."requirements.txt"]
84+
order = 10
85+
86+
[tool.dependency-dash."tests/requirements.txt"]
87+
order = 20
88+
include = false

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# * testenv
66
# * testenv:.package
77
# * testenv:py313-dev
8+
# * testenv:py313
89
# * testenv:py312-dev
910
# * testenv:py312
1011
# * testenv:docs
@@ -76,6 +77,7 @@ setenv =
7677
PYTHONDEVMODE=1
7778
PIP_DISABLE_PIP_VERSION_CHECK=1
7879
PIP_PREFER_BINARY=1
80+
UNSAFE_PYO3_SKIP_VERSION_CHECK=1
7981
skip_install = True
8082
changedir = {toxinidir}
8183
deps =
@@ -103,7 +105,7 @@ deps =
103105
flake8-github-actions>=0.1.0
104106
flake8-noqa>=1.1.0,<=1.2.2
105107
flake8-pyi>=20.10.0,<=22.8.0
106-
flake8-pytest-style>=1.3.0
108+
flake8-pytest-style>=1.3.0,<2
107109
flake8-quotes>=3.3.0
108110
flake8-slots>=0.1.0
109111
flake8-sphinx-links>=0.0.4
@@ -176,8 +178,8 @@ exclude_lines =
176178
raise NotImplementedError
177179
if 0:
178180
if False:
179-
if TYPE_CHECKING:
180-
if typing.TYPE_CHECKING:
181+
if TYPE_CHECKING
182+
if typing.TYPE_CHECKING
181183
if __name__ == .__main__.:
182184

183185
[check-wheel-contents]

0 commit comments

Comments
 (0)