Skip to content
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
9 changes: 0 additions & 9 deletions .dependabot/config.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
Run:
name: "Flake8"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"

steps:
- name: Checkout 🛎️
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
os: ['ubuntu-20.04', 'windows-2019']
os: ['ubuntu-22.04', 'windows-2019']
fail-fast: false

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- {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}
- {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ permissions:

jobs:
tests:
name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
runs-on: "ubuntu-20.04"
name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
runs-on: "ubuntu-22.04"
continue-on-error: ${{ matrix.config.experimental }}
env:
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'
Expand All @@ -29,13 +29,11 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
- {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", testenvs: "py310,build", experimental: False}
- {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: False}
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
- {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}
Expand Down Expand Up @@ -79,7 +77,7 @@ jobs:
Deploy:
needs: tests

runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v4"
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ permissions:

jobs:
tests:
name: "macos-latest / Python ${{ matrix.config.python-version }}"
runs-on: "macos-latest"
name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
runs-on: "macos-${{ matrix.config.os-ver }}"
continue-on-error: ${{ matrix.config.experimental }}
env:
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9'
Expand All @@ -28,15 +28,15 @@ jobs:
fail-fast: False
matrix:
config:
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
- {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", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", testenvs: "py311-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}
- {python-version: "3.6", os-ver: "13", testenvs: "py36,build", experimental: False}
- {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False}
- {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
- {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
- {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
- {python-version: "3.11", os-ver: "14", testenvs: "py311-dev,build", experimental: True}
- {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37,build", experimental: False}
- {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38,build", experimental: False}
- {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39,build", experimental: True}

steps:
- name: Checkout 🛎️
Expand Down
8 changes: 4 additions & 4 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.1
rev: v0.13.0
hooks:
- id: reformat-pyproject

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

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.3.1
- repo: https://github.com/python-formate/flake8-dunder-all
rev: v0.4.1
hooks:
- id: ensure-dunder-all
files: ^webcolors-stubs/.*\.py$
Expand Down Expand Up @@ -81,7 +81,7 @@ repos:
- id: snippet-fmt

- repo: https://github.com/python-formate/formate
rev: v0.7.0
rev: v0.8.0
hooks:
- id: formate
exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ Automated tests
-------------------

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

.. code-block:: bash

$ tox -e py36
$ tox -e py310


To run tests for all Python versions, simply run:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ webcolors-stubs
:target: https://github.com/domdfcoding/webcolors-stubs/commit/master
:alt: GitHub last commit

.. |maintained| image:: https://img.shields.io/maintenance/yes/2024
.. |maintained| image:: https://img.shields.io/maintenance/yes/2025
:alt: Maintenance

.. |pypi-downloads| image:: https://img.shields.io/pypi/dm/webcolors-stubs
Expand Down
16 changes: 8 additions & 8 deletions formate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,17 @@ noqa-reformat = 60
ellipsis-reformat = 70
squish_stubs = 80

[config]
indent = "\t"
line_length = 115

[hooks.yapf]
priority = 30

[hooks.isort]
priority = 50

[hooks.yapf.kwargs]
yapf_style = ".style.yapf"

[hooks.isort]
priority = 50

[hooks.isort.kwargs]
indent = "\t\t"
indent = " "
multi_line_output = 8
import_heading_stdlib = "stdlib"
import_heading_thirdparty = "3rd party"
Expand All @@ -46,3 +42,7 @@ known_third_party = [
"requests",
]
known_first_party = [ "webcolors",]

[config]
indent = " "
line_length = 115
23 changes: 11 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = [ "setuptools!=61.*,>=40.6.0", "wheel>=0.34.2",]
requires = [ "setuptools!=61.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",]
build-backend = "setuptools.build_meta"

[project]
Expand Down Expand Up @@ -28,14 +28,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "Dominic Davis-Foster"
email = "dominic@davis-foster.co.uk"


[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/domdfcoding/webcolors-stubs"
"Issue Tracker" = "https://github.com/domdfcoding/webcolors-stubs/issues"
Expand Down Expand Up @@ -71,13 +70,6 @@ show_error_codes = true
[tool.snippet-fmt]
directives = [ "code-block",]

[tool.dependency-dash."requirements.txt"]
order = 10

[tool.dependency-dash."tests/requirements.txt"]
order = 20
include = false

[tool.snippet-fmt.languages.python]
reformat = true

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

[tool.snippet-fmt.languages.json]

[tool.dependency-dash."requirements.txt"]
order = 10

[tool.dependency-dash."tests/requirements.txt"]
order = 20
include = false
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# * testenv
# * testenv:.package
# * testenv:py313-dev
# * testenv:py313
# * testenv:py312-dev
# * testenv:py312
# * testenv:docs
Expand Down Expand Up @@ -76,6 +77,7 @@ setenv =
PYTHONDEVMODE=1
PIP_DISABLE_PIP_VERSION_CHECK=1
PIP_PREFER_BINARY=1
UNSAFE_PYO3_SKIP_VERSION_CHECK=1
skip_install = True
changedir = {toxinidir}
deps =
Expand Down Expand Up @@ -103,7 +105,7 @@ deps =
flake8-github-actions>=0.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-pytest-style>=1.3.0,<2
flake8-quotes>=3.3.0
flake8-slots>=0.1.0
flake8-sphinx-links>=0.0.4
Expand Down Expand Up @@ -176,8 +178,8 @@ exclude_lines =
raise NotImplementedError
if 0:
if False:
if TYPE_CHECKING:
if typing.TYPE_CHECKING:
if TYPE_CHECKING
if typing.TYPE_CHECKING
if __name__ == .__main__.:

[check-wheel-contents]
Expand Down
Loading