CVS commit: pkgsrc/math/py-networkx

["Wen Heping" <wen%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wen
Date:           Fri Aug 12 13:38:22 UTC 2016

Modified Files:
        pkgsrc/math/py-networkx: Makefile PLIST distinfo

Log Message:
Update to 1.11
Update DEPENDS
Based on PR/51271 from kamelderouiche%yahoo.com@localhost

Upstream changes:
1.11

API changes

    [#1930] No longer import nx_agraph and nx_pydot into the top-level namespace. They can be accessed within networkx as e.g. nx.nx_agraph.write_dot or imported as from networkx.drawing.nx_agraph 
import write_dot.
    [#1750] Arguments center and scale are now available for all layout functions. The defaul values revert to the v1.9 values (center is the origin for circular layouts and domain is [0, scale) for 
others.
    [#1924] Replace pydot with pydotplus for drawing with the pydot interface.
    [#1888] Replace support for Python3.2 with support for Python 3.5.

Miscellaneous changes

    [#1763] Set up appveyor to automatically test installation on Windows machines. Remove symbolic links in examples to help such istallation.

Change many doc_string typos to allow sphinx to build the docs without errors or warnings.

Enable the docs to be automatically built on readthedocs.org by changing requirements.txt


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/math/py-networkx/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/py-networkx/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/py-networkx/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-networkx/Makefile
diff -u pkgsrc/math/py-networkx/Makefile:1.20 pkgsrc/math/py-networkx/Makefile:1.21
--- pkgsrc/math/py-networkx/Makefile:1.20       Sat Jul  9 13:03:55 2016
+++ pkgsrc/math/py-networkx/Makefile    Fri Aug 12 13:38:22 2016
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2016/07/09 13:03:55 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2016/08/12 13:38:22 wen Exp $
 
-DISTNAME=      networkx-1.10
+DISTNAME=      networkx-1.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    math python
-MASTER_SITES=  ${MASTER_SITE_PYPI:=n/networkx/} \
-               http://networkx.lanl.gov/download/networkx/
+MASTER_SITES=  ${MASTER_SITE_PYPI:=n/networkx/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://networkx.lanl.gov/
+HOMEPAGE=      http://networkx.github.io/
 COMMENT=       Python package for creating and manipulating graphs and networks
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-decorator>=3.4.0:../../devel/py-decorator
+DEPENDS+=      ${PYPKGPREFIX}-decorator>=4.0.10:../../devel/py-decorator
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
 
 USE_LANGUAGES= # none
@@ -41,6 +40,5 @@ SUBST_FILES.python+=  networkx/algorithms
 SUBST_MESSAGE.python=  Fixing path to Python interpreter.
 SUBST_SED.python=      -e "s,/usr/bin/env python,${PYTHONBIN},g"
 
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/py-networkx/PLIST
diff -u pkgsrc/math/py-networkx/PLIST:1.11 pkgsrc/math/py-networkx/PLIST:1.12
--- pkgsrc/math/py-networkx/PLIST:1.11  Sun Nov  1 09:58:28 2015
+++ pkgsrc/math/py-networkx/PLIST       Fri Aug 12 13:38:22 2016
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2015/11/01 09:58:28 wiz Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/not-zip-safe
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.12 2016/08/12 13:38:22 wen Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/networkx/__init__.py
 ${PYSITELIB}/networkx/__init__.pyc
 ${PYSITELIB}/networkx/__init__.pyo
@@ -1187,3 +1187,4 @@ share/doc/networkx-${PKGVERSION}/example
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_draw.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/pygraphviz_simple.py
 share/doc/networkx-${PKGVERSION}/examples/pygraphviz/write_dotfile.py
+@pkgdir share/doc/networkx-${PKGVERSION}/examples/readwrite

Index: pkgsrc/math/py-networkx/distinfo
diff -u pkgsrc/math/py-networkx/distinfo:1.8 pkgsrc/math/py-networkx/distinfo:1.9
--- pkgsrc/math/py-networkx/distinfo:1.8        Sun Nov  1 09:58:28 2015
+++ pkgsrc/math/py-networkx/distinfo    Fri Aug 12 13:38:22 2016
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/01 09:58:28 wiz Exp $
+$NetBSD: distinfo,v 1.9 2016/08/12 13:38:22 wen Exp $
 
-SHA1 (networkx-1.10.tar.gz) = 99292e464c25be5e96de295752880bf5e5f1848a
-RMD160 (networkx-1.10.tar.gz) = 01b5ce1be48596a31f9b01e22857d33ea0e0d527
-SHA512 (networkx-1.10.tar.gz) = fc0a0b929991baef63c30382c2045d551b217140393a4264b18a5f1be198d325eee9f57e02dda38a7ad9f99771c5b78f82c673a88b04df122b9d91852db09efd
-Size (networkx-1.10.tar.gz) = 1189291 bytes
+SHA1 (networkx-1.11.tar.gz) = ac24380b13dfe92633370ad2091c0c04b6d098a2
+RMD160 (networkx-1.11.tar.gz) = f8338d0bf5327dc29e25a7a94bfe363ca25d228b
+SHA512 (networkx-1.11.tar.gz) = 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
+Size (networkx-1.11.tar.gz) = 1315737 bytes