summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2025-06-03 10:02:09 +0200
committerMichał Górny <mgorny@gentoo.org>2025-06-03 10:09:41 +0200
commitb0f5bb4eb056808b16b806a5e47f659da3d75402 (patch)
tree08c948d421275c596509faa566966bb0fb426c7b /dev-python
parent57ff0fabd775e8181bff31fecb12277591f57a46 (diff)
downloadgentoo-b0f5bb4eb056808b16b806a5e47f659da3d75402.tar.gz
gentoo-b0f5bb4eb056808b16b806a5e47f659da3d75402.tar.bz2
gentoo-b0f5bb4eb056808b16b806a5e47f659da3d75402.zip
dev-python/networkx: Enable py3.14
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/networkx/files/networkx-3.5-py314.patch53
-rw-r--r--dev-python/networkx/networkx-3.5-r1.ebuild64
2 files changed, 117 insertions, 0 deletions
diff --git a/dev-python/networkx/files/networkx-3.5-py314.patch b/dev-python/networkx/files/networkx-3.5-py314.patch
new file mode 100644
index 000000000000..4b109fd9acd7
--- /dev/null
+++ b/dev-python/networkx/files/networkx-3.5-py314.patch
@@ -0,0 +1,53 @@
+From 5487e923e39f526fe12a74d7399e5153f06698a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Jun 2025 09:54:33 +0200
+Subject: [PATCH] Use type checks in `generators/lattice.py` for Py3.14 compat
+
+Replace the `TypeError` catching in `networkx/generators/lattice.py`
+with explicit type checks to make the code more reliable and fix it for
+Python 3.14. Catching the exception immediately does not work
+in the second instance, because the code is constructing a generator,
+and apparently Python 3.14 does not evaluate the `p in periodic`
+expression until the generator is actually iterated over. Given that
+the function expects either an iterable or a `bool`, explicitly checking
+for `bool` should both be more readable and more reliable.
+
+The alternative would be to replace the generator with a list
+comprehension that would be evaluated immediately. However,
+the explicit type check seems to be a cleaner solution to the problem.
+---
+ networkx/generators/lattice.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/networkx/generators/lattice.py b/networkx/generators/lattice.py
+index 95e520d2c..3b0900ea1 100644
+--- a/networkx/generators/lattice.py
++++ b/networkx/generators/lattice.py
+@@ -67,10 +67,10 @@ def grid_2d_graph(m, n, periodic=False, create_using=None):
+ G.add_edges_from(((i, j), (pi, j)) for pi, i in pairwise(rows) for j in cols)
+ G.add_edges_from(((i, j), (i, pj)) for i in rows for pj, j in pairwise(cols))
+
+- try:
+- periodic_r, periodic_c = periodic
+- except TypeError:
++ if isinstance(periodic, bool):
+ periodic_r = periodic_c = periodic
++ else:
++ periodic_r, periodic_c = periodic
+
+ if periodic_r and len(rows) > 2:
+ first = rows[0]
+@@ -129,10 +129,10 @@ def grid_graph(dim, periodic=False):
+ if not dim:
+ return empty_graph(0)
+
+- try:
+- func = (cycle_graph if p else path_graph for p in periodic)
+- except TypeError:
++ if isinstance(periodic, bool):
+ func = repeat(cycle_graph if periodic else path_graph)
++ else:
++ func = (cycle_graph if p else path_graph for p in periodic)
+
+ G = next(func)(dim[0])
+ for current_dim in dim[1:]:
diff --git a/dev-python/networkx/networkx-3.5-r1.ebuild b/dev-python/networkx/networkx-3.5-r1.ebuild
new file mode 100644
index 000000000000..c2d71982ed8b
--- /dev/null
+++ b/dev-python/networkx/networkx-3.5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{11..13} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_14 )
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+ https://networkx.org/
+ https://github.com/networkx/networkx/
+ https://pypi.org/project/networkx/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+ test? (
+ >=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/matplotlib-3.8[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.25[${PYTHON_USEDEP}]
+ >=dev-python/scipy-1.11.2[${PYTHON_USEDEP}]
+ ' "${PYTHON_FULLY_TESTED[@]}")
+ )
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+ # minimal fix for https://github.com/networkx/networkx/issues/8091
+ "${FILESDIR}/${P}-py314.patch"
+)
+
+src_test() {
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ # virtx implies nonfatal
+ nonfatal epytest || die
+}
+
+src_install() {
+ distutils-r1_src_install
+ # those examples use various assets and pre-compressed files
+ docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+ optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+ optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+ optfeature "YAML format reading and writing" "dev-python/pyyaml"
+ optfeature "shapefile format reading and writing" "sci-libs/gdal[python]"
+ optfeature "GraphML XML format" "dev-python/lxml"
+}