View | Details | Raw Unified | Return to bug 204594 | Differences between
and this patch

Collapse All | Expand All

(-)math/py-networkx/Makefile (-10 / +11 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	networkx
4
PORTNAME=	networkx
5
PORTVERSION=	1.9.1
5
PORTVERSION=	1.10
6
PORTREVISION=	1
7
CATEGORIES=	math python
6
CATEGORIES=	math python
8
MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
7
MASTER_SITES=	http://networkx.lanl.gov/download/networkx/ \
9
		CHEESESHOP
8
		CHEESESHOP
Lines 20-49 Link Here
20
#		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
19
#		${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
21
20
22
USES=		python shebangfix
21
USES=		python shebangfix
23
USE_PYTHON=	distutils autoplist
22
USE_PYTHON=	autoplist concurrent distutils
24
23
25
PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
24
PLIST_SUB+=	PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER}
26
25
27
OPTIONS_DEFINE=	EXAMPLES
26
OPTIONS_DEFINE=	EXAMPLES YAML
28
OPTIONS_GROUP=	MATRIX RENDER
27
OPTIONS_GROUP=	MATRIX RENDER
29
OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
28
OPTIONS_GROUP_MATRIX=	NUMPY SCIPY
30
OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
29
OPTIONS_GROUP_RENDER=	MPL GRAPHVIZ
31
OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ
30
OPTIONS_DEFAULT=	NUMPY SCIPY MPL GRAPHVIZ YAML
32
31
33
NUMPY_DESC=	Support matrix representation of graphs
32
NUMPY_DESC=	Matrix representation of graphs
34
NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy
33
NUMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2:${PORTSDIR}/math/py-numpy
35
34
36
SCIPY_DESC=	Support sparse matrix representation of graphs
35
SCIPY_DESC=	Sparse matrix representation of graphs
37
SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
36
SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:${PORTSDIR}/science/py-scipy \
38
			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse
37
			${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:${PORTSDIR}/science/py-scikit-sparse
39
38
40
MPL_DESC=	Support flexible graph rendering
39
MPL_DESC=	Flexible graph rendering
41
MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
40
MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:${PORTSDIR}/math/py-matplotlib
42
41
43
GRAPHVIZ_DESC=	Support additional graph layout and rendering algorithms
42
GRAPHVIZ_DESC=	Additional graph layout and rendering algorithms
44
GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz
43
GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.2:${PORTSDIR}/graphics/py-graphviz
45
44
46
EXAMPLESDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
45
YAML_DESC=	Reading and writing YAML files
46
YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
47
47
PORTEXAMPLES=	*
48
PORTEXAMPLES=	*
48
49
49
post-install:
50
post-install:
(-)math/py-networkx/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (networkx-1.9.1.tar.gz) = 6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59
1
SHA256 (networkx-1.10.tar.gz) = ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8
2
SIZE (networkx-1.9.1.tar.gz) = 1035784
2
SIZE (networkx-1.10.tar.gz) = 1189291
(-)math/py-networkx/files/patch-setup.py (-4 / +12 lines)
Lines 1-6 Link Here
1
--- setup.py.orig	2015-06-06 09:03:01 UTC
1
--- setup.py.orig	2015-11-15 23:06:39 UTC
2
+++ setup.py
2
+++ setup.py
3
@@ -58,26 +58,7 @@ packages=["networkx",
3
@@ -59,27 +59,6 @@ packages=["networkx",
4
           "networkx.testing",
4
           "networkx.testing",
5
           "networkx.utils"]
5
           "networkx.utils"]
6
 
6
 
Lines 24-30 Link Here
24
-    data.append((dd, glob(os.path.join(pp ,"*.gz"))))
24
-    data.append((dd, glob(os.path.join(pp ,"*.gz"))))
25
-    data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
25
-    data.append((dd, glob(os.path.join(pp ,"*.mbox"))))
26
-    data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
26
-    data.append((dd, glob(os.path.join(pp ,"*.edgelist"))))
27
+data = [ ]
27
-
28
 
29
 # add the tests
28
 # add the tests
30
 package_data     = {
29
 package_data     = {
30
     'networkx': ['tests/*.py'],
31
@@ -131,7 +110,6 @@ if __name__ == "__main__":
32
         download_url     = release.download_url,
33
         classifiers      = release.classifiers,
34
         packages         = packages,
35
-        data_files       = data,
36
         package_data     = package_data,
37
         install_requires = install_requires,
38
         test_suite       = 'nose.collector',
(-)math/py-networkx/pkg-message (-4 lines)
Lines 1-4 Link Here
1
----------------------------------------------------------
2
It is better if you also install py-numpy, py-graphviz and
3
py-matplotlib so you can use all features of py-networkx.
4
----------------------------------------------------------

Return to bug 204594