gentoo resync : 29.12.2022

4 files changed, 108 insertions, 14 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 1463bcaa2709..eb35f0eaeb4f 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,7 @@
-DIST networkx-2.7.1.tar.gz 1923431 BLAKE2B 0b30a9cebc10708efdd446a688ee9a60523a06adf450af1b5a4726fe66b5041ef8c30625012c790042068aa9d5ac555ab814c3cce510365528d21afbe5007a89 SHA512 16b988d0b7faabc4126355a7530431d3a3870517812314097b73d1e3d0a02dc7cbf82d0e99db4a038dc3a23d72cf1a1712a17c925dfed360be2bf27cf01e9c42
-DIST networkx-2.8.tar.gz 1937426 BLAKE2B 5a094177ed480c6f7cbdacb6795fc4f2e0aec53ed89a33e19d78f47830d46238f35b7cd76098f6e00397f7cbdf305256910b7930cbb2c775ed4c2b18d9bd596f SHA512 72cd6637faa4228f6c802cf36935b5460fdf9b6cf191c3b375810bfc3732823e3286bdc1e6cbf7e6a7ffde83d0cf3bca157ae27ff98c537d43fdb4b8ef45ef4b
-EBUILD networkx-2.7.1.ebuild 1376 BLAKE2B 13d08bc22d59a9fea07dc7bb14480057aade434b8d524a7dda61abf43c1d3bb593c67f1e392dd0a50dc296a33d040a314d6d48455a114a6fdebd08ba1ffcac81 SHA512 9f60e67f901a1bc3bb3382a96bad746e7b16f813acb030caadea2c3016bbc0fce3c6f5a5296ff24e0cb3663bc0fb85ea2072d401fde6ed52f1ca833239ce7000
-EBUILD networkx-2.8.ebuild 1380 BLAKE2B f0134be4e9dffed56e4c63026e15d3fc25e297f606cedb66dd2dcf5698132f29c6e3bcb340c83ffd5b3eb5b40968364f71dd8e7ac6f46bbdf1b0f28dfa215f25 SHA512 3cc38a45ebdb526fb0b7676b3fc54953bb9d544ea6b67f3c425955c8004a6b0669b790eca5bff49a8f3bee92a46047adc6149422a8bbf40013bcffe81410ddaa
+DIST networkx-2.8.2.tar.gz 1945873 BLAKE2B 212f42d8da35bb7c29b6feae626bb21036807e26996ff663dbb22b54908448715cbf6509553e2379a208b4537f03c92a3183a74a8074f4d2edae9b97084e5a8b SHA512 5b1ca05a009f78d693f8dfedaa51650d7834e4870d1a08fd8ea27f1293cbaccd9b4a2fb5d146df491e8dfcda1ca538786b257fb9b1250a383c59ea2b54188f55
+DIST networkx-2.8.3.tar.gz 1947042 BLAKE2B a9d098023df1db6c94d531eba8797348d81b7cd52e22bbd421109be2e604b599de3a9a30c847682b53ce395ecc0522351db5f2f21b194be5ebd05c42d751a43c SHA512 1bcf606868f7041c1f412c0d853779c99f74be675b11b32727d502b78f8a672872291addfc7c8cba6bc7f464c2306a412862063e141853ab91999d2c54315214
+DIST networkx-2.8.4.tar.gz 1951336 BLAKE2B f45708eb8a642ee2561caf6b82b8947cc0ed8a90e22ff3424c54db728f6ab91bbaf78c62da113d02325c8f56418690386143c74f2098c670fe102c4e5ec78b9d SHA512 3f874e08a55d924905506fabdba1540745f7a1a99745531b49442206b6cac9b911674441d2241bc2c3e8c173635d53f2e5677fe76936630236ffb3fa021b2f9a
+EBUILD networkx-2.8.2.ebuild 1685 BLAKE2B beef082bd74db5cf409eeea757247472551fac116b9b9351eae5232ed67ddccb49f3400ef8c46f0e70c4e8f9ed26b41135e500a3f44baabee9a808bf9a0adb14 SHA512 d9ea657a4d066af0205edd666badb6c0b4c9f98d59eeee0dc34ff12b5ba80309dd1d2d3dcad5e12b09a10cbdf3d90ffb9a35713f7df32b986a46f6e9dd91254f
+EBUILD networkx-2.8.3.ebuild 2008 BLAKE2B fd4d69762205882f3fb2bcaf6eb6228ea35debbf9ffcba0c1ed4ddff0f1d63c88ff70cbbf3b0b6d6b8164d539ce474f81a00b80526a338b6a56582c55cd24cb9 SHA512 0dd3d93457396af4d11721ab33a883a972909b865b87de821baf6b5e0bdadc926ff1ab5de5d58071f0e98e59e6ee77134038cdf0f12e5caa30a524a234449669
+EBUILD networkx-2.8.4.ebuild 1707 BLAKE2B e465232ad11921ebe043d19d27ab8fbaf452279873a6ea90c6743ea6ef444f5c74883f3ef90e401ee213dfa84e4739a7d08dadebede757be5e9660da3b35686f SHA512 845ef10696e1c16a758273ea97595fb11c50c0e6939b9b4520ca18760e343bb3711a22c3e057973196aa2fa540d2f27003122358b535479ccd53304a41a04666
 MISC metadata.xml 1088 BLAKE2B 407d24ca890c5b2a7c49e5eab7f79477f66cb140ed286a7d0c65be075714c671c0185b067f7ced6e9a1cdc17361cfbeb406c306dafb915590abf6b5b1263a4a4 SHA512 2a790d427d6c4391d409f767359a256ee5b8082246811c82949b898e0a2a9f23e7c40bb045ff5eaf17f3cee04d7d24adcdf1ff0ae416ebd7b2572cfdcf04064f
diff --git a/dev-python/networkx/networkx-2.7.1.ebuild b/dev-python/networkx/networkx-2.8.2.ebuild
index 86f3961f798a..d33023f9d699 100644
--- a/dev-python/networkx/networkx-2.7.1.ebuild
+++ b/dev-python/networkx/networkx-2.8.2.ebuild
@@ -4,11 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 )
 inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -18,16 +24,23 @@ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~
 BDEPEND="
 	test? (
 		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
 	)
 "
 
 distutils_enable_tests pytest
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
-	virtx epytest -p no:django
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
 }
 
 src_install() {
diff --git a/dev-python/networkx/networkx-2.8.3.ebuild b/dev-python/networkx/networkx-2.8.3.ebuild
new file mode 100644
index 000000000000..d35715a5eaa1
--- /dev/null
+++ b/dev-python/networkx/networkx-2.8.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${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/algorithms/tree/tests/test_mst.py::test_random_spanning_tree_additive_small
+			networkx/algorithms/tree/tests/test_mst.py::test_random_spanning_tree_multiplicative_small
+		)
+	fi
+
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || 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" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/networkx/networkx-2.8.ebuild b/dev-python/networkx/networkx-2.8.4.ebuild
index 7cc373d794bb..504ab461ddb9 100644
--- a/dev-python/networkx/networkx-2.8.ebuild
+++ b/dev-python/networkx/networkx-2.8.4.ebuild
@@ -4,11 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_FULLY_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
 inherit distutils-r1 optfeature virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -18,16 +24,23 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-mac
 BDEPEND="
 	test? (
 		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${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() {
-	virtx epytest -p no:django
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
 }
 
 src_install() {