strip url: fix whl suffix, remove exe (#43344)

2024-03-25 13:46:09 +01:00
parent 0c9a53ba3a
commit 9b046a39a8
2 changed files with 7 additions and 8 deletions
--- a/lib/spack/llnl/url.py
+++ b/lib/spack/llnl/url.py
@@ -357,10 +357,8 @@ def strip_version_suffixes(path_or_url: str) -> str:
        r"i[36]86",
        r"ppc64(le)?",
        r"armv?(7l|6l|64)?",
-        # PyPI
-        r"[._-]py[23].*\.whl",
-        r"[._-]cp[23].*\.whl",
-        r"[._-]win.*\.exe",
+        # PyPI wheels
+        r"-(?:py|cp)[23].*",
    ]

    for regex in suffix_regexes: