From owner-svn-ports-all@freebsd.org Mon Aug 20 07:39:34 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 569871087985; Mon, 20 Aug 2018 07:39:34 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 060137FEC5; Mon, 20 Aug 2018 07:39:34 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB2A9124D1; Mon, 20 Aug 2018 07:39:33 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7K7dXAf086146; Mon, 20 Aug 2018 07:39:33 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7K7dX06086143; Mon, 20 Aug 2018 07:39:33 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201808200739.w7K7dX06086143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 20 Aug 2018 07:39:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477632 - in head/math/py-networkx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/py-networkx: . files X-SVN-Commit-Revision: 477632 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2018 07:39:34 -0000 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@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@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,