mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-23 18:38:08 -07:00
48b5e659f3
- One test source file needs a patch due to removed library in py3.12, the patch was sent to github mirror[1] and later resend to upstream[2]. - Tests fail with dev-python/sphinx-7, because build_sphinx hook in setup.py was removed [3], sphinx is now limmited to <dev-python/sphinx-7. [1] https://github.com/openstack/pbr/pull/22 [2] https://review.opendev.org/c/openstack/pbr/+/884789 [3] https://bugs.launchpad.net/pbr/+bug/2018453 Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Signed-off-by: Michał Górny <mgorny@gentoo.org>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
Subject: [PATCH] Replace imp with importlib.machinery
|
|
|
|
The imp was removed in Python 3.12 [1]. This commit replaces
|
|
get_suffixes() method call with _SUFFIXES array from imprtlib.machinery.
|
|
|
|
[1] https://github.com/python/cpython/issues/98040
|
|
|
|
---
|
|
|
|
This is original patch submitted to Github mirror, it was later resubmitted to
|
|
upstream Gerrit, where they are taking care of Python2.7. We can stick with
|
|
this version of patch for now because we don't care about py2.7 anymore.
|
|
|
|
Original-PR: https://github.com/openstack/pbr/pull/22
|
|
Upstream-PR: https://review.opendev.org/c/openstack/pbr/+/884789
|
|
|
|
diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
|
|
index c719d1e..068bab7 100644
|
|
--- a/pbr/tests/test_packaging.py
|
|
+++ b/pbr/tests/test_packaging.py
|
|
@@ -40,7 +40,7 @@
|
|
|
|
import email
|
|
import email.errors
|
|
-import imp
|
|
+import importlib
|
|
import os
|
|
import re
|
|
import sysconfig
|
|
@@ -1217,7 +1217,7 @@ def get_soabi():
|
|
# NOTE(sigmavirus24): PyPy only added support for the SOABI config var
|
|
# to sysconfig in 2015. That was well after 2.2.1 was published in the
|
|
# Ubuntu 14.04 archive.
|
|
- for suffix, _, _ in imp.get_suffixes():
|
|
+ for suffix, _, _ in importlib.machinery._SUFFIXES:
|
|
if suffix.startswith('.pypy') and suffix.endswith('.so'):
|
|
soabi = suffix.split('.')[1]
|
|
break
|
|
--
|
|
2.39.2
|
|
|