Skip to content

Commit 668b09c

Browse files
committed
update environments to test
1 parent 17facab commit 668b09c

File tree

5 files changed

+30
-25
lines changed

5 files changed

+30
-25
lines changed

.github/workflows/test_and_publish.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,29 @@ jobs:
2626
- ghostscript
2727
- inkscape
2828
envs: |
29-
# Test oldest NEP 29 configurations
30-
- linux: py39-test-mpl33
31-
- macos: py39-test-mpl33
32-
- windows: py39-test-mpl33
33-
# Test oldest non-NEP 29 configurations
34-
- linux: py36-test-mpl20
35-
runs-on: ubuntu-20.04
36-
- macos: py36-test-mpl20
37-
- windows: py36-test-mpl20
29+
# Test oldest SPEC 0 configurations
30+
- linux: py311-test-mpl37
31+
- macos: py311-test-mpl37
32+
- windows: py311-test-mpl37
33+
# Test oldest non-SPEC 0 configurations
34+
- linux: py38-test-mpl22
35+
- macos: py37-test-mpl22
36+
- windows: py38-test-mpl22
3837
# Test newest configurations
38+
- linux: py313-test-mpl39
39+
- macos: py313-test-mpl39
40+
- windows: py313-test-mpl39
41+
# Test intermediate SPEC 0 configurations on Linux
42+
- linux: py312-test-mpl37
43+
# - linux: py311-test-mpl38
3944
- linux: py312-test-mpl38
40-
- macos: py312-test-mpl38
41-
- windows: py312-test-mpl38
42-
# Test intermediate NEP 29 configurations on Linux
43-
- linux: py39-test-mpl38
44-
- linux: py310-test-mpl38
45-
- linux: py310-test-mpl35
46-
- linux: py311-test-mpl36
47-
- linux: py311-test-mpl37
45+
- linux: py313-test-mpl38
46+
- linux: py311-test-mpl39
47+
# - linux: py312-test-mpl39
48+
- linux: py313-test-mpl39
4849
# Test different versions of pytest
49-
- linux: py312-test-mpldev-pytestdev
50+
- linux: py313-test-mpldev-pytestdev
51+
- linux: py311-test-mpl37-pytest74
5052
- linux: py39-test-mpl33-pytest62
5153
- linux: py38-test-mpl31-pytest54
5254
coverage: 'codecov'
@@ -57,7 +59,5 @@ jobs:
5759
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
5860
with:
5961
test_command: pytest $GITHUB_WORKSPACE/tests; pytest --mpl $GITHUB_WORKSPACE/tests
60-
# Remove python-version when python-dateutil >2.8.2
61-
python-version: "3.11"
6262
secrets:
6363
pypi_token: ${{ secrets.pypi_password }}

setup.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ docs =
4343
sphinx
4444
mpl_sphinx_theme>=3.6.0.dev0
4545
sphinx_design
46-
matplotlib==3.6
4746

4847
[tool:pytest]
4948
testpaths = tests

tests/subtests/subtest/pytest.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ filterwarnings =
66
error
77
ignore:distutils Version classes are deprecated
88
ignore:the imp module is deprecated in favour of importlib
9-
ignore:Auto-close\(\)ing of figures upon backend switching is deprecated:matplotlib._api.deprecation.MatplotlibDeprecationWarning
9+
ignore:Auto-close\(\)ing of figures upon backend switching is deprecated

tests/test_pytest_mpl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ def test_format_{file_format}():
702702
assert len(hash_data[f"test_formats.test_format_{file_format}"]) == 64
703703
if not passes:
704704
hash_data[f"test_formats.test_format_{file_format}"] = (
705-
"d1ff" + hash_data[f"test_formats.test_format_{file_format}"][4:]
705+
"d1ff" + hash_data[f"test_formats.test_format_{file_format}"][4:]
706706
)
707707
tmp_hash_library.write_text(json.dumps(hash_data))
708708

tox.ini

+8-2
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,22 @@ setenv =
1919
changedir = .tmp/{envname}
2020
description = run tests
2121
deps =
22-
py312: git+https://github.com/dateutil/dateutil.git#egg=python-dateutil
2322
mpl20: matplotlib==2.0.*
24-
mpl20: nose
2523
mpl21: matplotlib==2.1.*
2624
mpl22: matplotlib==2.2.*
25+
mpl22: numpy<2
2726
mpl30: matplotlib==3.0.*
2827
mpl31: matplotlib==3.1.*
28+
mpl31: numpy<2
2929
mpl32: matplotlib==3.2.*
3030
mpl33: matplotlib==3.3.*
31+
mpl33: numpy<2
3132
mpl34: matplotlib==3.4.*
3233
mpl35: matplotlib==3.5.*
3334
mpl36: matplotlib==3.6.*
3435
mpl37: matplotlib==3.7.*
3536
mpl38: matplotlib==3.8.*
37+
mpl39: matplotlib==3.9.*
3638
mpldev: matplotlib>=0.0.dev0
3739
pytest54: pytest==5.4.*
3840
pytest60: pytest==6.0.*
@@ -43,6 +45,10 @@ deps =
4345
pytest72: pytest==7.2.*
4446
pytest73: pytest==7.3.*
4547
pytest74: pytest==7.4.*
48+
pytest80: pytest==8.0.*
49+
pytest81: pytest==8.1.*
50+
pytest82: pytest==8.2.*
51+
pytest83: pytest==8.3.*
4652
pytestdev: git+https://github.com/pytest-dev/pytest.git#egg=pytest
4753
extras =
4854
test

0 commit comments

Comments
 (0)