Skip to content

Commit de774bd

Browse files
Merge pull request #256 from ConorMacBride/update-min-deps
Update minimum Python and dependency versions for package and tests
2 parents bd7ee78 + b02db96 commit de774bd

File tree

3 files changed

+25
-39
lines changed

3 files changed

+25
-39
lines changed

.github/workflows/test_and_publish.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,25 @@ jobs:
2929
- inkscape
3030
envs: |
3131
# Test oldest SPEC 0 configurations
32-
- linux: py311-test-mpl38
33-
- macos: py311-test-mpl38
34-
- windows: py311-test-mpl38
32+
- linux: py312-test-mpl39
33+
- macos: py312-test-mpl39
34+
- windows: py312-test-mpl39
3535
# Test newest configurations
36-
- linux: py313-test-mpl310
37-
- macos: py313-test-mpl310
38-
- windows: py313-test-mpl310
36+
- linux: py314-test-mpl310
37+
- macos: py314-test-mpl310
38+
- windows: py314-test-mpl310
3939
# Test intermediate SPEC 0 configurations on Linux
40-
- linux: py311-test-mpl39
41-
- linux: py312-test-mpl39
42-
- linux: py311-test-mpl310
43-
- linux: py312-test-mpl310
40+
- linux: py313-test-mpl39
41+
- linux: py313-test-mpl310
4442
# Test non-SPEC 0 configurations
45-
- linux: py313-test-mpldev-pytestdev
46-
- linux: py311-test-mpl37-pytest74
47-
- linux: py39-test-mpl33-pytest62
48-
# Test oldest non-SPEC 0 configurations
49-
- linux: py39-test-mpl33
50-
- macos: py39-test-mpl35
51-
- windows: py39-test-mpl33
43+
- linux: py314-test-mpldev-pytestdev
44+
- linux: py313-test-mpl38-pytest84
45+
- linux: py312-test-mpl38-pytest74
46+
- linux: py310-test-mpl35-pytest62
47+
# Test oldest supported Python configurations
48+
- linux: py310-test-mpl35
49+
- macos: py310-test-mpl35
50+
- windows: py310-test-mpl35
5251
coverage: 'codecov'
5352

5453
publish:

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ classifiers = [
2525
"Operating System :: OS Independent",
2626
]
2727
description = "pytest plugin to help with testing figures output from Matplotlib"
28-
requires-python = ">=3.9"
28+
requires-python = ">=3.10"
2929
dependencies = [
30-
"pytest>=5.4.0",
31-
"matplotlib>=3.3.3",
30+
"pytest>=6.2.5",
31+
"matplotlib>=3.5.3",
3232
"packaging>=22.0.0",
3333
"Jinja2>=2.10.2",
3434
"Pillow>=8.1.1",
@@ -55,7 +55,7 @@ docs = [
5555
"sphinx>=7.0.0",
5656
"mpl_sphinx_theme>=3.9.0",
5757
"sphinx_design>=0.6.0",
58-
"matplotlib==3.9.*",
58+
"matplotlib==3.10.*",
5959
]
6060

6161
[tool.setuptools]
@@ -86,4 +86,3 @@ length_sort_sections = [
8686
"stdlib",
8787
]
8888
line_length = 100
89-

tox.ini

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
py{39,310,311,312}-test-mpl{33,34,35,36,37,38}
4-
py312-test-mpldev-pytestdev
3+
py{312,313,314}-test-mpl{35,36,37,38,39,310}-pytest{62,70,71,72,73,74,80,81,82,83,84}
4+
py314-test-mpldev-pytestdev
55
codestyle
66
requires =
77
setuptools >= 30.3.0
@@ -22,28 +22,15 @@ constrain_package_deps =
2222
!mpldev-!pytestdev: true
2323
deps =
2424
pytest-xdist
25-
mpl20: matplotlib==2.0.*
26-
mpl21: matplotlib==2.1.*
27-
mpl22: matplotlib==2.2.*
28-
mpl22: numpy<2
29-
mpl30: matplotlib==3.0.*
30-
mpl31: matplotlib==3.1.*
31-
mpl31: numpy<2
32-
mpl32: matplotlib==3.2.*
33-
mpl33: matplotlib==3.3.*
34-
mpl33: numpy<2
35-
mpl34: matplotlib==3.4.*
36-
mpl35: matplotlib==3.5.*
25+
mpl{35,36,37,38,39}: pyparsing<3.3.0
3726
mpl35: numpy<2
27+
mpl35: matplotlib==3.5.*
3828
mpl36: matplotlib==3.6.*
3929
mpl37: matplotlib==3.7.*
4030
mpl38: matplotlib==3.8.*
4131
mpl39: matplotlib==3.9.*
4232
mpl310: matplotlib==3.10.*
4333
mpldev: matplotlib>=0.0.dev0
44-
pytest54: pytest==5.4.*
45-
pytest60: pytest==6.0.*
46-
pytest61: pytest==6.1.*
4734
pytest62: pytest==6.2.*
4835
pytest70: pytest==7.0.*
4936
pytest71: pytest==7.1.*
@@ -54,6 +41,7 @@ deps =
5441
pytest81: pytest==8.1.*
5542
pytest82: pytest==8.2.*
5643
pytest83: pytest==8.3.*
44+
pytest84: pytest==8.4.*
5745
pytestdev: git+https://github.com/pytest-dev/pytest.git#egg=pytest
5846
extras =
5947
test

0 commit comments

Comments
 (0)