Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo-helper] Configuration Update #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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/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
4 changes: 2 additions & 2 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-13 / Python ${{ matrix.config.python-version }}"
runs-on: "macos-13"
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 Down
4 changes: 2 additions & 2 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.11.0
hooks:
- id: reformat-pyproject

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

- repo: https://github.com/domdfcoding/flake8-dunder-all
rev: v0.3.1
rev: v0.4.1
hooks:
- id: ensure-dunder-all
files: ^webcolors-stubs/.*\.py$
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
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,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 +104,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 +177,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