don't skip tests for invalid combinations; ensure they too have at most 1 pin

Author: h-vetinari

setup.cfg

@@ -19,22 +19,22 @@ install_requires =
     #       tests for this package.
 
     # AIX requires fixes contained in numpy 1.16
-    numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'
+    numpy==1.16.0; python_version=='3.7' and platform_system=='AIX' and platform_machine!='loongarch64' and platform_python_implementation != 'PyPy'
 
     # IBM i requires fixes contained in numpy 1.23.3. Only Python 3.6 and 3.9
     # are supported on IBM i system, so we're ignoring other Python versions here
     # for simplicity (see gh-66).
-    numpy==1.23.3; python_version=='3.9' and platform_system=='OS400'
+    numpy==1.23.3; python_version=='3.9' and platform_system=='OS400' and platform_machine!='loongarch64'
 
     # numpy 1.19 was the first minor release to provide aarch64 wheels, but
     # wheels require fixes contained in numpy 1.19.2
-    numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64' and platform_python_implementation != 'PyPy'
+    numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64' and platform_system!='AIX' and platform_python_implementation != 'PyPy'
     numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64' and platform_python_implementation != 'PyPy'
 
     # arm64 on Darwin supports Python 3.8 and above requires numpy>=1.21.0
     # (first version with arm64 wheels available)
-    numpy==1.21.0; python_version=='3.7' and platform_machine=='arm64' and platform_system=='Darwin'
-    numpy==1.21.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin'
+    numpy==1.21.0; python_version=='3.7' and platform_machine=='arm64' and platform_system=='Darwin' and platform_python_implementation!='PyPy'
+    numpy==1.21.0; python_version=='3.8' and platform_machine=='arm64' and platform_system=='Darwin' and platform_python_implementation!='PyPy'
     numpy==1.21.0; python_version=='3.9' and platform_machine=='arm64' and platform_system=='Darwin'
 
     # Python 3.8 on s390x requires at least 1.17.5, see gh-29

tests/test_dependencies.py

@@ -26,7 +26,7 @@ def test_has_at_most_one_pinned_dependency(
 ):
     # These are known to be platforms that are not valid / possible at this time.
     # due the the sheer variety, the default assumption is that a given combination
-    # is invalid (and thus skipped), allowing us to specify valid cases more easily
+    # is invalid, allowing us to specify valid cases more easily below
     valid = False
     match (platform_system, platform_machine):
         case ["Linux", "arm64"]:
@@ -39,8 +39,6 @@ def test_has_at_most_one_pinned_dependency(
             valid = True
         case [("AIX" | "OS400"), ("x86" | "x86_64" | "s390x")]:
             valid = True
-    if not valid:
-        pytest.skip(f"{platform_system} and {platform_machine} are mutually exclusive.")
 
     # currently linux-{64, aarch64, ppc64le}, osx-64, win-64; no support for arm64 yet
     pypy_pairs = [
@@ -52,10 +50,11 @@ def test_has_at_most_one_pinned_dependency(
     ]
     if (platform_python_implementation == "PyPy"
             and (platform_system, platform_machine) not in pypy_pairs):
-        pytest.skip(f"PyPy is not supported on {platform_system}/{platform_machine}.")
+        valid = False
 
     if platform_system == "OS400" and python_version != "3.9":
-        pytest.skip(f"IBMi only supported on Python {python_version}.")
+        # IBMi only supported on CPython 3.9, see gh-66
+        valid = False
 
     environment = {
         "python_version": python_version,
@@ -104,10 +103,17 @@ def test_has_at_most_one_pinned_dependency(
         case ["Windows", "arm64"]:
             expect_pin = True
 
-    # we only expect a pin for released python versions
-    expect_pin = False if (python_version == "3.12") else expect_pin
-    # also check that cases with expect_pin==False should _not_ have a pin
-    log_msg = "Expected " + ("exactly one pin" if expect_pin else "no pins")
-    assert (
-        len(filtered_requirements) == int(expect_pin)
-    ), f"{log_msg}.\n{pprint.pformat(environment)}"
+    # for valid combinations, we test more strictly: expect exactly zero or one pins
+    if valid:
+        # we only expect a pin for released python versions
+        expect_pin = False if (python_version == "3.12") else expect_pin
+        log_msg = "Expected " + ("exactly one pin" if expect_pin else "no pins")
+        assert (
+            len(filtered_requirements) == int(expect_pin)
+        ), f"{log_msg}.\n{pprint.pformat(environment)}"
+    else:
+        # on invalid platform / interpreter combinations, test
+        # that at least we do not produce more than one pin
+        assert (
+            len(filtered_requirements) <= 1
+        ),  f"Expected no more than one pin.\n{pprint.pformat(environment)}"