Skip to content

Commit 44a5a32

Browse files
authored
build: support Python 3.10 (#20)
* ci: auto-update pre-commit hooks * ci: update cspell config * ci: define Python version in YAML as string Defining the Python version as a number (e.g. 3.7) can lead to problems later on when you want to use 3.10, because that would be interpreted as 3.1. * ci: support epic branches with CI * test: ignore distutils deprecation warning
1 parent 825148b commit 44a5a32

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
".readthedocs.yml",
3737
".vscode/*",
3838
".vscode/.gitignore",
39+
".zenodo.json",
3940
"codecov.yml",
4041
"docs/_templates/*",
4142
"docs/adr/*/*",

.github/workflows/ci-style.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ name: CI-style
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
7+
- epic/*
68
pull_request:
7-
branches: [main]
9+
branches:
10+
- main
11+
- epic/*
812

913
jobs:
1014
style:
@@ -15,7 +19,7 @@ jobs:
1519
- name: Set up Python 3.7
1620
uses: actions/setup-python@v2
1721
with:
18-
python-version: 3.7
22+
python-version: "3.7"
1923
- name: Install dependencies
2024
run: |
2125
python -m pip install --upgrade pip

.github/workflows/ci-tests.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ name: CI-tests
44

55
on:
66
push:
7-
branches: [main]
7+
branches:
8+
- main
9+
- epic/*
810
pull_request:
9-
branches: [main]
11+
branches:
12+
- main
13+
- epic/*
1014

1115
jobs:
1216
codecov:
@@ -15,7 +19,7 @@ jobs:
1519
strategy:
1620
matrix:
1721
os: [ubuntu-20.04]
18-
python-version: [3.7]
22+
python-version: ["3.7"]
1923
steps:
2024
- uses: actions/checkout@master
2125
- name: Set up Python ${{ matrix.python-version }}
@@ -41,16 +45,23 @@ jobs:
4145
os:
4246
- macos-10.15
4347
- ubuntu-20.04
44-
python-version: [3.6, 3.7, 3.8, 3.9]
48+
python-version:
49+
- "3.6"
50+
- "3.7"
51+
- "3.8"
52+
- "3.9"
53+
- "3.10"
4554
exclude:
4655
- os: macos-10.15
47-
python-version: 3.6
56+
python-version: "3.6"
4857
- os: macos-10.15
49-
python-version: 3.8
58+
python-version: "3.8"
5059
- os: macos-10.15
51-
python-version: 3.9
60+
python-version: "3.9"
61+
- os: macos-10.15
62+
python-version: "3.10"
5263
- os: ubuntu-20.04 # coverage job
53-
python-version: 3.7
64+
python-version: "3.7"
5465
steps:
5566
- uses: actions/checkout@v2
5667
- name: Set up Python ${{ matrix.python-version }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ repos:
4545
- id: trailing-whitespace
4646

4747
- repo: https://github.com/ComPWA/repo-maintenance
48-
rev: 0.0.44
48+
rev: 0.0.50
4949
hooks:
5050
- id: check-dev-files
5151
- id: format-setup-cfg
@@ -61,7 +61,7 @@ repos:
6161
- id: blacken-docs
6262

6363
- repo: https://github.com/streetsidesoftware/cspell-cli
64-
rev: v5.6.9
64+
rev: v5.6.10
6565
hooks:
6666
- id: cspell
6767

@@ -100,7 +100,7 @@ repos:
100100
- id: pydocstyle
101101

102102
- repo: https://github.com/ComPWA/mirrors-pyright
103-
rev: v1.1.175
103+
rev: v1.1.179
104104
hooks:
105105
- id: pyright
106106

pytest.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ addopts =
1010
--durations=3
1111
filterwarnings =
1212
error
13+
ignore:The distutils package is deprecated.*:DeprecationWarning
1314
markers =
1415
slow: marks tests as slow (deselect with '-m "not slow"')
1516
testpaths =

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ classifiers =
2828
Programming Language :: Python :: 3.7
2929
Programming Language :: Python :: 3.8
3030
Programming Language :: Python :: 3.9
31+
Programming Language :: Python :: 3.10
3132
Topic :: Documentation
3233
Topic :: Utilities
3334
Typing :: Typed
3435

3536
[options]
36-
python_requires = >=3.6, <3.10
37+
python_requires = >=3.6
3738
setup_requires =
3839
setuptools_scm
3940
install_requires =

0 commit comments

Comments
 (0)