* [gentoo-commits] repo/gentoo:master commit in: dev-python/networkx/, dev-python/networkx/files/
@ 2019-12-29 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-12-29 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 76adb3e852a2003a6e82fe3ce3c7f094d6db1338
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 16:30:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 13:22:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76adb3e8
dev-python/networkx: Drop 1.11, 1.11-r1 and 2.1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-python/networkx/Manifest | 2 -
.../networkx/files/1.11-sphinx-pngmath.patch | 14 ----
dev-python/networkx/networkx-1.11-r1.ebuild | 76 ----------------------
dev-python/networkx/networkx-1.11.ebuild | 76 ----------------------
dev-python/networkx/networkx-2.1.ebuild | 59 -----------------
5 files changed, 227 deletions(-)
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 743c1505b22..dbf557d614e 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,4 +1,2 @@
-DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
-DIST networkx-2.1.zip 1612593 BLAKE2B 0a603617105bb1efa3711f81a468520eef5f56438bf6e730091a43b628d04fdd22e8b62de671dbe98be180bff68b3ea4af61e475fcc1f274537ccd1e74fcdff5 SHA512 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
DIST networkx-2.2.zip 1700336 BLAKE2B 8cd4bda4100d5da10864f3b08d5a7faa11399176cfe39691aef46234a3de71bb175a3ac0b179cce9971c1954d0fc13469e41d610191c7827f1212d0e9ef1e3aa SHA512 098e58c5f93c72c789e736102815e2f6388eb34147a674941519ef6f6d6452cc09b76d8523893418cb69df133e7623ea2c62fa51144f598f592ebce0e3e3ccbb
DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
diff --git a/dev-python/networkx/files/1.11-sphinx-pngmath.patch b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
deleted file mode 100644
index d43e4275a40..00000000000
--- a/dev-python/networkx/files/1.11-sphinx-pngmath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Drop pngmath extenstion from sphinx config
-
-Bug: https://bugs.gentoo.org/594626
-
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -74,7 +74,6 @@ def cd(newpath):
- 'sphinx.ext.intersphinx',
- 'sphinx.ext.mathjax',
- 'sphinx.ext.napoleon',
-- 'sphinx.ext.pngmath',
- 'sphinx.ext.todo',
- 'sphinx.ext.viewcode',
- #'sphinxcontrib.bibtex',
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
deleted file mode 100644
index 1280450d7c0..00000000000
--- a/dev-python/networkx/networkx-1.11-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples scipy test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
- dev-python/matplotlib[${PYTHON_USEDEP}]
- scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
- )
- test? (
- ${COMMON_DEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
- )"
-RDEPEND="
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- examples? (
- ${COMMON_DEPEND}
- dev-python/pygraphviz[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
- # Avoid d'loading of file objects.inv from 2 sites of python docs
- sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- python_setup -2
- emake -C doc html
- fi
-}
-
-python_test() {
- virtx nosetests -vv
-}
-
-python_install_all() {
- # Oh my.
- rm -r "${ED}"usr/share/doc/${P} || die
-
- use doc && local HTML_DOCS=( doc/build/html/. )
- use examples && dodoc -r examples
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
deleted file mode 100644
index 8300110fa20..00000000000
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
-
-COMMON_DEPEND="
- dev-python/matplotlib[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7)
- )
- test? (
- ${COMMON_DEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
- )"
-RDEPEND="
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- examples? (
- ${COMMON_DEPEND}
- dev-python/pygraphviz[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/1.11-sphinx-pngmath.patch
-)
-
-python_prepare_all() {
- # Avoid d'loading of file objects.inv from 2 sites of python docs
- sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- python_setup -2
- emake -C doc html
- fi
-}
-
-python_test() {
- virtx nosetests -vv
-}
-
-python_install_all() {
- # Oh my.
- rm -r "${ED}"usr/share/doc/${P} || die
-
- use doc && local HTML_DOCS=( doc/build/html/. )
- use examples && dodoc -r examples
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
deleted file mode 100644
index 551f5a8714c..00000000000
--- a/dev-python/networkx/networkx-2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
- >=dev-python/matplotlib-2.0.2[${PYTHON_USEDEP}]
- extras? (
- >=dev-python/pydot-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
- >=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
- )
- pandas? ( >=dev-python/pandas-0.20.1[${PYTHON_USEDEP}] )
- scipy? ( >=sci-libs/scipy-0.19[${PYTHON_USEDEP}] )
- xml? ( >=dev-python/lxml-3.7.3[${PYTHON_USEDEP}] )
- yaml? ( >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
- ${COMMON_DEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-RDEPEND="
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- ${COMMON_DEPEND}
- examples? (
- dev-python/pyparsing[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
-)
-
-python_test() {
- virtx nosetests -vv
-}
-
-python_install_all() {
- use examples && dodoc -r examples
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/networkx/, dev-python/networkx/files/
@ 2020-06-13 11:14 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-06-13 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 0feb2320f929f3c2a8bddae488c06a17f9bfddac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 11:13:16 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 11:14:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0feb2320
dev-python/networkx: Fix tests
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/networkx/files/networkx-2.4-py38.patch | 84 +++++++++++++++++++++++
dev-python/networkx/networkx-2.4-r1.ebuild | 54 +++++++--------
2 files changed, 107 insertions(+), 31 deletions(-)
diff --git a/dev-python/networkx/files/networkx-2.4-py38.patch b/dev-python/networkx/files/networkx-2.4-py38.patch
new file mode 100644
index 00000000000..9ce3003d104
--- /dev/null
+++ b/dev-python/networkx/files/networkx-2.4-py38.patch
@@ -0,0 +1,84 @@
+From 488e824439124f4dd52f8230c452a3df681b1bab Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Fri, 15 Nov 2019 13:48:33 +1100
+Subject: [PATCH] Fix test_numpy_type to pass under Python 3.8
+
+readwrite.tests.test_gexf.TestGEXF.test_numpy_type failed under Python
+3.8 due to ordering of XML attributes, handle it as per f75dbe8. Also
+change travis to no longer allow failures under 3.8.
+
+Fixes #3720
+---
+ .travis.yml | 2 --
+ networkx/readwrite/tests/test_gexf.py | 51 ++++++++++++++++++++++++++-
+ 2 files changed, 50 insertions(+), 3 deletions(-)
+
+diff --git a/networkx/readwrite/tests/test_gexf.py b/networkx/readwrite/tests/test_gexf.py
+index afc40111ce..f16504c047 100644
+--- a/networkx/readwrite/tests/test_gexf.py
++++ b/networkx/readwrite/tests/test_gexf.py
+@@ -404,7 +404,8 @@ def test_numpy_type(self):
+ nx.set_node_attributes(G, {n: n for n in numpy.arange(4)}, 'number')
+ G[0][1]['edge-number'] = numpy.float64(1.1)
+
+- expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
++ if sys.version_info < (3, 8):
++ expected = """<gexf version="1.2" xmlns="http://www.gexf.net/1.2draft"\
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
+ ="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd">
+ <meta lastmodifieddate="{}">
+@@ -449,6 +450,54 @@ def test_numpy_type(self):
+ <edge id="2" source="2" target="3" />
+ </edges>
+ </graph>
++</gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
++ else:
++ expected = """<gexf xmlns="http://www.gexf.net/1.2draft"\
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation\
++="http://www.gexf.net/1.2draft http://www.gexf.net/1.2draft/gexf.xsd"\
++ version="1.2">
++ <meta lastmodifieddate="{}">
++ <creator>NetworkX {}</creator>
++ </meta>
++ <graph defaultedgetype="undirected" mode="static" name="">
++ <attributes mode="static" class="edge">
++ <attribute id="1" title="edge-number" type="float" />
++ </attributes>
++ <attributes mode="static" class="node">
++ <attribute id="0" title="number" type="int" />
++ </attributes>
++ <nodes>
++ <node id="0" label="0">
++ <attvalues>
++ <attvalue for="0" value="0" />
++ </attvalues>
++ </node>
++ <node id="1" label="1">
++ <attvalues>
++ <attvalue for="0" value="1" />
++ </attvalues>
++ </node>
++ <node id="2" label="2">
++ <attvalues>
++ <attvalue for="0" value="2" />
++ </attvalues>
++ </node>
++ <node id="3" label="3">
++ <attvalues>
++ <attvalue for="0" value="3" />
++ </attvalues>
++ </node>
++ </nodes>
++ <edges>
++ <edge source="0" target="1" id="0">
++ <attvalues>
++ <attvalue for="1" value="1.1" />
++ </attvalues>
++ </edge>
++ <edge source="1" target="2" id="1" />
++ <edge source="2" target="3" id="2" />
++ </edges>
++ </graph>
+ </gexf>""".format(time.strftime('%Y-%m-%d'), nx.__version__)
+ obtained = '\n'.join(nx.generate_gexf(G))
+ assert expected == obtained
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index 081e31c0fa4..fa234268a45 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=7
-# networkx-2.4 supports up to python3_8
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
inherit distutils-r1 virtualx
DESCRIPTION="Python tools to manipulate graphs and complex networks"
@@ -17,41 +16,41 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-
IUSE="examples extras pandas scipy test xml yaml"
RESTRICT="!test? ( test )"
-REQUIRED_USE="
- test? ( extras pandas scipy xml yaml )"
-
-COMMON_DEPEND="
+RDEPEND="
+ >=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
>=dev-python/matplotlib-2.2.2[${PYTHON_USEDEP}]
extras? (
>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
- >=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
- >=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
+ >=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+ ' python3_{6,7,8})
)
pandas? (
- $(python_gen_cond_dep '>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]' python3_{6,7})
+ $(python_gen_cond_dep '
+ >=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
+ ' python3_{6,7,8})
)
scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
- ${COMMON_DEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-RDEPEND="
- >=dev-python/decorator-4.3.0[${PYTHON_USEDEP}]
- ${COMMON_DEPEND}
- examples? (
- dev-python/pyparsing[${PYTHON_USEDEP}]
- )"
+
+distutils_enable_tests pytest
PATCHES=(
+ "${FILESDIR}"/${P}-py38.patch
)
-python_test() {
- virtx nosetests -vv || die "tests failed with ${EPYTHON}"
+src_prepare() {
+ # incompatible deps?
+ sed -e 's:test_multigraph_edgelist_tuples:_&:' \
+ -i networkx/drawing/tests/test_pylab.py || die
+
+ distutils-r1_src_prepare
+}
+
+src_test() {
+ virtx distutils-r1_src_test
}
python_install_all() {
@@ -59,10 +58,3 @@ python_install_all() {
distutils-r1_python_install_all
}
-
-pkg_postinst() {
- if use pandas && use python_targets_python3_8; then
- ewarn "The pandas functionality in ${P} will not work with python3.8 as"
- ewarn "dev-python/pandas does not have support for python3.8 yet"
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/networkx/, dev-python/networkx/files/
@ 2020-06-14 11:10 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-06-14 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 81ffdca3af163e42650cf1c1dd21dac0c84f4014
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 09:53:07 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 11:09:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ffdca3
dev-python/networkx: Port to py3.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/networkx/files/networkx-2.4-py39.patch | 46 +++++++++++++++++++++++
dev-python/networkx/networkx-2.4-r1.ebuild | 3 +-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/dev-python/networkx/files/networkx-2.4-py39.patch b/dev-python/networkx/files/networkx-2.4-py39.patch
new file mode 100644
index 00000000000..7efe8998b35
--- /dev/null
+++ b/dev-python/networkx/files/networkx-2.4-py39.patch
@@ -0,0 +1,46 @@
+From 0cb12b33df48788c10fa21b326803ae66d74cbe6 Mon Sep 17 00:00:00 2001
+From: Jarrod Millman <jarrod.millman@gmail.com>
+Date: Mon, 21 Oct 2019 00:56:04 -0700
+Subject: [PATCH] Remove unused imports
+
+---
+ .travis.yml | 3 ---
+ networkx/algorithms/assortativity/connectivity.py | 2 --
+ networkx/algorithms/assortativity/correlation.py | 13 ++++++-------
+ networkx/algorithms/assortativity/mixing.py | 1 -
+ .../algorithms/assortativity/neighbor_degree.py | 1 -
+ networkx/algorithms/assortativity/pairs.py | 1 -
+ networkx/algorithms/cluster.py | 1 -
+ networkx/algorithms/community/modularity_max.py | 1 -
+ networkx/algorithms/components/biconnected.py | 1 -
+ networkx/algorithms/isolate.py | 1 -
+ networkx/algorithms/isomorphism/isomorphvf2.py | 1 -
+ networkx/algorithms/traversal/beamsearch.py | 1 -
+ networkx/classes/graph.py | 2 +-
+ networkx/classes/reportviews.py | 1 -
+ networkx/conftest.py | 8 ++++++--
+ networkx/linalg/attrmatrix.py | 1 -
+ networkx/readwrite/gexf.py | 11 ++---------
+ networkx/readwrite/gpickle.py | 1 -
+ networkx/readwrite/graphml.py | 11 ++---------
+ networkx/readwrite/nx_yaml.py | 1 -
+ networkx/readwrite/tests/test_graphml.py | 4 ++--
+ tools/travis/script.sh | 2 +-
+ 22 files changed, 20 insertions(+), 49 deletions(-)
+
+diff --git a/networkx/readwrite/tests/test_graphml.py b/networkx/readwrite/tests/test_graphml.py
+index 00b97d77..1946c487 100644
+--- a/networkx/readwrite/tests/test_graphml.py
++++ b/networkx/readwrite/tests/test_graphml.py
+@@ -879,7 +879,7 @@ class TestWriteGraphML(BaseGraphML):
+
+ xml = parse(fh)
+ # Children are the key elements, and the graph element
+- children = xml.getroot().getchildren()
++ children = list(xml.getroot())
+ assert len(children) == 3
+
+ keys = [child.items() for child in children[:2]]
+--
+2.27.0
+
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index fa234268a45..94c1dbe4890 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1 virtualx
DESCRIPTION="Python tools to manipulate graphs and complex networks"
@@ -39,6 +39,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-py38.patch
+ "${FILESDIR}"/${P}-py39.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-14 11:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-14 11:10 [gentoo-commits] repo/gentoo:master commit in: dev-python/networkx/, dev-python/networkx/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-06-13 11:14 Michał Górny
2019-12-29 13:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox