tests: simplify to info

Author: henryiii

tests/conftest.py

@@ -8,9 +8,7 @@
 import contextlib
 import difflib
 import gc
-import platform
 import re
-import sys
 import textwrap
 
 import pytest
@@ -193,44 +191,3 @@ def gc_collect():
 def pytest_configure():
     pytest.suppress = suppress
     pytest.gc_collect = gc_collect
-
-
-# Platform Markers
-
-PLAT = sys.platform.lower()  # linux, osx, or win32
-IMPL = platform.python_implementation().lower()  # cpython or pypy
-
-
-def pytest_collection_modifyitems(items):
-    """
-    This will find the markers listed in pytest.ini and add
-    skip or xfail as needed. The second part can be a platform
-    marker (linux, osx, or win32), or python, cpython, or pypy.
-
-    You can add also add Python version numbers - either 2 or 3.
-
-    Keyword arguments are passed on.
-
-    # Will skip on Python 2
-    pytest.mark.skip_python(2)
-
-    # Will xfail on pypy as long as TypeError is raised
-    pytest.mark.xfail_pypy(reason="Not supported", raises=TypeError)
-    """
-    for item in items:
-        for mark in tuple(item.iter_markers()):
-            # Check for recognised name
-            parts = mark.name.split("_")
-            if len(parts) == 2 and parts[0] in {"xfail", "skip"}:
-                marker = getattr(pytest.mark, parts[0])
-
-                if parts[1] in {PLAT, IMPL, "python"}:
-                    # args lets you remove only Py 2 or 3
-                    if mark.args:
-                        (ver,) = mark.args  # Only single argument supported
-                        assert isinstance(ver, int), "should be a version number"
-                        if ver == sys.version_info.major:
-                            item.add_marker(marker(**mark.kwargs))
-                    else:
-                        assert parts[1] != "python", "version required (otherwise use mark.skip)"
-                        item.add_marker(marker(**mark.kwargs))

tests/info.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+import platform
+import sys
+
+LINUX = sys.platform.startswith("linux")
+MACOS = sys.platform.startswith("darwin")
+WIN = sys.platform.startswith("win32") or sys.platform.startswith("cygwin")
+
+CPYTHON = platform.python_implementation() == "CPython"
+PYPY = platform.python_implementation() == "PyPy"
+
+PY2 = sys.version_info.major == 2

tests/pytest.ini

@@ -1,18 +1,15 @@
 [pytest]
-minversion = 3.0
+minversion = 3.6
 norecursedirs = test_cmake_build test_embed
 addopts =
     # show summary of skipped tests
     -rs
-    # Report xfails (uncomment to use
+    # Report xfails (uncomment to use)
     # -rx
     # capture only Python print and C++ py::print, but not C output (low-level Python errors)
     --capture=sys
     # warnings for deprecated features
     -Wd
-    # Error if markers are not listed below as well
-    # Requires pytest 4.5, so not added here
-    # --strict-markers
 xfail_strict = true
 filterwarnings =
     # make warnings into errors but ignore certain third-party extension issues
@@ -22,16 +19,3 @@ filterwarnings =
     # bogus numpy ABI warning (see numpy/#432)
     ignore:.*numpy.dtype size changed.*:RuntimeWarning
     ignore:.*numpy.ufunc size changed.*:RuntimeWarning
-markers =
-    xfail_linux: expected failure on Linux
-    xfail_darwin: expected failure on MacOS
-    xfail_win32: expected failure on Windows
-    xfail_python: expected failure on Python (2 or 3 required)
-    xfail_cpython: expected failure on CPython
-    xfail_pypy: not valid on PyPy (2+3)
-    skip_linux: not valid on Linux
-    skip_darwin: not valid on MacOS
-    skip_win32: not valid on Windows
-    skip_python: not valid on Python (2 or 3 required)
-    skip_cpython: not valid on CPython
-    skip_pypy: not valid on PyPy (2+3)