Date: Sun, 13 Jan 2019 17:36:49 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490159 - in head/math: . py-networkx py-networkx1 py-networkx1/files Message-ID: <201901131736.x0DHanxV019905@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Jan 13 17:36:49 2019 New Revision: 490159 URL: https://svnweb.freebsd.org/changeset/ports/490159 Log: - Copy math/py-networkx to math/py-networkx1 and applies modifications to backport it to the latest version of the 1.x branch -> 1.11 - Adds CONFLICTS_INSTALL to math/py-networkx (no bump of PORTVERSION) and math/py-networkx1 - math/py-networkx1 is required by the package devel/py-taskflow that is not compatible with math/py-network PR: 232240 Submitted by: freebsd_ports@k-worx.org Sponsored by: iXsystems Inc. Added: head/math/py-networkx1/ - copied from r490157, head/math/py-networkx/ Modified: head/math/Makefile head/math/py-networkx/Makefile head/math/py-networkx1/Makefile head/math/py-networkx1/distinfo head/math/py-networkx1/files/patch-setup.py head/math/py-networkx1/pkg-descr Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Sun Jan 13 17:28:15 2019 (r490158) +++ head/math/Makefile Sun Jan 13 17:36:49 2019 (r490159) @@ -721,6 +721,7 @@ SUBDIR += py-mpmath SUBDIR += py-munkres SUBDIR += py-networkx + SUBDIR += py-networkx1 SUBDIR += py-numarray SUBDIR += py-numeric SUBDIR += py-numexpr Modified: head/math/py-networkx/Makefile ============================================================================== --- head/math/py-networkx/Makefile Sun Jan 13 17:28:15 2019 (r490158) +++ head/math/py-networkx/Makefile Sun Jan 13 17:36:49 2019 (r490159) @@ -23,6 +23,8 @@ USE_PYTHON= autoplist concurrent distutils SHEBANG_GLOB= *.py NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}networkx1 + PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} OPTIONS_DEFINE= EXAMPLES YAML Modified: head/math/py-networkx1/Makefile ============================================================================== --- head/math/py-networkx/Makefile Sun Jan 13 17:08:26 2019 (r490157) +++ head/math/py-networkx1/Makefile Sun Jan 13 17:36:49 2019 (r490159) @@ -2,52 +2,53 @@ # $FreeBSD$ PORTNAME= networkx -DISTVERSION= 2.1 -PORTREVISION= 1 +PORTVERSION= 1.11 CATEGORIES= math python -MASTER_SITES= CHEESESHOP +MASTER_SITES= http://networkx.lanl.gov/download/networkx/ \ + CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 1 -MAINTAINER= dikshie@sfc.wide.ad.jp -COMMENT= Tools for complex networks +MAINTAINER= freebsd_ports@k-worx.org +COMMENT= Tools for complex networks / Backported version LICENSE= BSD3CLAUSE -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=4.1.0:devel/py-decorator@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} -# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${PY_FLAVOR} \ -# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${PY_FLAVOR} - -USES= python shebangfix zip +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils -SHEBANG_GLOB= *.py + NO_ARCH= yes +PORTSCOUT= limit:^1\. +PORTEXAMPLES= * +SHEBANG_FILES= examples/graph/atlas.py \ + examples/multigraph/chess_masters.py \ + networkx/generators/tests/test_random_graphs.py -PLIST_SUB+= PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}py-networkx OPTIONS_DEFINE= EXAMPLES YAML OPTIONS_GROUP= MATRIX RENDER OPTIONS_GROUP_MATRIX= NUMPY SCIPY -OPTIONS_GROUP_RENDER= MPL GRAPHVIZ -OPTIONS_DEFAULT= NUMPY SCIPY MPL GRAPHVIZ YAML +OPTIONS_GROUP_RENDER= GRAPHVIZ MPL +OPTIONS_DEFAULT= GRAPHVIZ MPL NUMPY SCIPY YAML -NUMPY_DESC= Matrix representation of graphs +GRAPHVIZ_DESC= Additional graph layout and rendering algorithms +GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR} + +MPL_DESC= Flexible graph rendering +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${PY_FLAVOR} + +NUMPY_DESC= Matrix representation of graphs NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${PY_FLAVOR} -SCIPY_DESC= Sparse matrix representation of graphs +SCIPY_DESC= Sparse matrix representation of graphs SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1: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>=1.4.0:math/py-matplotlib@${PY_FLAVOR} - -GRAPHVIZ_DESC= Additional graph layout and rendering algorithms -GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${PY_FLAVOR} - -YAML_DESC= Reading and writing YAML files +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} Modified: head/math/py-networkx1/distinfo ============================================================================== --- head/math/py-networkx/distinfo Sun Jan 13 17:08:26 2019 (r490157) +++ head/math/py-networkx1/distinfo Sun Jan 13 17:36:49 2019 (r490159) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534738249 -SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1 -SIZE (networkx-2.1.zip) = 1612593 +TIMESTAMP = 1539454780 +SHA256 (networkx-1.11.tar.gz) = 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 +SIZE (networkx-1.11.tar.gz) = 1315737 Modified: head/math/py-networkx1/files/patch-setup.py ============================================================================== --- head/math/py-networkx/files/patch-setup.py Sun Jan 13 17:08:26 2019 (r490157) +++ head/math/py-networkx1/files/patch-setup.py Sun Jan 13 17:36:49 2019 (r490159) @@ -1,10 +1,10 @@ ---- setup.py.orig 2018-08-20 04:50:16 UTC +--- setup.py.orig 2015-12-26 17:06:48 UTC +++ setup.py -@@ -57,28 +57,6 @@ packages = ["networkx", - "networkx.testing", - "networkx.utils"] +@@ -59,27 +59,6 @@ packages=["networkx", + "networkx.testing", + "networkx.utils"] --docdirbase = 'share/doc/networkx-%s' % version +-docdirbase = 'share/doc/networkx-%s' % version -# add basic documentation -data = [(docdirbase, glob("*.txt"))] -# add examples @@ -14,26 +14,25 @@ - '3d_drawing', - 'drawing', - 'graph', -- 'javascript', -- 'jit', +- 'multigraph', - 'pygraphviz', -- 'subclass']: -- dd = os.path.join(docdirbase, 'examples', d) +- 'readwrite']: +- dd = os.path.join(docdirbase,'examples', d) - pp = os.path.join('examples', d) -- 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")))) +- 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 the tests - package_data = { + package_data = { 'networkx': ['tests/*.py'], -@@ -130,7 +108,6 @@ if __name__ == "__main__": - download_url=release.download_url, - classifiers=release.classifiers, - packages=packages, -- data_files=data, - package_data=package_data, - install_requires=install_requires, - extras_require=extras_require, +@@ -131,7 +110,6 @@ if __name__ == "__main__": + download_url = release.download_url, + classifiers = release.classifiers, + packages = packages, +- data_files = data, + package_data = package_data, + install_requires = install_requires, + test_suite = 'nose.collector', Modified: head/math/py-networkx1/pkg-descr ============================================================================== --- head/math/py-networkx/pkg-descr Sun Jan 13 17:08:26 2019 (r490157) +++ head/math/py-networkx1/pkg-descr Sun Jan 13 17:36:49 2019 (r490159) @@ -18,4 +18,6 @@ Additional benefits due to Python: * Multi-platform * Allows easy access to almost any database +Note: This is a backported version of the 1.x branch. + WWW: https://networkx.github.io/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901131736.x0DHanxV019905>