Merge pull request #14667 from anntzer/pytestini

timhoffm · web-flow · commit 8d82733723de · 2019-07-04T02:03:27.000+02:00
Move most of pytest's conf to conftest.py.
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -5,6 +5,21 @@
 
 
 def pytest_configure(config):
+    # config is initialized here rather than in pytest.ini so that `pytest
+    # --pyargs matplotlib` (which would not find pytest.ini) works.  The only
+    # entries in pytest.ini set minversion (which is checked earlier) and
+    # testpaths/python_files, as they are required to properly find the tests.
+    for key, value in [
+        ("markers", "flaky: (Provided by pytest-rerunfailures.)"),
+        ("markers", "timeout: (Provided by pytest-timeout.)"),
+        ("markers", "backend: Set alternate Matplotlib backend temporarily."),
+        ("markers", "style: Set alternate Matplotlib style temporarily."),
+        ("markers", "baseline_images: Compare output against references."),
+        ("markers", "pytz: Tests that require pytz to be installed."),
+        ("filterwarnings", "error"),
+    ]:
+        config.addinivalue_line(key, value)
+
     matplotlib.use('agg', force=True)
     matplotlib._called_from_pytest = True
     matplotlib._init_tests()
diff --git a/pytest.ini b/pytest.ini
@@ -1,16 +1,6 @@
+# Additional configuration is in matplotlib/testing/conftest.py.
 [pytest]
 minversion = 3.6
 
 testpaths = lib
 python_files = test_*.py
-
-markers =
-    flaky: (Provided by pytest-rerunfailures.)
-    timeout: (Provided by pytest-timeout.)
-    backend: Set alternate Matplotlib backend temporarily.
-    style: Set alternate Matplotlib style temporarily.
-    baseline_images: Compare output against a known reference.
-    pytz: Tests that require pytz to be installed.
-
-filterwarnings =
-    error
