Merge branch 'main' into ruff

pypa · Mar 10, 2024 · c59cab0 · c59cab0
2 parents 2d9e1b0 + e8002b1
commit c59cab0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,11 @@ Changelog
 *unreleased*
 ~~~~~~~~~~~~
 
+No unreleased changes.
+
+24.0 - 2024-03-10
+~~~~~~~~~~~~~~~~~
+
 * Do specifier matching correctly when the specifier contains an epoch number
   and has more components than the version (:issue:`683`)
 * Support the experimental ``--disable-gil`` builds in packaging.tags

diff --git a/src/packaging/__init__.py b/src/packaging/__init__.py
@@ -6,7 +6,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "23.3.dev0"
+__version__ = "24.1.dev0"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "[email protected]"

diff --git a/src/packaging/_manylinux.py b/src/packaging/_manylinux.py
@@ -55,7 +55,15 @@ def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
         return _is_linux_armhf(executable)
     if "i686" in archs:
         return _is_linux_i686(executable)
-    allowed_archs = {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x", "loongarch64"}
+    allowed_archs = {
+        "x86_64",
+        "aarch64",
+        "ppc64",
+        "ppc64le",
+        "s390x",
+        "loongarch64",
+        "riscv64",
+    }
     return any(arch in allowed_archs for arch in archs)
 
 
@@ -174,7 +182,7 @@ def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
         return False
     # Check for presence of _manylinux module.
     try:
-        import _manylinux  # noqa
+        import _manylinux
     except ImportError:
         return True
     if hasattr(_manylinux, "manylinux_compatible"):