diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index ba441754a0fa..8da52b089fce 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -1,67 +1,67 @@ PORTNAME= networkx -DISTVERSION= 2.8.8 +DISTVERSION= 3.0 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Tools for complex networks WWW= https://networkx.github.io/ LICENSE= BSD3CLAUSE RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.3.0:devel/py-decorator@${PY_FLAVOR} USES= cpe python:3.8+ shebangfix USE_PYTHON= autoplist concurrent distutils pytest SHEBANG_GLOB= *.py NO_ARCH= yes CPE_VENDOR= python PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} OPTIONS_DEFINE= EXAMPLES GDAL LXML PANDAS PYDOT YAML OPTIONS_GROUP= MATRIX RENDER OPTIONS_GROUP_MATRIX= NUMPY SCIPY OPTIONS_GROUP_RENDER= MPL GRAPHVIZ OPTIONS_DEFAULT= NUMPY SCIPY MPL GDAL GRAPHVIZ LXML PANDAS PYDOT YAML NUMPY_DESC= Matrix representation of graphs NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0,1:math/py-numpy@${PY_FLAVOR} SCIPY_DESC= Sparse matrix representation of graphs SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=1.8:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${PY_FLAVOR} MPL_DESC= Flexible graph rendering MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.4.0:math/py-matplotlib@${PY_FLAVOR} GDAL_DESC= Support of raster geospatial data formats GDAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=0:graphics/py-gdal@${PY_FLAVOR} GRAPHVIZ_DESC= Additional graph layout and rendering algorithms GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR} LXML_DESC= Binding for the libxml2 and libxslt libraries LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} PANDAS_DESC= Data analysis PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.3:math/py-pandas@${PY_FLAVOR} PYDOT_DESC= Graphviz Dot language PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} YAML_DESC= Reading and writing YAML files YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} PORTEXAMPLES= * post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} do-test: install (cd ${WRKSRC} && py.test) .include diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo index b3d6dce6780a..fcd55f26ca3f 100644 --- a/math/py-networkx/distinfo +++ b/math/py-networkx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667943952 -SHA256 (networkx-2.8.8.tar.gz) = 230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e -SIZE (networkx-2.8.8.tar.gz) = 1960828 +TIMESTAMP = 1676889633 +SHA256 (networkx-3.0.tar.gz) = 9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412 +SIZE (networkx-3.0.tar.gz) = 1987075 diff --git a/math/py-networkx/files/patch-setup.py b/math/py-networkx/files/patch-setup.py index 0837b32a446a..1d28af3e2856 100644 --- a/math/py-networkx/files/patch-setup.py +++ b/math/py-networkx/files/patch-setup.py @@ -1,47 +1,47 @@ ---- setup.py.orig 2021-02-15 16:30:03 UTC +--- setup.py.orig 2023-02-20 13:03:51 UTC +++ setup.py -@@ -64,36 +64,6 @@ packages = [ +@@ -92,36 +92,6 @@ packages = [ "networkx.utils", ] -docdirbase = "share/doc/networkx-%s" % version -# add basic documentation -data = [(docdirbase, glob("*.txt"))] -# add examples -for d in [ - ".", - "advanced", - "algorithms", - "basic", - "3d_drawing", - "drawing", - "graph", - "javascript", - "jit", - "pygraphviz", - "subclass", -]: - dd = os.path.join(docdirbase, "examples", d) - pp = os.path.join("examples", d) - data.append((dd, glob(os.path.join(pp, "*.txt")))) - data.append((dd, glob(os.path.join(pp, "*.py")))) - data.append((dd, glob(os.path.join(pp, "*.bz2")))) - data.append((dd, glob(os.path.join(pp, "*.gz")))) - data.append((dd, glob(os.path.join(pp, "*.mbox")))) - data.append((dd, glob(os.path.join(pp, "*.edgelist")))) -# add js force examples -dd = os.path.join(docdirbase, "examples", "javascript/force") -pp = os.path.join("examples", "javascript/force") -data.append((dd, glob(os.path.join(pp, "*")))) - - # add the tests + # add the tests subpackage(s) package_data = { "networkx": ["tests/*.py"], -@@ -169,7 +139,6 @@ if __name__ == "__main__": - project_urls=release.project_urls, - classifiers=release.classifiers, +@@ -185,7 +155,6 @@ if __name__ == "__main__": + project_urls=project_urls, + classifiers=classifiers, packages=packages, - data_files=data, package_data=package_data, install_requires=install_requires, extras_require=extras_require,