Attachment 201087 Details for Bug 232240 – py-networkx1-rev3.patch

[patch] py-networkx1-rev3.patch

py-networkx1-rev3.patch (text/plain), 9.03 KB, created by Kai Knoblich on 2019-01-13 00:26:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-01-13 00:26:01 UTC

Size: 9.03 KB

patch

obsolete

>Index: py-networkx/Makefile
>===================================================================
>--- py-networkx/Makefile	(revision 490062)
>+++ py-networkx/Makefile	(working copy)
>@@ -23,6 +23,8 @@
> SHEBANG_GLOB=	*.py
> NO_ARCH=	yes
> 
>+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}networkx1
>+
> PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
> 
> OPTIONS_DEFINE=	EXAMPLES YAML
>Index: py-networkx/files/patch-setup.py
>===================================================================
>--- py-networkx/files/patch-setup.py	(revision 490062)
>+++ py-networkx/files/patch-setup.py	(working copy)
>@@ -1,10 +1,10 @@
>---- setup.py.orig	2018-08-20 04:50:16 UTC
>+--- setup.py.orig	2015-11-15 23:06:39 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',
>Index: py-networkx1/Makefile
>===================================================================
>--- py-networkx1/Makefile	(revision 490062)
>+++ py-networkx1/Makefile	(working copy)
>@@ -2,53 +2,54 @@
> # $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
>+USE_PYTHON=	autoplist concurrent distutils
> 
>-USES=		python shebangfix zip
>-USE_PYTHON=	autoplist concurrent distutils
>-SHEBANG_GLOB=	*.py
> NO_ARCH=	yes
>+PORTSCOUT=	limit:^5\.
>+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}
> 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>Index: py-networkx1/distinfo
>===================================================================
>--- py-networkx1/distinfo	(revision 490062)
>+++ py-networkx1/distinfo	(working copy)
>@@ -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
>Index: py-networkx1/files/patch-setup.py
>===================================================================
>--- py-networkx1/files/patch-setup.py	(revision 490062)
>+++ py-networkx1/files/patch-setup.py	(working copy)
>@@ -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',
>Index: py-networkx1/pkg-descr
>===================================================================
>--- py-networkx1/pkg-descr	(revision 490062)
>+++ py-networkx1/pkg-descr	(working copy)
>@@ -18,4 +18,6 @@
> * 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/

Actions: View | Diff

Attachments on bug 232240: 198122 | 201069 | 201078 | 201087