Apply suggestions from code review

Allow multiple requirements per entry

Co-authored-by: Philipp A. <[email protected]>

Author: ev-br

scipy_doctest/impl.py

@@ -94,7 +94,7 @@ class DTConfig:
         a string. If not empty, the string value is used as the skip reason.
     pytest_extra_requires : dict
         Paths or functions to conditionally ignore unless requirements are met.
-        The format is ``{path/or/glob/pattern: requirement, full.func.name: requiremet}``,
+        The format is ``{path/or/glob/pattern: requirement(s), full.func.name: requirement(s)}``,
         where the values are PEP 508 dependency specifiers. If a requirement is not met,
         the behavior is equivalent to using the ``--ignore=...`` command line switch for
         paths, and to using a `pytest_extra_skip` for function names.

scipy_doctest/plugin.py

@@ -88,9 +88,9 @@ def pytest_ignore_collect(collection_path, config):
         if fnmatch_ex(entry, collection_path):
             return True
 
-    for entry, req_str in config.dt_config.pytest_extra_requires.items():
+    for entry, reqs in config.dt_config.pytest_extra_requires.items():
         if fnmatch_ex(entry, collection_path):
-            return not is_req_satisfied(req_str)
+            return not is_req_satisfied(reqs)
 
 
 def is_private(item):

scipy_doctest/util.py

@@ -257,12 +257,16 @@ def get_public_objects(module, skiplist=None):
     return (items, names), failures
 
 
-def is_req_satisfied(req_str):
-    """ Check if a PEP 508-compliant requirement is satisfied or not.
+def is_req_satisfied(req_strs: str | Sequence[str]) -> bool:
+    """ Check if all PEP 508-compliant requirement(s) are satisfied or not.
     """
-    req = Requirement(req_str)
+    req_strs = [req_strs] if isinstance(req_strs, str) else req_strs
+    reqs = [Requirement(req_str) for req_str in req_strs]
+    if any(req.marker is not None for req in reqs):
+        msg = r"Markers not supported in `pytest_extra_requires`"
+        raise NotImplementedError(msg)
     try:
-        return get_version(req.name) in req.specifier
+        return all(get_version(req.name) in req.specifier for req in reqs)
     except PackageNotFoundError:
         return False