Skip to content

Commit

Permalink
Update config
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Sep 14, 2024
1 parent cc3369e commit ffcc0bb
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: codecov/codecov-action@v3.1.5
with:
flags: ${{ matrix.os }}
name: "${{ matrix.os }} Python ${{ matrix.python-version }}"
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

success:
needs: test
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.0
rev: v0.6.5
hooks:
- id: ruff
args: [--exit-non-zero-on-fix]

- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.4.2
rev: 24.8.0
hooks:
- id: black
exclude: ^html/
Expand All @@ -26,7 +26,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.6
rev: 0.29.2
hooks:
- id: check-github-workflows
- id: check-renovate
Expand All @@ -37,17 +37,17 @@ repos:
- id: actionlint

- repo: https://github.com/tox-dev/pyproject-fmt
rev: 2.1.3
rev: 2.2.3
hooks:
- id: pyproject-fmt

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.18
rev: v0.19
hooks:
- id: validate-pyproject

- repo: https://github.com/tox-dev/tox-ini-fmt
rev: 1.3.1
rev: 1.4.0
hooks:
- id: tox-ini-fmt

Expand Down
31 changes: 15 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ keywords = [
"osm openstreetmap tiles visualization",
]
license = { text = "MIT" }
maintainers = [
{ name = "Hugo van Kemenade" },
]
authors = [
{ name = "Colin Bick and Contributors", email = "colin.bick@gmail.com" },
]
maintainers = [ { name = "Hugo van Kemenade" } ]
authors = [ { name = "Colin Bick and Contributors", email = "colin.bick@gmail.com" } ]
requires-python = ">=3.9"
classifiers = [
"Intended Audience :: Developers",
Expand All @@ -33,9 +29,7 @@ classifiers = [
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Software Development :: Documentation",
]
dynamic = [
"version",
]
dynamic = [ "version" ]
optional-dependencies.tests = [
"coverage",
"pillow>=9.1",
Expand All @@ -62,30 +56,35 @@ lint.select = [
"EM", # flake8-errmsg
"F", # pyflakes errors
"I", # isort
"ICN", # flake8-import-conventions
"ISC", # flake8-implicit-str-concat
"LOG", # flake8-logging
"PGH", # pygrep-hooks
"PYI", # flake8-pyi
"RUF022", # unsorted-dunder-all
"RUF100", # unused noqa (yesqa)
"UP", # pyupgrade
"W", # pycodestyle warnings
"YTT", # flake8-2020
]
lint.extend-ignore = [
lint.ignore = [
"E203", # Whitespace before ':'
"E221", # Multiple spaces before operator
"E226", # Missing whitespace around arithmetic operator
"E241", # Multiple spaces after ','
]
lint.isort.known-first-party = [
"osmviz",
]
lint.isort.required-imports = [
"from __future__ import annotations",
]
lint.flake8-import-conventions.aliases.datetime = "dt"
lint.flake8-import-conventions.banned-from = [ "datetime" ]
lint.isort.known-first-party = [ "osmviz" ]
lint.isort.required-imports = [ "from __future__ import annotations" ]

[tool.pyproject-fmt]
max_supported_python = "3.13"

[tool.pytest.ini_options]
addopts = "-W error::DeprecationWarning"
filterwarnings = [
# Python <= 3.11
"ignore:sys.monitoring isn't available, using default core:coverage.exceptions.CoverageWarning",
]
testpaths = [ "tests" ]
12 changes: 10 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@ pass_env =
FORCE_COLOR
commands =
coverage erase
{envpython} -m pytest --cov osmviz --cov test --cov-append test/unit {posargs}
{envpython} -m pytest --cov osmviz --cov test --cov-append test/functional/test_manager.py {posargs}
{envpython} -m pytest \
--cov osmviz \
--cov test \
--cov-append test/unit \
{posargs}
{envpython} -m pytest \
--cov osmviz \
--cov test \
--cov-append test/functional/test_manager.py \
{posargs}
coverage xml

[testenv:lint]
Expand Down

0 comments on commit ffcc0bb

Please sign in to comment.