gentoo resync : 25.11.2020

4 files changed, 0 insertions, 195 deletions

diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 85d738983ca9..e44436669136 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,7 +1,3 @@
-AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
-AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
-DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
-EBUILD networkx-2.4-r1.ebuild 1580 BLAKE2B fd4ee5c316255f11d6d90828851ebab513eeafbef8ec6fd9499a7dc88718d750ac2143862ffcdbe8e24910be575dc6e35658845f7159fccdef2020522c58c6e9 SHA512 96aeafb16cad3f2c089daa07121662f5adbecfdae5fa68270f0464130e95c39655849eeb8f9162bd8cd804842a493b25819cb4e29f23a12b4704d6b259f6e258
 EBUILD networkx-2.5.ebuild 1341 BLAKE2B c11626738b1d236a56b931ecfd28a5a367738befa28f7e5e9b382d03c5b0b6081260615adb8fd29a57afcdbf5c9f074d585a045b7760dc953ae9b09ba32e8b0e SHA512 e1948968b8d43e0f6ca2929095f6f6516b090f8a5767813b88ebd6889189e2e2605b55d10ffaf77b774fd6b0383bdb6c01f9e7ea9aa69c5a2ecbf5ea6a44d560
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/files/networkx-2.4-py38.patch b/dev-python/networkx/files/networkx-2.4-py38.patch
deleted file mode 100644
index 9ce3003d1042..000000000000
--- a/dev-python/networkx/files/networkx-2.4-py38.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/files/networkx-2.4-py39.patch b/dev-python/networkx/files/networkx-2.4-py39.patch
deleted file mode 100644
index 7efe8998b35f..000000000000
--- a/dev-python/networkx/files/networkx-2.4-py39.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 989d4d5da9a9..000000000000
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples extras pandas scipy test xml yaml"
-RESTRICT="!test? ( test )"
-
-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}]
-		$(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? (
-		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
-	)
-	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
-	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py38.patch
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-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() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}