svn commit: r477632 - in head/math/py-networkx: . files

[Yuri Victorovich]

Author: yuri
Date: Mon Aug 20 07:39:32 2018
New Revision: 477632
URL: https://svnweb.freebsd.org/changeset/ports/477632

Log:
  math/py-networkx: Update 1.10 -> 2.1
  
  PR:		229815
  Reported by:	jwb
  Approved by:	dikshie at sfc.wide.ad.jp (maintainer)

Modified:
  head/math/py-networkx/Makefile
  head/math/py-networkx/distinfo
  head/math/py-networkx/files/patch-setup.py

Modified: head/math/py-networkx/Makefile
==============================================================================
--- head/math/py-networkx/Makefile	Mon Aug 20 06:48:55 2018	(r477631)
+++ head/math/py-networkx/Makefile	Mon Aug 20 07:39:32 2018	(r477632)
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	networkx
-PORTVERSION=	1.10
-PORTREVISION=	4
+DISTVERSION=	2.1
 CATEGORIES=	math python
-MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dikshie at sfc.wide.ad.jp
@@ -14,17 +12,15 @@ COMMENT=	Tools for complex networks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR}
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}decorator>=4.1.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}
 
-NO_ARCH=	yes
-USES=		python shebangfix
+USES=		python shebangfix zip
 USE_PYTHON=	autoplist concurrent distutils
-SHEBANG_FILES=	examples/graph/atlas.py \
-		examples/multigraph/chess_masters.py \
-		networkx/generators/tests/test_random_graphs.py
+SHEBANG_GLOB=	*.py
+NO_ARCH=	yes
 
 PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
 

Modified: head/math/py-networkx/distinfo
==============================================================================
--- head/math/py-networkx/distinfo	Mon Aug 20 06:48:55 2018	(r477631)
+++ head/math/py-networkx/distinfo	Mon Aug 20 07:39:32 2018	(r477632)
@@ -1,2 +1,3 @@
-SHA256 (networkx-1.10.tar.gz) = ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8
-SIZE (networkx-1.10.tar.gz) = 1189291
+TIMESTAMP = 1534738249
+SHA256 (networkx-2.1.zip) = 64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1
+SIZE (networkx-2.1.zip) = 1612593

Modified: head/math/py-networkx/files/patch-setup.py
==============================================================================
--- head/math/py-networkx/files/patch-setup.py	Mon Aug 20 06:48:55 2018	(r477631)
+++ head/math/py-networkx/files/patch-setup.py	Mon Aug 20 07:39:32 2018	(r477632)
@@ -1,10 +1,10 @@
---- setup.py.orig	2015-11-15 23:06:39 UTC
+--- setup.py.orig	2018-08-20 04:50:16 UTC
 +++ setup.py
-@@ -59,27 +59,6 @@ packages=["networkx",
-           "networkx.testing",
-           "networkx.utils"]
+@@ -57,28 +57,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,25 +14,26 @@
 -          '3d_drawing',
 -          'drawing',
 -          'graph',
--          'multigraph',
+-          'javascript',
+-          'jit',
 -          'pygraphviz',
--          'readwrite']:
--    dd = os.path.join(docdirbase,'examples', d)
+-          'subclass']:
+-    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'],
-@@ -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',
+@@ -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,