Skip to content

Commit bd0fd80

Browse files
committed
Bump min Matplotlib
1 parent d0bfa29 commit bd0fd80

File tree

5 files changed

+6
-27
lines changed

5 files changed

+6
-27
lines changed

.github/workflows/test_and_publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
- inkscape
2828
envs: |
2929
# Test oldest NEP 29 configurations
30-
- linux: py39-test-mpl33
31-
- macos: py39-test-mpl33
32-
- windows: py39-test-mpl33
30+
- linux: py311-test-mpl37
31+
- macos: py311-test-mpl37
32+
- windows: py311-test-mpl37
3333
# Test oldest non-NEP 29 configurations
3434
- linux: py39-test-mpl20
3535
runs-on: ubuntu-20.04

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ include_package_data = True
2626
python_requires = >=3.9
2727
install_requires =
2828
pytest
29-
matplotlib
29+
matplotlib>=3.7
3030
importlib_resources;python_version<'3.8'
3131
packaging
3232
Jinja2
@@ -43,7 +43,7 @@ docs =
4343
sphinx
4444
mpl_sphinx_theme>=3.6.0.dev0
4545
sphinx_design
46-
matplotlib==3.6
46+
matplotlib==3.7
4747

4848
[tool:pytest]
4949
testpaths = tests

tests/helpers.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ def pytester_path(pytester):
1616

1717

1818
def skip_if_format_unsupported(file_format, using_hashes=False):
19-
if file_format == 'svg' and MPL_VERSION < Version('3.3'):
20-
pytest.skip('SVG comparison is only supported in Matplotlib 3.3 and above')
21-
22-
if using_hashes:
23-
24-
if file_format == 'pdf' and MPL_VERSION < Version('2.1'):
25-
pytest.skip('PDF hashes are only deterministic in Matplotlib 2.1 and above')
26-
elif file_format == 'eps' and MPL_VERSION < Version('2.1'):
27-
pytest.skip('EPS hashes are only deterministic in Matplotlib 2.1 and above')
2819

2920
if using_hashes and not sys.platform.startswith('linux'):
3021
pytest.skip('Hashes for vector graphics are only provided in the hash library for Linux')

tests/test_deterministic.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def test_mpl():
5353
("true", "", False, False),
5454
],
5555
)
56-
@pytest.mark.skipif(MPL_VERSION < Version("3.3.0"), reason="Test unsupported: Default metadata is different in MPL<3.3")
5756
def test_config(pytester, file_format, ini, cli, kwarg, success_expected):
5857
skip_if_format_unsupported(file_format, using_hashes=True)
5958

tox.ini

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{39,310,311,312}-test-mpl{33,34,35,36,37,38}
3+
py{39,310,311,312}-test-mpl{37,38}
44
py312-test-mpldev-pytestdev
55
codestyle
66
requires =
@@ -19,17 +19,6 @@ setenv =
1919
changedir = .tmp/{envname}
2020
description = run tests
2121
deps =
22-
mpl20: matplotlib==2.0.*
23-
mpl20: nose
24-
mpl21: matplotlib==2.1.*
25-
mpl22: matplotlib==2.2.*
26-
mpl30: matplotlib==3.0.*
27-
mpl31: matplotlib==3.1.*
28-
mpl32: matplotlib==3.2.*
29-
mpl33: matplotlib==3.3.*
30-
mpl34: matplotlib==3.4.*
31-
mpl35: matplotlib==3.5.*
32-
mpl36: matplotlib==3.6.*
3322
mpl37: matplotlib==3.7.*
3423
mpl38: matplotlib==3.8.*
3524
mpldev: matplotlib>=0.0.dev0

0 commit comments

Comments
 (0)