Skip to content

Commit 8d18fbe

Browse files
committed
CI Py3.10.
1 parent af8a7ee commit 8d18fbe

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
os: [ubuntu-18.04, macos-10.15, windows-2019]
10-
python-version: ["3.7", "3.8", "3.9"]
10+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1111
fail-fast: false
1212
runs-on: ${{ matrix.os }}
1313
steps:
@@ -53,9 +53,8 @@ jobs:
5353
5454
python -mpip install dist/*.whl &&
5555
python tools/ensure-mpl-test-data.py &&
56-
# pytest 6.2 is incompatible with matplotlib<3.4
5756
# pytest-{instafail,timeout} useful for hanging tests.
58-
python -mpip install 'pytest<6.2' pytest-instafail pytest-timeout
57+
python -mpip install pytest pytest-instafail pytest-timeout
5958
- name: Test
6059
shell: bash
6160
run: |

run-mpl-test-suite.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"""
88

99
from argparse import ArgumentParser
10-
from distutils.version import LooseVersion
1110
import os
1211
from pathlib import Path
1312
import sys
@@ -21,6 +20,8 @@
2120
import matplotlib.backends.backend_agg
2221
import matplotlib.testing.decorators
2322

23+
from packaging.version import parse as parse_version
24+
2425
import pytest
2526

2627

@@ -194,7 +195,7 @@ def pytest_collection_modifyitems(session, config, items):
194195
]
195196
for nodeid in nodeids
196197
}
197-
if LooseVersion(mpl.__version__) < "3.0":
198+
if parse_version(mpl.__version__) < parse_version("3.0"):
198199
module_markers.update({
199200
"matplotlib.sphinxext.test_tinypages": irrelevant, # matplotlib#11360.
200201
})

0 commit comments

Comments
 (0)