Skip to content

Commit 6cff6ab

Browse files
hugovkhugovk
authored
Merge pull request #47 from hugovk/rm-3.8
2 parents 3615841 + 656ae21 commit 6cff6ab

File tree

6 files changed

+60
-47
lines changed

6 files changed

+60
-47
lines changed

‎.github/workflows/deploy.yml

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
permissions:
1515
contents: read
1616

17+
env:
18+
FORCE_COLOR: 1
19+
1720
jobs:
1821
# Always build & lint package.
1922
build-package:

‎.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44

55
env:
66
FORCE_COLOR: 1
7+
PIP_DISABLE_PIP_VERSION_CHECK: 1
78

89
permissions:
910
contents: read

‎.github/workflows/test.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Test
22

33
on: [push, pull_request, workflow_dispatch]
44

5+
permissions:
6+
contents: read
7+
58
env:
69
FORCE_COLOR: 1
710

@@ -11,7 +14,7 @@ jobs:
1114
strategy:
1215
fail-fast: false
1316
matrix:
14-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
17+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1518
os: [windows-latest, macos-latest, ubuntu-latest]
1619

1720
steps:
@@ -26,7 +29,6 @@ jobs:
2629
- name: Install dependencies
2730
run: |
2831
python -m pip install -U pip
29-
python -m pip install -U wheel
3032
python -m pip install -U tox
3133
3234
- name: Tox tests

‎.pre-commit-config.yaml

+20-8
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,55 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.2.1
3+
rev: v0.6.8
44
hooks:
55
- id: ruff
66
args: [--exit-non-zero-on-fix]
77

88
- repo: https://github.com/psf/black-pre-commit-mirror
9-
rev: 24.1.1
9+
rev: 24.8.0
1010
hooks:
1111
- id: black
1212

1313
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v4.5.0
14+
rev: v4.6.0
1515
hooks:
16+
- id: check-added-large-files
1617
- id: check-case-conflict
1718
- id: check-merge-conflict
1819
- id: check-toml
1920
- id: check-yaml
2021
- id: debug-statements
2122
- id: end-of-file-fixer
23+
- id: forbid-submodules
2224
- id: trailing-whitespace
2325

26+
- repo: https://github.com/python-jsonschema/check-jsonschema
27+
rev: 0.29.2
28+
hooks:
29+
- id: check-github-workflows
30+
31+
- repo: https://github.com/rhysd/actionlint
32+
rev: v1.7.2
33+
hooks:
34+
- id: actionlint
35+
2436
- repo: https://github.com/tox-dev/pyproject-fmt
25-
rev: 1.7.0
37+
rev: 2.2.4
2638
hooks:
2739
- id: pyproject-fmt
2840

2941
- repo: https://github.com/abravalheri/validate-pyproject
30-
rev: v0.16
42+
rev: v0.20.2
3143
hooks:
3244
- id: validate-pyproject
3345

3446
- repo: https://github.com/tox-dev/tox-ini-fmt
35-
rev: 1.3.1
47+
rev: 1.4.1
3648
hooks:
3749
- id: tox-ini-fmt
3850

39-
- repo: https://github.com/pre-commit/mirrors-prettier
40-
rev: v4.0.0-alpha.8
51+
- repo: https://github.com/rbubley/mirrors-prettier
52+
rev: v3.3.3
4153
hooks:
4254
- id: prettier
4355
args: [--prose-wrap=always, --print-width=88]

‎pyproject.toml

+31-36
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ keywords = [
1717
"strava",
1818
"visualisation",
1919
]
20-
license = {text = "MIT"}
21-
maintainers = [{name = "Hugo van Kemenade"}]
22-
authors = [{name = "Marcus Volz"}]
23-
requires-python = ">=3.8"
20+
license = { text = "MIT" }
21+
maintainers = [ { name = "Hugo van Kemenade" } ]
22+
authors = [ { name = "Marcus Volz" } ]
23+
requires-python = ">=3.9"
2424
classifiers = [
2525
"Development Status :: 3 - Alpha",
2626
"License :: OSI Approved :: MIT License",
2727
"Programming Language :: Python :: 3 :: Only",
28-
"Programming Language :: Python :: 3.8",
2928
"Programming Language :: Python :: 3.9",
3029
"Programming Language :: Python :: 3.10",
3130
"Programming Language :: Python :: 3.11",
@@ -34,9 +33,7 @@ classifiers = [
3433
"Topic :: Multimedia :: Graphics",
3534
"Topic :: Scientific/Engineering :: Visualization",
3635
]
37-
dynamic = [
38-
"version",
39-
]
36+
dynamic = [ "version" ]
4037
dependencies = [
4138
"calmap>=0.0.11",
4239
"fit2gpx",
@@ -46,13 +43,11 @@ dependencies = [
4643
"plotnine",
4744
"rich",
4845
"seaborn",
49-
'setuptools; python_version >= "3.12"', # TODO Remove when https://github.com/MarvinT/calmap/issues/22 is fixed
46+
"setuptools; python_version>='3.12'", # TODO Remove when https://github.com/MarvinT/calmap/issues/22 is fixed
5047
]
51-
[project.urls]
52-
Homepage = "https://github.com/marcusvolz/strava_py"
53-
Source = "https://github.com/marcusvolz/strava_py"
54-
[project.scripts]
55-
stravavis = "stravavis.cli:main"
48+
urls.Homepage = "https://github.com/marcusvolz/strava_py"
49+
urls.Source = "https://github.com/marcusvolz/strava_py"
50+
scripts.stravavis = "stravavis.cli:main"
5651

5752
[tool.hatch]
5853
version.source = "vcs"
@@ -63,28 +58,28 @@ local_scheme = "no-local-version"
6358
[tool.ruff]
6459
fix = true
6560

66-
[tool.ruff.lint]
67-
select = [
68-
"C4", # flake8-comprehensions
69-
"E", # pycodestyle errors
70-
"EM", # flake8-errmsg
71-
"F", # pyflakes errors
72-
"I", # isort
73-
"ISC", # flake8-implicit-str-concat
74-
"LOG", # flake8-logging
75-
"PGH", # pygrep-hooks
61+
lint.select = [
62+
"C4", # flake8-comprehensions
63+
"E", # pycodestyle errors
64+
"EM", # flake8-errmsg
65+
"F", # pyflakes errors
66+
"I", # isort
67+
"ICN", # flake8-import-conventions
68+
"ISC", # flake8-implicit-str-concat
69+
"LOG", # flake8-logging
70+
"PGH", # pygrep-hooks
71+
"RUF022", # unsorted-dunder-all
7672
"RUF100", # unused noqa (yesqa)
77-
"UP", # pyupgrade
78-
"W", # pycodestyle warnings
79-
"YTT", # flake8-2020
73+
"UP", # pyupgrade
74+
"W", # pycodestyle warnings
75+
"YTT", # flake8-2020
8076
]
81-
extend-ignore = [
82-
"E203", # Whitespace before ':'
83-
"E221", # Multiple spaces before operator
84-
"E226", # Missing whitespace around arithmetic operator
85-
"E241", # Multiple spaces after ','
77+
lint.ignore = [
78+
"E203", # Whitespace before ':'
79+
"E221", # Multiple spaces before operator
80+
"E226", # Missing whitespace around arithmetic operator
81+
"E241", # Multiple spaces after ','
82+
"UP038", # Makes code slower and more verbose
8683
]
87-
88-
[tool.ruff.lint.isort]
89-
known-first-party = ["stravavis"]
90-
required-imports = ["from __future__ import annotations"]
84+
lint.isort.known-first-party = [ "stravavis" ]
85+
lint.isort.required-imports = [ "from __future__ import annotations" ]

‎tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires =
33
tox>=4.2
44
env_list =
55
lint
6-
py{312, 311, 310, 39, 38}
6+
py{312, 311, 310, 39}
77

88
[testenv]
99
pass_env =

0 commit comments

Comments
 (0)