gentoo auto-resync : 20:02:2024 - 11:40:01

3 files changed, 9 insertions, 68 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 2e4dcf17c596..eb69bab0160f 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-3.1.tar.gz 2021691 BLAKE2B 002bb00034e06a45298716c86fec4462efe8db8d206e8263d2e4ce0becc9c073aa2856e0c2df2e74d53237be0b02752204c7e387651aa45387781c383dd1f190 SHA512 9d75ecd25020f83c650824e9449e1c53004c13089dccf7424b65787144dfe3d2f638fd5aca1c4a792b165598b44644fda45bf54c49b3af278ddec5e1f669c38e
 DIST networkx-3.2.1.tar.gz 2073928 BLAKE2B fc4a4c0357f25cb3e4bfdfb38ffa528eddba22abc852bc80e0a70047aea2e401b0003c01108435ced1eacdba33d181395e73fcfa20773faa566c8b5cb45f6cdb SHA512 579c54a4a016617f5260df01b821c3906c4f289e80ae7bd618c0ebb9e05ebe806e71f1f660e3012531d04572ac4e6670aa73117ed26da8248fbb8ef7228b5803
-EBUILD networkx-3.1.ebuild 1837 BLAKE2B bc11182bfcf68204cc61e85fbed778d2715f1c5a7b9cf3ed22872e31f63b7a33eef501f696e93870d7ee8220608a5bdcf174dbcdd10fff3ca98b848eb00b2300 SHA512 c50fcd4415574e017ac72cb2a023c3ad004a5583430028f5d01f1f9e89d945070c993977c05b69a0c5b13286d3c50b1e593880a3d0178f358e50b42b512ed9d2
-EBUILD networkx-3.2.1.ebuild 1776 BLAKE2B 7f7bffbdf178708c2851793184e5843a01cbba1bd2242d32d598432629f6452a0c280473656a737bbe97c4dd98d985743b256ecd4ca0e6d15643904381fb3241 SHA512 f7b73d81deb9a7f6b4cc491ce72460b59e31cc95d040785c61a2f1b053a97c62b0413549f6f7ccd1a81d2832195750ef46c5255622a5c2abd33d8ff6082ac666
+EBUILD networkx-3.2.1.ebuild 1981 BLAKE2B 1b89883e110e0e775fae6669918656b7e4c373d694f0736c81c262c7165be3457a2a103d03b655435296725c1b559409ef379ddd20c0b6e30828dca11a4d83cb SHA512 0e7fc8755f82b433ad3d60a5f6edaa3b12ee3e100f8a42fa7cb389f9ef29095b7f32a68352f06439691ae5fc3e19f01da0525aadd8014d5f9ed834cee7c45dac
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-3.1.ebuild b/dev-python/networkx/networkx-3.1.ebuild
deleted file mode 100644
index b046b76b7db8..000000000000
--- a/dev-python/networkx/networkx-3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_FULLY_TESTED=( python3_{10..11} )
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
-
-inherit distutils-r1 multiprocessing 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.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			networkx/drawing/tests/test_pylab.py::test_draw
-		)
-	fi
-	# virtx implies nonfatal
-	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || 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"
-}
diff --git a/dev-python/networkx/networkx-3.2.1.ebuild b/dev-python/networkx/networkx-3.2.1.ebuild
index e880d2800171..de907987ef8d 100644
--- a/dev-python/networkx/networkx-3.2.1.ebuild
+++ b/dev-python/networkx/networkx-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
@@ -40,6 +40,13 @@ src_test() {
 }
 
 python_test() {
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/networkx/networkx/issues/5913 (bug #921958)
+			networkx/algorithms/approximation/tests/test_traveling_salesman.py::test_asadpour_tsp
+		)
+	fi
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# virtx implies nonfatal
 	nonfatal epytest -p xdist -n "$(makeopts_jobs)" --dist=worksteal || die