Received: by mail.netbsd.org (Postfix, from userid 605) id 5A34E84F12; Tue, 9 May 2023 08:27:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 88C0A84F0B for ; Tue, 9 May 2023 08:27:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0Pjrv7RUyAP1 for ; Tue, 9 May 2023 08:27:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0DB0084EE9 for ; Tue, 9 May 2023 08:27:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C21BFFA87; Tue, 9 May 2023 08:26:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1683620804211490" MIME-Version: 1.0 Date: Tue, 9 May 2023 08:26:44 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/math/py-networkx To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230509082644.C21BFFA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1683620804211490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue May 9 08:26:44 UTC 2023 Modified Files: pkgsrc/math/py-networkx: Makefile PLIST distinfo pkgsrc/math/py-networkx/patches: patch-setup.py Log Message: py-networkx: updated to 3.1 NetworkX 3.1 - Minor bug-fixes and speed-ups - Improvements to plugin based backend infrastructure - Minor documentation improvements - Improved test coverage - Last release supporting Python 3.8 - Stopped building PDF version of docs - Use Ruff for linting NetworkX 3.0 - Better syncing between G._succ and G._adj for directed G. And slightly better speed from all the core adjacency data structures. G.adj is now a cached_property while still having the cache reset when G._adj is set to a new dict (which doesn't happen very often). Note: We have always assumed that G._succ and G._adj point to the same object. But we did not enforce it well. If you have somehow worked around our attempts and are relying on these private attributes being allowed to be different from each other due to loopholes in our previous code, you will have to look for other loopholes in our new code (or subclass DiGraph to explicitly allow this). - If your code sets G._succ or G._adj to new dictionary-like objects, you no longer have to set them both. Setting either will ensure the other is set as well. And the cached_properties G.adj and G.succ will be rest accordingly too. - If you use the presence of the attribute `_adj` as a criteria for the object being a Graph instance, that code may need updating. The graph classes themselves now have an attribute `_adj`. So, it is possible that whatever you are checking might be a class rather than an instance. We suggest you check for attribute `_adj` to verify it is like a NetworkX graph object or type and then `type(obj) is type` to check if it is a class. - We have added an `experimental plugin feature `_, which let users choose alternate backends like GraphBLAS, CuGraph for computation. This is an opt-in feature and may change in future releases. - Improved integration with the general `Scientific Python ecosystem `_. - New drawing feature (module and tests) from NetworkX graphs to the TikZ library of TeX/LaTeX. The basic interface is ``nx.to_latex(G, pos, **options)`` to construct a string of latex code or ``nx.write_latex(G, filename, as_document=True, **options)`` to write the string to a file. - Added an improved subgraph isomorphism algorithm called VF2++. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 pkgsrc/math/py-networkx/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/py-networkx/PLIST \ pkgsrc/math/py-networkx/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-networkx/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1683620804211490 Content-Disposition: inline Content-Length: 31476 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/py-networkx/Makefile diff -u pkgsrc/math/py-networkx/Makefile:1.35 pkgsrc/math/py-networkx/Makefile:1.36 --- pkgsrc/math/py-networkx/Makefile:1.35 Tue Jan 4 20:54:14 2022 +++ pkgsrc/math/py-networkx/Makefile Tue May 9 08:26:44 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2022/01/04 20:54:14 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2023/05/09 08:26:44 adam Exp $ -DISTNAME= networkx-2.5.1 +DISTNAME= networkx-3.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/networkx/} @@ -11,16 +10,15 @@ HOMEPAGE= https://networkx.github.io/ COMMENT= Python package for creating and manipulating graphs and networks LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-decorator>=4.3.0:../../devel/py-decorator -TEST_DEPENDS+= ${PYPKGPREFIX}-test>=0:../../devel/py-test +TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.2:../../devel/py-test +TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov>=4.0:../../devel/py-test-cov USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 27 +PYTHON_VERSIONS_INCOMPATIBLE= 27 37 do-test: - cd ${WRKSRC} && ${SETENV} ${TEST_ENV} \ - pytest-${PYVERSSUFFIX} --pyargs networkx + cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} networkx .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-networkx/PLIST diff -u pkgsrc/math/py-networkx/PLIST:1.19 pkgsrc/math/py-networkx/PLIST:1.20 --- pkgsrc/math/py-networkx/PLIST:1.19 Wed Dec 9 16:56:19 2020 +++ pkgsrc/math/py-networkx/PLIST Tue May 9 08:26:44 2023 @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.19 2020/12/09 16:56:19 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2023/05/09 08:26:44 adam Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/entry_points.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe ${PYSITELIB}/${EGG_INFODIR}/requires.txt ${PYSITELIB}/${EGG_INFODIR}/top_level.txt @@ -23,18 +24,21 @@ ${PYSITELIB}/networkx/algorithms/approxi ${PYSITELIB}/networkx/algorithms/approximation/connectivity.py ${PYSITELIB}/networkx/algorithms/approximation/connectivity.pyc ${PYSITELIB}/networkx/algorithms/approximation/connectivity.pyo +${PYSITELIB}/networkx/algorithms/approximation/distance_measures.py +${PYSITELIB}/networkx/algorithms/approximation/distance_measures.pyc +${PYSITELIB}/networkx/algorithms/approximation/distance_measures.pyo ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.py ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyc ${PYSITELIB}/networkx/algorithms/approximation/dominating_set.pyo -${PYSITELIB}/networkx/algorithms/approximation/independent_set.py -${PYSITELIB}/networkx/algorithms/approximation/independent_set.pyc -${PYSITELIB}/networkx/algorithms/approximation/independent_set.pyo ${PYSITELIB}/networkx/algorithms/approximation/kcomponents.py ${PYSITELIB}/networkx/algorithms/approximation/kcomponents.pyc ${PYSITELIB}/networkx/algorithms/approximation/kcomponents.pyo ${PYSITELIB}/networkx/algorithms/approximation/matching.py ${PYSITELIB}/networkx/algorithms/approximation/matching.pyc ${PYSITELIB}/networkx/algorithms/approximation/matching.pyo +${PYSITELIB}/networkx/algorithms/approximation/maxcut.py +${PYSITELIB}/networkx/algorithms/approximation/maxcut.pyc +${PYSITELIB}/networkx/algorithms/approximation/maxcut.pyo ${PYSITELIB}/networkx/algorithms/approximation/ramsey.py ${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyc ${PYSITELIB}/networkx/algorithms/approximation/ramsey.pyo @@ -53,30 +57,39 @@ ${PYSITELIB}/networkx/algorithms/approxi ${PYSITELIB}/networkx/algorithms/approximation/tests/test_connectivity.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_connectivity.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_connectivity.pyo +${PYSITELIB}/networkx/algorithms/approximation/tests/test_distance_measures.py +${PYSITELIB}/networkx/algorithms/approximation/tests/test_distance_measures.pyc +${PYSITELIB}/networkx/algorithms/approximation/tests/test_distance_measures.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_dominating_set.pyo -${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.py -${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.pyc -${PYSITELIB}/networkx/algorithms/approximation/tests/test_independent_set.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_kcomponents.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_kcomponents.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_kcomponents.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_matching.pyo +${PYSITELIB}/networkx/algorithms/approximation/tests/test_maxcut.py +${PYSITELIB}/networkx/algorithms/approximation/tests/test_maxcut.pyc +${PYSITELIB}/networkx/algorithms/approximation/tests/test_maxcut.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_ramsey.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_steinertree.pyo +${PYSITELIB}/networkx/algorithms/approximation/tests/test_traveling_salesman.py +${PYSITELIB}/networkx/algorithms/approximation/tests/test_traveling_salesman.pyc +${PYSITELIB}/networkx/algorithms/approximation/tests/test_traveling_salesman.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_treewidth.pyo ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.py ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.pyc ${PYSITELIB}/networkx/algorithms/approximation/tests/test_vertex_cover.pyo +${PYSITELIB}/networkx/algorithms/approximation/traveling_salesman.py +${PYSITELIB}/networkx/algorithms/approximation/traveling_salesman.pyc +${PYSITELIB}/networkx/algorithms/approximation/traveling_salesman.pyo ${PYSITELIB}/networkx/algorithms/approximation/treewidth.py ${PYSITELIB}/networkx/algorithms/approximation/treewidth.pyc ${PYSITELIB}/networkx/algorithms/approximation/treewidth.pyo @@ -245,6 +258,9 @@ ${PYSITELIB}/networkx/algorithms/central ${PYSITELIB}/networkx/algorithms/centrality/katz.py ${PYSITELIB}/networkx/algorithms/centrality/katz.pyc ${PYSITELIB}/networkx/algorithms/centrality/katz.pyo +${PYSITELIB}/networkx/algorithms/centrality/laplacian.py +${PYSITELIB}/networkx/algorithms/centrality/laplacian.pyc +${PYSITELIB}/networkx/algorithms/centrality/laplacian.pyo ${PYSITELIB}/networkx/algorithms/centrality/load.py ${PYSITELIB}/networkx/algorithms/centrality/load.pyc ${PYSITELIB}/networkx/algorithms/centrality/load.pyo @@ -299,6 +315,9 @@ ${PYSITELIB}/networkx/algorithms/central ${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.py ${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.pyc ${PYSITELIB}/networkx/algorithms/centrality/tests/test_katz_centrality.pyo +${PYSITELIB}/networkx/algorithms/centrality/tests/test_laplacian_centrality.py +${PYSITELIB}/networkx/algorithms/centrality/tests/test_laplacian_centrality.pyc +${PYSITELIB}/networkx/algorithms/centrality/tests/test_laplacian_centrality.pyo ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.py ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyc ${PYSITELIB}/networkx/algorithms/centrality/tests/test_load_centrality.pyo @@ -347,9 +366,6 @@ ${PYSITELIB}/networkx/algorithms/colorin ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring.py ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring.pyc ${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring.pyo -${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.py -${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.pyc -${PYSITELIB}/networkx/algorithms/coloring/greedy_coloring_with_interchange.pyo ${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.py ${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.pyc ${PYSITELIB}/networkx/algorithms/coloring/tests/__init__.pyo @@ -380,6 +396,9 @@ ${PYSITELIB}/networkx/algorithms/communi ${PYSITELIB}/networkx/algorithms/community/label_propagation.py ${PYSITELIB}/networkx/algorithms/community/label_propagation.pyc ${PYSITELIB}/networkx/algorithms/community/label_propagation.pyo +${PYSITELIB}/networkx/algorithms/community/louvain.py +${PYSITELIB}/networkx/algorithms/community/louvain.pyc +${PYSITELIB}/networkx/algorithms/community/louvain.pyo ${PYSITELIB}/networkx/algorithms/community/lukes.py ${PYSITELIB}/networkx/algorithms/community/lukes.pyc ${PYSITELIB}/networkx/algorithms/community/lukes.pyo @@ -407,6 +426,9 @@ ${PYSITELIB}/networkx/algorithms/communi ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.py ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.pyc ${PYSITELIB}/networkx/algorithms/community/tests/test_label_propagation.pyo +${PYSITELIB}/networkx/algorithms/community/tests/test_louvain.py +${PYSITELIB}/networkx/algorithms/community/tests/test_louvain.pyc +${PYSITELIB}/networkx/algorithms/community/tests/test_louvain.pyo ${PYSITELIB}/networkx/algorithms/community/tests/test_lukes.py ${PYSITELIB}/networkx/algorithms/community/tests/test_lukes.pyc ${PYSITELIB}/networkx/algorithms/community/tests/test_lukes.pyo @@ -605,6 +627,9 @@ ${PYSITELIB}/networkx/algorithms/flow/te ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.py ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyc ${PYSITELIB}/networkx/algorithms/flow/tests/test_mincost.pyo +${PYSITELIB}/networkx/algorithms/flow/tests/test_networksimplex.py +${PYSITELIB}/networkx/algorithms/flow/tests/test_networksimplex.pyc +${PYSITELIB}/networkx/algorithms/flow/tests/test_networksimplex.pyo ${PYSITELIB}/networkx/algorithms/flow/tests/wlm3.gpickle.bz2 ${PYSITELIB}/networkx/algorithms/flow/utils.py ${PYSITELIB}/networkx/algorithms/flow/utils.pyc @@ -667,12 +692,21 @@ ${PYSITELIB}/networkx/algorithms/isomorp ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_tree_isomorphism.py ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_tree_isomorphism.pyc ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_tree_isomorphism.pyo +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp.py +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp.pyc +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp.pyo +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp_helpers.py +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp_helpers.pyc +${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2pp_helpers.pyo ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.py ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.pyc ${PYSITELIB}/networkx/algorithms/isomorphism/tests/test_vf2userfunc.pyo ${PYSITELIB}/networkx/algorithms/isomorphism/tree_isomorphism.py ${PYSITELIB}/networkx/algorithms/isomorphism/tree_isomorphism.pyc ${PYSITELIB}/networkx/algorithms/isomorphism/tree_isomorphism.pyo +${PYSITELIB}/networkx/algorithms/isomorphism/vf2pp.py +${PYSITELIB}/networkx/algorithms/isomorphism/vf2pp.pyc +${PYSITELIB}/networkx/algorithms/isomorphism/vf2pp.pyo ${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.py ${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.pyc ${PYSITELIB}/networkx/algorithms/isomorphism/vf2userfunc.pyo @@ -703,36 +737,24 @@ ${PYSITELIB}/networkx/algorithms/lowest_ ${PYSITELIB}/networkx/algorithms/matching.py ${PYSITELIB}/networkx/algorithms/matching.pyc ${PYSITELIB}/networkx/algorithms/matching.pyo -${PYSITELIB}/networkx/algorithms/minors.py -${PYSITELIB}/networkx/algorithms/minors.pyc -${PYSITELIB}/networkx/algorithms/minors.pyo +${PYSITELIB}/networkx/algorithms/minors/__init__.py +${PYSITELIB}/networkx/algorithms/minors/__init__.pyc +${PYSITELIB}/networkx/algorithms/minors/__init__.pyo +${PYSITELIB}/networkx/algorithms/minors/contraction.py +${PYSITELIB}/networkx/algorithms/minors/contraction.pyc +${PYSITELIB}/networkx/algorithms/minors/contraction.pyo +${PYSITELIB}/networkx/algorithms/minors/tests/test_contraction.py +${PYSITELIB}/networkx/algorithms/minors/tests/test_contraction.pyc +${PYSITELIB}/networkx/algorithms/minors/tests/test_contraction.pyo ${PYSITELIB}/networkx/algorithms/mis.py ${PYSITELIB}/networkx/algorithms/mis.pyc ${PYSITELIB}/networkx/algorithms/mis.pyo ${PYSITELIB}/networkx/algorithms/moral.py ${PYSITELIB}/networkx/algorithms/moral.pyc ${PYSITELIB}/networkx/algorithms/moral.pyo -${PYSITELIB}/networkx/algorithms/node_classification/__init__.py -${PYSITELIB}/networkx/algorithms/node_classification/__init__.pyc -${PYSITELIB}/networkx/algorithms/node_classification/__init__.pyo -${PYSITELIB}/networkx/algorithms/node_classification/hmn.py -${PYSITELIB}/networkx/algorithms/node_classification/hmn.pyc -${PYSITELIB}/networkx/algorithms/node_classification/hmn.pyo -${PYSITELIB}/networkx/algorithms/node_classification/lgc.py -${PYSITELIB}/networkx/algorithms/node_classification/lgc.pyc -${PYSITELIB}/networkx/algorithms/node_classification/lgc.pyo -${PYSITELIB}/networkx/algorithms/node_classification/tests/__init__.py -${PYSITELIB}/networkx/algorithms/node_classification/tests/__init__.pyc -${PYSITELIB}/networkx/algorithms/node_classification/tests/__init__.pyo -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.py -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.pyc -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_harmonic_function.pyo -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.py -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.pyc -${PYSITELIB}/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.pyo -${PYSITELIB}/networkx/algorithms/node_classification/utils.py -${PYSITELIB}/networkx/algorithms/node_classification/utils.pyc -${PYSITELIB}/networkx/algorithms/node_classification/utils.pyo +${PYSITELIB}/networkx/algorithms/node_classification.py +${PYSITELIB}/networkx/algorithms/node_classification.pyc +${PYSITELIB}/networkx/algorithms/node_classification.pyo ${PYSITELIB}/networkx/algorithms/non_randomness.py ${PYSITELIB}/networkx/algorithms/non_randomness.pyc ${PYSITELIB}/networkx/algorithms/non_randomness.pyo @@ -772,6 +794,9 @@ ${PYSITELIB}/networkx/algorithms/planar_ ${PYSITELIB}/networkx/algorithms/planarity.py ${PYSITELIB}/networkx/algorithms/planarity.pyc ${PYSITELIB}/networkx/algorithms/planarity.pyo +${PYSITELIB}/networkx/algorithms/polynomials.py +${PYSITELIB}/networkx/algorithms/polynomials.pyc +${PYSITELIB}/networkx/algorithms/polynomials.pyo ${PYSITELIB}/networkx/algorithms/reciprocity.py ${PYSITELIB}/networkx/algorithms/reciprocity.pyc ${PYSITELIB}/networkx/algorithms/reciprocity.pyo @@ -838,6 +863,9 @@ ${PYSITELIB}/networkx/algorithms/sparsif ${PYSITELIB}/networkx/algorithms/structuralholes.py ${PYSITELIB}/networkx/algorithms/structuralholes.pyc ${PYSITELIB}/networkx/algorithms/structuralholes.pyo +${PYSITELIB}/networkx/algorithms/summarization.py +${PYSITELIB}/networkx/algorithms/summarization.pyc +${PYSITELIB}/networkx/algorithms/summarization.pyo ${PYSITELIB}/networkx/algorithms/swap.py ${PYSITELIB}/networkx/algorithms/swap.pyc ${PYSITELIB}/networkx/algorithms/swap.pyo @@ -931,15 +959,15 @@ ${PYSITELIB}/networkx/algorithms/tests/t ${PYSITELIB}/networkx/algorithms/tests/test_max_weight_clique.py ${PYSITELIB}/networkx/algorithms/tests/test_max_weight_clique.pyc ${PYSITELIB}/networkx/algorithms/tests/test_max_weight_clique.pyo -${PYSITELIB}/networkx/algorithms/tests/test_minors.py -${PYSITELIB}/networkx/algorithms/tests/test_minors.pyc -${PYSITELIB}/networkx/algorithms/tests/test_minors.pyo ${PYSITELIB}/networkx/algorithms/tests/test_mis.py ${PYSITELIB}/networkx/algorithms/tests/test_mis.pyc ${PYSITELIB}/networkx/algorithms/tests/test_mis.pyo ${PYSITELIB}/networkx/algorithms/tests/test_moral.py ${PYSITELIB}/networkx/algorithms/tests/test_moral.pyc ${PYSITELIB}/networkx/algorithms/tests/test_moral.pyo +${PYSITELIB}/networkx/algorithms/tests/test_node_classification.py +${PYSITELIB}/networkx/algorithms/tests/test_node_classification.pyc +${PYSITELIB}/networkx/algorithms/tests/test_node_classification.pyo ${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.py ${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.pyc ${PYSITELIB}/networkx/algorithms/tests/test_non_randomness.pyo @@ -949,6 +977,9 @@ ${PYSITELIB}/networkx/algorithms/tests/t ${PYSITELIB}/networkx/algorithms/tests/test_planarity.py ${PYSITELIB}/networkx/algorithms/tests/test_planarity.pyc ${PYSITELIB}/networkx/algorithms/tests/test_planarity.pyo +${PYSITELIB}/networkx/algorithms/tests/test_polynomials.py +${PYSITELIB}/networkx/algorithms/tests/test_polynomials.pyc +${PYSITELIB}/networkx/algorithms/tests/test_polynomials.pyo ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.py ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyc ${PYSITELIB}/networkx/algorithms/tests/test_reciprocity.pyo @@ -976,6 +1007,9 @@ ${PYSITELIB}/networkx/algorithms/tests/t ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.py ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.pyc ${PYSITELIB}/networkx/algorithms/tests/test_structuralholes.pyo +${PYSITELIB}/networkx/algorithms/tests/test_summarization.py +${PYSITELIB}/networkx/algorithms/tests/test_summarization.pyc +${PYSITELIB}/networkx/algorithms/tests/test_summarization.pyo ${PYSITELIB}/networkx/algorithms/tests/test_swap.py ${PYSITELIB}/networkx/algorithms/tests/test_swap.pyc ${PYSITELIB}/networkx/algorithms/tests/test_swap.pyo @@ -1096,6 +1130,9 @@ ${PYSITELIB}/networkx/algorithms/wiener. ${PYSITELIB}/networkx/classes/__init__.py ${PYSITELIB}/networkx/classes/__init__.pyc ${PYSITELIB}/networkx/classes/__init__.pyo +${PYSITELIB}/networkx/classes/backends.py +${PYSITELIB}/networkx/classes/backends.pyc +${PYSITELIB}/networkx/classes/backends.pyo ${PYSITELIB}/networkx/classes/coreviews.py ${PYSITELIB}/networkx/classes/coreviews.pyc ${PYSITELIB}/networkx/classes/coreviews.pyo @@ -1120,18 +1157,21 @@ ${PYSITELIB}/networkx/classes/multidigra ${PYSITELIB}/networkx/classes/multigraph.py ${PYSITELIB}/networkx/classes/multigraph.pyc ${PYSITELIB}/networkx/classes/multigraph.pyo -${PYSITELIB}/networkx/classes/ordered.py -${PYSITELIB}/networkx/classes/ordered.pyc -${PYSITELIB}/networkx/classes/ordered.pyo ${PYSITELIB}/networkx/classes/reportviews.py ${PYSITELIB}/networkx/classes/reportviews.pyc ${PYSITELIB}/networkx/classes/reportviews.pyo ${PYSITELIB}/networkx/classes/tests/__init__.py ${PYSITELIB}/networkx/classes/tests/__init__.pyc ${PYSITELIB}/networkx/classes/tests/__init__.pyo +${PYSITELIB}/networkx/classes/tests/dispatch_interface.py +${PYSITELIB}/networkx/classes/tests/dispatch_interface.pyc +${PYSITELIB}/networkx/classes/tests/dispatch_interface.pyo ${PYSITELIB}/networkx/classes/tests/historical_tests.py ${PYSITELIB}/networkx/classes/tests/historical_tests.pyc ${PYSITELIB}/networkx/classes/tests/historical_tests.pyo +${PYSITELIB}/networkx/classes/tests/test_backends.py +${PYSITELIB}/networkx/classes/tests/test_backends.pyc +${PYSITELIB}/networkx/classes/tests/test_backends.pyo ${PYSITELIB}/networkx/classes/tests/test_coreviews.py ${PYSITELIB}/networkx/classes/tests/test_coreviews.pyc ${PYSITELIB}/networkx/classes/tests/test_coreviews.pyo @@ -1162,9 +1202,6 @@ ${PYSITELIB}/networkx/classes/tests/test ${PYSITELIB}/networkx/classes/tests/test_multigraph.py ${PYSITELIB}/networkx/classes/tests/test_multigraph.pyc ${PYSITELIB}/networkx/classes/tests/test_multigraph.pyo -${PYSITELIB}/networkx/classes/tests/test_ordered.py -${PYSITELIB}/networkx/classes/tests/test_ordered.pyc -${PYSITELIB}/networkx/classes/tests/test_ordered.pyo ${PYSITELIB}/networkx/classes/tests/test_reportviews.py ${PYSITELIB}/networkx/classes/tests/test_reportviews.pyc ${PYSITELIB}/networkx/classes/tests/test_reportviews.pyo @@ -1192,6 +1229,9 @@ ${PYSITELIB}/networkx/drawing/layout.pyo ${PYSITELIB}/networkx/drawing/nx_agraph.py ${PYSITELIB}/networkx/drawing/nx_agraph.pyc ${PYSITELIB}/networkx/drawing/nx_agraph.pyo +${PYSITELIB}/networkx/drawing/nx_latex.py +${PYSITELIB}/networkx/drawing/nx_latex.pyc +${PYSITELIB}/networkx/drawing/nx_latex.pyo ${PYSITELIB}/networkx/drawing/nx_pydot.py ${PYSITELIB}/networkx/drawing/nx_pydot.pyc ${PYSITELIB}/networkx/drawing/nx_pydot.pyo @@ -1201,9 +1241,13 @@ ${PYSITELIB}/networkx/drawing/nx_pylab.p ${PYSITELIB}/networkx/drawing/tests/__init__.py ${PYSITELIB}/networkx/drawing/tests/__init__.pyc ${PYSITELIB}/networkx/drawing/tests/__init__.pyo +${PYSITELIB}/networkx/drawing/tests/baseline/test_house_with_colors.png ${PYSITELIB}/networkx/drawing/tests/test_agraph.py ${PYSITELIB}/networkx/drawing/tests/test_agraph.pyc ${PYSITELIB}/networkx/drawing/tests/test_agraph.pyo +${PYSITELIB}/networkx/drawing/tests/test_latex.py +${PYSITELIB}/networkx/drawing/tests/test_latex.pyc +${PYSITELIB}/networkx/drawing/tests/test_latex.pyo ${PYSITELIB}/networkx/drawing/tests/test_layout.py ${PYSITELIB}/networkx/drawing/tests/test_layout.pyc ${PYSITELIB}/networkx/drawing/tests/test_layout.pyo @@ -1388,6 +1432,9 @@ ${PYSITELIB}/networkx/generators/trees.p ${PYSITELIB}/networkx/generators/triads.py ${PYSITELIB}/networkx/generators/triads.pyc ${PYSITELIB}/networkx/generators/triads.pyo +${PYSITELIB}/networkx/lazy_imports.py +${PYSITELIB}/networkx/lazy_imports.pyc +${PYSITELIB}/networkx/lazy_imports.pyo ${PYSITELIB}/networkx/linalg/__init__.py ${PYSITELIB}/networkx/linalg/__init__.pyc ${PYSITELIB}/networkx/linalg/__init__.pyo @@ -1451,9 +1498,6 @@ ${PYSITELIB}/networkx/readwrite/gexf.pyo ${PYSITELIB}/networkx/readwrite/gml.py ${PYSITELIB}/networkx/readwrite/gml.pyc ${PYSITELIB}/networkx/readwrite/gml.pyo -${PYSITELIB}/networkx/readwrite/gpickle.py -${PYSITELIB}/networkx/readwrite/gpickle.pyc -${PYSITELIB}/networkx/readwrite/gpickle.pyo ${PYSITELIB}/networkx/readwrite/graph6.py ${PYSITELIB}/networkx/readwrite/graph6.pyc ${PYSITELIB}/networkx/readwrite/graph6.pyo @@ -1469,9 +1513,6 @@ ${PYSITELIB}/networkx/readwrite/json_gra ${PYSITELIB}/networkx/readwrite/json_graph/cytoscape.py ${PYSITELIB}/networkx/readwrite/json_graph/cytoscape.pyc ${PYSITELIB}/networkx/readwrite/json_graph/cytoscape.pyo -${PYSITELIB}/networkx/readwrite/json_graph/jit.py -${PYSITELIB}/networkx/readwrite/json_graph/jit.pyc -${PYSITELIB}/networkx/readwrite/json_graph/jit.pyo ${PYSITELIB}/networkx/readwrite/json_graph/node_link.py ${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyc ${PYSITELIB}/networkx/readwrite/json_graph/node_link.pyo @@ -1484,9 +1525,6 @@ ${PYSITELIB}/networkx/readwrite/json_gra ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_cytoscape.py ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_cytoscape.pyc ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_cytoscape.pyo -${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.py -${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.pyc -${PYSITELIB}/networkx/readwrite/json_graph/tests/test_jit.pyo ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.py ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyc ${PYSITELIB}/networkx/readwrite/json_graph/tests/test_node_link.pyo @@ -1502,12 +1540,6 @@ ${PYSITELIB}/networkx/readwrite/leda.pyo ${PYSITELIB}/networkx/readwrite/multiline_adjlist.py ${PYSITELIB}/networkx/readwrite/multiline_adjlist.pyc ${PYSITELIB}/networkx/readwrite/multiline_adjlist.pyo -${PYSITELIB}/networkx/readwrite/nx_shp.py -${PYSITELIB}/networkx/readwrite/nx_shp.pyc -${PYSITELIB}/networkx/readwrite/nx_shp.pyo -${PYSITELIB}/networkx/readwrite/nx_yaml.py -${PYSITELIB}/networkx/readwrite/nx_yaml.pyc -${PYSITELIB}/networkx/readwrite/nx_yaml.pyo ${PYSITELIB}/networkx/readwrite/p2g.py ${PYSITELIB}/networkx/readwrite/p2g.pyc ${PYSITELIB}/networkx/readwrite/p2g.pyo @@ -1532,9 +1564,6 @@ ${PYSITELIB}/networkx/readwrite/tests/te ${PYSITELIB}/networkx/readwrite/tests/test_gml.py ${PYSITELIB}/networkx/readwrite/tests/test_gml.pyc ${PYSITELIB}/networkx/readwrite/tests/test_gml.pyo -${PYSITELIB}/networkx/readwrite/tests/test_gpickle.py -${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyc -${PYSITELIB}/networkx/readwrite/tests/test_gpickle.pyo ${PYSITELIB}/networkx/readwrite/tests/test_graph6.py ${PYSITELIB}/networkx/readwrite/tests/test_graph6.pyc ${PYSITELIB}/networkx/readwrite/tests/test_graph6.pyo @@ -1550,36 +1579,18 @@ ${PYSITELIB}/networkx/readwrite/tests/te ${PYSITELIB}/networkx/readwrite/tests/test_pajek.py ${PYSITELIB}/networkx/readwrite/tests/test_pajek.pyc ${PYSITELIB}/networkx/readwrite/tests/test_pajek.pyo -${PYSITELIB}/networkx/readwrite/tests/test_shp.py -${PYSITELIB}/networkx/readwrite/tests/test_shp.pyc -${PYSITELIB}/networkx/readwrite/tests/test_shp.pyo ${PYSITELIB}/networkx/readwrite/tests/test_sparse6.py ${PYSITELIB}/networkx/readwrite/tests/test_sparse6.pyc ${PYSITELIB}/networkx/readwrite/tests/test_sparse6.pyo -${PYSITELIB}/networkx/readwrite/tests/test_yaml.py -${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyc -${PYSITELIB}/networkx/readwrite/tests/test_yaml.pyo +${PYSITELIB}/networkx/readwrite/tests/test_text.py +${PYSITELIB}/networkx/readwrite/tests/test_text.pyc +${PYSITELIB}/networkx/readwrite/tests/test_text.pyo +${PYSITELIB}/networkx/readwrite/text.py +${PYSITELIB}/networkx/readwrite/text.pyc +${PYSITELIB}/networkx/readwrite/text.pyo ${PYSITELIB}/networkx/relabel.py ${PYSITELIB}/networkx/relabel.pyc ${PYSITELIB}/networkx/relabel.pyo -${PYSITELIB}/networkx/release.py -${PYSITELIB}/networkx/release.pyc -${PYSITELIB}/networkx/release.pyo -${PYSITELIB}/networkx/testing/__init__.py -${PYSITELIB}/networkx/testing/__init__.pyc -${PYSITELIB}/networkx/testing/__init__.pyo -${PYSITELIB}/networkx/testing/test.py -${PYSITELIB}/networkx/testing/test.pyc -${PYSITELIB}/networkx/testing/test.pyo -${PYSITELIB}/networkx/testing/tests/__init__.py -${PYSITELIB}/networkx/testing/tests/__init__.pyc -${PYSITELIB}/networkx/testing/tests/__init__.pyo -${PYSITELIB}/networkx/testing/tests/test_utils.py -${PYSITELIB}/networkx/testing/tests/test_utils.pyc -${PYSITELIB}/networkx/testing/tests/test_utils.pyo -${PYSITELIB}/networkx/testing/utils.py -${PYSITELIB}/networkx/testing/utils.pyc -${PYSITELIB}/networkx/testing/utils.pyo ${PYSITELIB}/networkx/tests/__init__.py ${PYSITELIB}/networkx/tests/__init__.pyc ${PYSITELIB}/networkx/tests/__init__.pyo @@ -1601,15 +1612,18 @@ ${PYSITELIB}/networkx/tests/test_convert ${PYSITELIB}/networkx/tests/test_exceptions.py ${PYSITELIB}/networkx/tests/test_exceptions.pyc ${PYSITELIB}/networkx/tests/test_exceptions.pyo +${PYSITELIB}/networkx/tests/test_import.py +${PYSITELIB}/networkx/tests/test_import.pyc +${PYSITELIB}/networkx/tests/test_import.pyo +${PYSITELIB}/networkx/tests/test_lazy_imports.py +${PYSITELIB}/networkx/tests/test_lazy_imports.pyc +${PYSITELIB}/networkx/tests/test_lazy_imports.pyo ${PYSITELIB}/networkx/tests/test_relabel.py ${PYSITELIB}/networkx/tests/test_relabel.pyc ${PYSITELIB}/networkx/tests/test_relabel.pyo ${PYSITELIB}/networkx/utils/__init__.py ${PYSITELIB}/networkx/utils/__init__.pyc ${PYSITELIB}/networkx/utils/__init__.pyo -${PYSITELIB}/networkx/utils/contextmanagers.py -${PYSITELIB}/networkx/utils/contextmanagers.pyc -${PYSITELIB}/networkx/utils/contextmanagers.pyo ${PYSITELIB}/networkx/utils/decorators.py ${PYSITELIB}/networkx/utils/decorators.pyc ${PYSITELIB}/networkx/utils/decorators.pyo @@ -1631,9 +1645,9 @@ ${PYSITELIB}/networkx/utils/rcm.pyo ${PYSITELIB}/networkx/utils/tests/__init__.py ${PYSITELIB}/networkx/utils/tests/__init__.pyc ${PYSITELIB}/networkx/utils/tests/__init__.pyo -${PYSITELIB}/networkx/utils/tests/test_contextmanager.py -${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyc -${PYSITELIB}/networkx/utils/tests/test_contextmanager.pyo +${PYSITELIB}/networkx/utils/tests/test__init.py +${PYSITELIB}/networkx/utils/tests/test__init.pyc +${PYSITELIB}/networkx/utils/tests/test__init.pyo ${PYSITELIB}/networkx/utils/tests/test_decorators.py ${PYSITELIB}/networkx/utils/tests/test_decorators.pyc ${PYSITELIB}/networkx/utils/tests/test_decorators.pyo @@ -1658,6 +1672,3 @@ ${PYSITELIB}/networkx/utils/tests/test_u ${PYSITELIB}/networkx/utils/union_find.py ${PYSITELIB}/networkx/utils/union_find.pyc ${PYSITELIB}/networkx/utils/union_find.pyo -${PYSITELIB}/networkx/version.py -${PYSITELIB}/networkx/version.pyc -${PYSITELIB}/networkx/version.pyo Index: pkgsrc/math/py-networkx/distinfo diff -u pkgsrc/math/py-networkx/distinfo:1.19 pkgsrc/math/py-networkx/distinfo:1.20 --- pkgsrc/math/py-networkx/distinfo:1.19 Tue Oct 26 10:56:02 2021 +++ pkgsrc/math/py-networkx/distinfo Tue May 9 08:26:44 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2021/10/26 10:56:02 nia Exp $ +$NetBSD: distinfo,v 1.20 2023/05/09 08:26:44 adam Exp $ -BLAKE2s (networkx-2.5.1.tar.gz) = a30337be66085e9b316e889009c5b8f8683ccb1de6ed38e4112bcdd1069367c0 -SHA512 (networkx-2.5.1.tar.gz) = 995e6637a11a6ca6acb1d3745b36a38045e4c11776731ebc3a847170df423074534313a2bdfe0aa07dd85b7aacc78c56d882cef8e5ac9cf641c63b33d964794b -Size (networkx-2.5.1.tar.gz) = 1540139 bytes -SHA1 (patch-setup.py) = 9859c3102492d4f9afd41533c3b1bf45cbc6850d +BLAKE2s (networkx-3.1.tar.gz) = 9f58804f99a2c440eb11d026c90571d0011b03e2c8f8f9eaa3f0def7a9ebc49c +SHA512 (networkx-3.1.tar.gz) = 9d75ecd25020f83c650824e9449e1c53004c13089dccf7424b65787144dfe3d2f638fd5aca1c4a792b165598b44644fda45bf54c49b3af278ddec5e1f669c38e +Size (networkx-3.1.tar.gz) = 2021691 bytes +SHA1 (patch-setup.py) = 0e5bf822b2ea7b0810a5d0ffbcb832b388058d7f Index: pkgsrc/math/py-networkx/patches/patch-setup.py diff -u pkgsrc/math/py-networkx/patches/patch-setup.py:1.3 pkgsrc/math/py-networkx/patches/patch-setup.py:1.4 --- pkgsrc/math/py-networkx/patches/patch-setup.py:1.3 Wed Sep 25 07:25:24 2019 +++ pkgsrc/math/py-networkx/patches/patch-setup.py Tue May 9 08:26:44 2023 @@ -1,12 +1,12 @@ -$NetBSD: patch-setup.py,v 1.3 2019/09/25 07:25:24 adam Exp $ +$NetBSD: patch-setup.py,v 1.4 2023/05/09 08:26:44 adam Exp $ Skip examples, as they make a conflict between Python versions. ---- setup.py.orig 2019-04-09 06:14:52.000000000 +0000 +--- setup.py.orig 2023-03-29 17:31:10.000000000 +0000 +++ setup.py -@@ -155,7 +155,6 @@ if __name__ == "__main__": - project_urls=release.project_urls, - classifiers=release.classifiers, +@@ -189,7 +189,6 @@ if __name__ == "__main__": + project_urls=project_urls, + classifiers=classifiers, packages=packages, - data_files=data, package_data=package_data, --_----------=_1683620804211490--