Skip to content

Commit 64c6b48

Browse files
authored
Merge pull request #38 from hugovk/add-3.12
2 parents 0f79b2b + c7196da commit 64c6b48

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-python@v4
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-python@v5
1515
with:
1616
python-version: "3.x"
1717
- uses: pre-commit/[email protected]

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: ["3.8", "3.9", "3.10", "3.11"]
14+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1515
os: [windows-latest, macos-latest, ubuntu-latest]
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@v5
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
cache: pip

.pre-commit-config.yaml

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
repos:
22
- repo: https://github.com/asottile/pyupgrade
3-
rev: v3.9.0
3+
rev: v3.15.0
44
hooks:
55
- id: pyupgrade
66
args: [--py38-plus]
77

8-
- repo: https://github.com/psf/black
9-
rev: 23.7.0
8+
- repo: https://github.com/psf/black-pre-commit-mirror
9+
rev: 23.12.1
1010
hooks:
1111
- id: black
1212

1313
- repo: https://github.com/PyCQA/isort
14-
rev: 5.12.0
14+
rev: 5.13.2
1515
hooks:
1616
- id: isort
1717

1818
- repo: https://github.com/PyCQA/flake8
19-
rev: 6.0.0
19+
rev: 6.1.0
2020
hooks:
2121
- id: flake8
2222
additional_dependencies:
@@ -29,23 +29,23 @@ repos:
2929
- id: python-no-log-warn
3030

3131
- repo: https://github.com/pre-commit/pre-commit-hooks
32-
rev: v4.4.0
32+
rev: v4.5.0
3333
hooks:
3434
- id: check-case-conflict
3535
- id: check-merge-conflict
36-
- id: check-json
3736
- id: check-toml
3837
- id: check-yaml
38+
- id: debug-statements
3939
- id: end-of-file-fixer
4040
- id: trailing-whitespace
4141

4242
- repo: https://github.com/tox-dev/pyproject-fmt
43-
rev: 0.13.0
43+
rev: 1.5.3
4444
hooks:
4545
- id: pyproject-fmt
4646

4747
- repo: https://github.com/abravalheri/validate-pyproject
48-
rev: v0.13
48+
rev: v0.15
4949
hooks:
5050
- id: validate-pyproject
5151

@@ -55,10 +55,15 @@ repos:
5555
- id: tox-ini-fmt
5656

5757
- repo: https://github.com/pre-commit/mirrors-prettier
58-
rev: v3.0.0
58+
rev: v3.1.0
5959
hooks:
6060
- id: prettier
6161
args: [--prose-wrap=always, --print-width=88]
6262

63+
- repo: meta
64+
hooks:
65+
- id: check-hooks-apply
66+
- id: check-useless-excludes
67+
6368
ci:
6469
autoupdate_schedule: quarterly

pyproject.toml

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ classifiers = [
2929
"Programming Language :: Python :: 3.9",
3030
"Programming Language :: Python :: 3.10",
3131
"Programming Language :: Python :: 3.11",
32+
"Programming Language :: Python :: 3.12",
3233
"Topic :: Artistic Software",
3334
"Topic :: Multimedia :: Graphics",
3435
"Topic :: Scientific/Engineering :: Visualization",
@@ -45,6 +46,7 @@ dependencies = [
4546
"plotnine",
4647
"rich",
4748
"seaborn",
49+
'setuptools; python_version >= "3.12"', # TODO Remove when https://github.com/MarvinT/calmap/issues/22 is fixed
4850
]
4951
[project.urls]
5052
Homepage = "https://github.com/marcusvolz/strava_py"

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{311, 310, 39, 38}
6+
py{312, 311, 310, 39, 38}
77

88
[testenv]
99
pass_env =

0 commit comments

Comments
 (0)