Skip to content

Commit e917370

Browse files
committed
TST: update default junit_family
pytest 6 will be moving to this by default and azure supports this format so might as well move to the future now. This causes exceptions from pytest if we try to set it in conftest.py with the markers
1 parent c292827 commit e917370

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Diff for: lib/matplotlib/testing/conftest.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
def pytest_configure(config):
88
# config is initialized here rather than in pytest.ini so that `pytest
99
# --pyargs matplotlib` (which would not find pytest.ini) works. The only
10-
# entries in pytest.ini set minversion (which is checked earlier) and
11-
# testpaths/python_files, as they are required to properly find the tests.
10+
# entries in pytest.ini set minversion (which is checked earlier),
11+
# testpaths/python_files, as they are required to properly find the tests
1212
for key, value in [
1313
("markers", "flaky: (Provided by pytest-rerunfailures.)"),
1414
("markers", "timeout: (Provided by pytest-timeout.)"),

Diff for: pytest.ini

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ minversion = 3.6
44

55
testpaths = lib
66
python_files = test_*.py
7+
junit_family = xunit2

0 commit comments

Comments
 (0)