diff options
Diffstat (limited to 'math/py-networkx')
| -rw-r--r-- | math/py-networkx/Makefile | 25 | ||||
| -rw-r--r-- | math/py-networkx/distinfo | 6 | ||||
| -rw-r--r-- | math/py-networkx/files/patch-setup.py | 48 |
3 files changed, 51 insertions, 28 deletions
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index ff96b3a0932e..033e90ef2f82 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= networkx -DISTVERSION= 2.1 +DISTVERSION= 2.5 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP @@ -13,10 +13,10 @@ COMMENT= Tools for complex networks LICENSE= BSD3CLAUSE -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:devel/py-decorator@${PY_FLAVOR} +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.3.0:devel/py-decorator@${PY_FLAVOR} # ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} -USES= python:3.6+ shebangfix zip +USES= python:3.6+ shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_GLOB= *.py NO_ARCH= yes @@ -25,11 +25,11 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}networkx1 PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} -OPTIONS_DEFINE= EXAMPLES YAML +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 GRAPHVIZ YAML +OPTIONS_DEFAULT= NUMPY SCIPY MPL GDAL GRAPHVIZ LXML PANDAS PYDOT YAML NUMPY_DESC= Matrix representation of graphs NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR} @@ -41,9 +41,21 @@ SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${PY_FL MPL_DESC= Flexible graph rendering MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.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>=0: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} @@ -53,4 +65,7 @@ post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} +do-test: install + (cd ${WRKSRC} && py.test) + .include <bsd.port.mk> diff --git a/math/py-networkx/distinfo b/math/py-networkx/distinfo index 4a5467755c16..38a1371dcfa4 100644 --- a/math/py-networkx/distinfo +++ b/math/py-networkx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534738249 -SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1 -SIZE (networkx-2.1.zip) = 1612593 +TIMESTAMP = 1613399556 +SHA256 (networkx-2.5.tar.gz) = 7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602 +SIZE (networkx-2.5.tar.gz) = 1542085 diff --git a/math/py-networkx/files/patch-setup.py b/math/py-networkx/files/patch-setup.py index 5ae341839a65..0837b32a446a 100644 --- a/math/py-networkx/files/patch-setup.py +++ b/math/py-networkx/files/patch-setup.py @@ -1,36 +1,44 @@ ---- setup.py.orig 2018-08-20 04:50:16 UTC +--- setup.py.orig 2021-02-15 16:30:03 UTC +++ setup.py -@@ -57,28 +57,6 @@ packages = ["networkx", - "networkx.testing", - "networkx.utils"] +@@ -64,36 +64,6 @@ packages = [ + "networkx.utils", + ] --docdirbase = 'share/doc/networkx-%s' % version +-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) +-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 package_data = { - 'networkx': ['tests/*.py'], -@@ -130,7 +108,6 @@ if __name__ == "__main__": - download_url=release.download_url, + "networkx": ["tests/*.py"], +@@ -169,7 +139,6 @@ if __name__ == "__main__": + project_urls=release.project_urls, classifiers=release.classifiers, packages=packages, - data_files=data, |