gentoo auto-resync : 06:11:2023 - 16:19:27

4 files changed, 41 insertions, 2 deletions

diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index e756ecdc9c97..2c8088c03aad 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,5 @@
+AUX joblib-1.3.2-py3.12-avoid-ast.num-and-node.n.patch 561 BLAKE2B 7fbe05fbe4a0b6fb6b1b8f94256f3224e6c0ea8efbc9a331e6c791f35fd2ee2e211a8970120b5ab551c37af843acb7e39436255263bbaa833a41d5fdb8fa3906 SHA512 fbd84f2ff01e70f0012c3302bf9c4104411eb6eb74c0bde09051e8b903993996da8379e431a21c3f3c67a386d0ae936b5a92e0667450e9542ae59ecf356fa429
+AUX joblib-1.3.2-py3.12-no-depr-warn.patch 774 BLAKE2B f44a1dfbd8d9239230f5ae21635d303ed801e2ed92cffb1bc3d28e44d1fdc0d4c0923e7584bf79f28bd9c4a189cb29012596df2f6c3cc7e6bdd6511c80935db2 SHA512 9184c4728ddc60ffb406bcb13355f1b9b1449d152cc3064fa8a3852e3bd8cf80764f2a4d3a56bc37f34bba94bb6051b3a298631a7e4e02fe583df204cdb9cc57
 DIST joblib-1.3.2.tar.gz 1987720 BLAKE2B f16235ead3ef0172a1e0dc2abad44967b029196f6c8c7a7e0c64283cac80e2b942ebfc2df5fa975bc152f574db023a9705f48b38855a11878e5c21e04cf7d831 SHA512 9b5acba1321351cf2ae548161ced18774b8b316aaf883cc8e77bf58898d1913361a3845d64f1f1f87e4e2394eafd92e0a6a8d67947db0c9a95a40e5f579baae6
-EBUILD joblib-1.3.2.ebuild 1269 BLAKE2B 714988a6a18b821e9dfd976c22c306399e0742c0070ad30a9fb68befb67354e8dd8e5849c70a9ce7d8558c45c0e2b70f4f929bc5430525d41d71c2dc1b5426e1 SHA512 c8e912e28b323bf6ed430a0ed39aa113ab22c8441eb50cb521f54b3fa55b6a2fef916060640cb64513229109a50ce238003f955e1b428cb1de65ce7399156c06
+EBUILD joblib-1.3.2.ebuild 1502 BLAKE2B 85ab4d563835ebcab31ac53b68a06efee0af085eb77db20f279e481e168747aa031cfc402624fefb56afc51a947ec3abc68809b22480162996028323c3ecf1f0 SHA512 ac40e6f07a44685562e6d1a41f3cf7b2453e956be3684fa5ea004ed86b49ff2615e998be69a04234706485f2a716dd36bfa79b2d18215b558a7c903979a8e684
 MISC metadata.xml 858 BLAKE2B e141cefc3f64a2d853994352590d9edb2dfcf8406e64de688b5ee077e7577ec255f214134ff04cccdd90bb08410495ca0c39081b9f530763735c12214e66c871 SHA512 4938b0a8200be169056c19816c9f6753fb19e2d89a5799de9ee9e04e48d815aec84049c480a0844e391aef1647af8b3ea70186d5a6b10be1b3dbffc13711d3ba
diff --git a/dev-python/joblib/files/joblib-1.3.2-py3.12-avoid-ast.num-and-node.n.patch b/dev-python/joblib/files/joblib-1.3.2-py3.12-avoid-ast.num-and-node.n.patch
new file mode 100644
index 000000000000..a9865e00380e
--- /dev/null
+++ b/dev-python/joblib/files/joblib-1.3.2-py3.12-avoid-ast.num-and-node.n.patch
@@ -0,0 +1,15 @@
+diff --git a/joblib/_utils.py b/joblib/_utils.py
+index 7693310e0..6cd99ad31 100644
+--- a/joblib/_utils.py
++++ b/joblib/_utils.py
+@@ -35,8 +35,8 @@ def eval_expr(expr):
+ 
+ 
+ def eval_(node):
+-    if isinstance(node, ast.Num):  # <number>
+-        return node.n
++    if isinstance(node, ast.Constant):  # <constant>
++        return node.value
+     elif isinstance(node, ast.BinOp):  # <left> <operator> <right>
+         return operators[type(node.op)](eval_(node.left), eval_(node.right))
+     elif isinstance(node, ast.UnaryOp):  # <operator> <operand> e.g., -1
diff --git a/dev-python/joblib/files/joblib-1.3.2-py3.12-no-depr-warn.patch b/dev-python/joblib/files/joblib-1.3.2-py3.12-no-depr-warn.patch
new file mode 100644
index 000000000000..4d5a28815e4a
--- /dev/null
+++ b/dev-python/joblib/files/joblib-1.3.2-py3.12-no-depr-warn.patch
@@ -0,0 +1,15 @@
+diff --git a/joblib/test/test_parallel.py b/joblib/test/test_parallel.py
+index 906d436..c4a727c 100644
+--- a/joblib/test/test_parallel.py
++++ b/joblib/test/test_parallel.py
+@@ -189,6 +189,10 @@ def test_main_thread_renamed_no_warning(backend, monkeypatch):
+     # warninfo catches Warnings from worker timeouts. We remove it if it exists
+     warninfo = [w for w in warninfo if "worker timeout" not in str(w.message)]
+
++    # We don't want to count DeprecationWarnings
++    warninfo = [w for w in warninfo
++                if not isinstance(w.message, DeprecationWarning)]
++
+     # The multiprocessing backend will raise a warning when detecting that is
+     # started from the non-main thread. Let's check that there is no false
+     # positive because of the name change.
diff --git a/dev-python/joblib/joblib-1.3.2.ebuild b/dev-python/joblib/joblib-1.3.2.ebuild
index 672bc72702d8..d44046dcaed6 100644
--- a/dev-python/joblib/joblib-1.3.2.ebuild
+++ b/dev-python/joblib/joblib-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 pypi
@@ -31,6 +31,13 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# Borrowed from Fedora: https://github.com/joblib/joblib/issues/1478
+	"${FILESDIR}/${P}-py3.12-no-depr-warn.patch"
+	# https://github.com/joblib/joblib/pull/1518
+	"${FILESDIR}/${P}-py3.12-avoid-ast.num-and-node.n.patch"
+)
+
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(