Skip to content

Commit 0d98d5e

Browse files
authored
Merge pull request #93 from ess-dmsc/update-python-versions
Update python versions
2 parents 07c6fcb + ed4178d commit 0d98d5e

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

.pre-commit-config.yaml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
repos:
2-
- repo: https://github.com/psf/black
3-
rev: 22.3.0
2+
- repo: local
43
hooks:
5-
- id: black
6-
language_version: python3
7-
- repo: https://github.com/pycqa/flake8
8-
rev: 4.0.1
9-
hooks:
10-
- id: flake8
11-
- repo: https://github.com/pycqa/isort
12-
rev: 5.11.5
13-
hooks:
14-
- id: isort
15-
args: ["--profile", "black"]
4+
- id: black
5+
name: black
6+
entry: black
7+
language: system
8+
types_or: [python, pyi]
9+
require_serial: true
10+
- id: flake8
11+
name: flake8
12+
entry: flake8
13+
language: system
14+
types: [python]
15+
require_serial: true
16+
- id: isort
17+
name: isort
18+
entry: isort
19+
args: ["--profile", "black"]
20+
language: system
21+
types_or: [cython, pyi, python]
22+
require_serial: true
1623

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ builders = pipeline_builder.createBuilders { container ->
4343
def test_output = "TestResults.xml"
4444
container.sh """
4545
cd ${pipeline_builder.project}
46-
pyenv local 3.7 3.8 3.9
46+
pyenv local 3.8 3.9 3.10 3.11 3.12
4747
pyenv versions
4848
python -m tox -- --junitxml=${test_output}
4949
"""

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-r requirements.txt
2-
black==22.3.0 # Pinned to match pre-commit config
3-
flake8==4.0.1 # Pinned to match pre-commit config
4-
isort==5.11.5 # Pinned to match pre-commit configblack
2+
black
3+
flake8
4+
isort
55
pre-commit
66
pytest
77
tox==3.27.1 # tox 4 seems to be broken at the moment

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py37, py38, py39, flake8
2+
envlist = py38, py39, py310, py311, py312, flake8
33
isolated_build = true
44
skipsdist=true
55

0 commit comments

Comments
 (0)