py-graphviz: added version 0.8.4

4 files changed, 54 insertions, 95 deletions

diff --git a/graphics/py-graphviz/DESCR b/graphics/py-graphviz/DESCR
index 8f92ca7171a..5a52c6269be 100644
--- a/graphics/py-graphviz/DESCR
+++ b/graphics/py-graphviz/DESCR
@@ -1,6 +1,7 @@
-PyGraphviz is a Python interface to the Graphviz graph layout
-and visualization package. With PyGraphviz you can create,
-edit, read, write, and draw graphs using Python to access the
-Graphviz graph data structure and layout algorithms. PyGraphviz
-is independent from NetworkX but provides a similar programming
-interface.
+This package facilitates the creation and rendering of graph descriptions in
+the DOT language of the Graphviz graph drawing software (master repo) from
+Python.
+
+Create a graph object, assemble the graph by adding nodes and edges, and
+retrieve its DOT source code string. Save the source code to a file and render
+it with the Graphviz installation of your system.
diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile
index 8bd9349a193..5ee75136663 100644
--- a/graphics/py-graphviz/Makefile
+++ b/graphics/py-graphviz/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2018/03/12 11:16:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/17 13:05:47 adam Exp $
 
-DISTNAME=	pygraphviz-1.3.1
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygraphviz/}
+DISTNAME=	graphviz-0.8.4
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	graphics python
+MASTER_SITES=	${MASTER_SITE_PYPI:=g/graphviz/}
+EXTRACT_SUFX=	.zip
 
-MAINTAINER=	helgoman@users.sourceforge.net
-HOMEPAGE=	http://networkx.lanl.gov/pygraphviz/index.html
-COMMENT=	Python interface to the Graphviz package
-LICENSE=	original-bsd
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/xflr6/graphviz
+COMMENT=	Create and render graph descriptions in DOT language
+LICENSE=	mit
 
-USE_TOOLS+=	pkg-config
+DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
+TEST_DEPENDS+=	${PYPKGPREFIX}-test>=3.4:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-mock>=1.8:../../devel/py-test-mock
+
+USE_LANGUAGES=	# none
+
+do-test:
+	cd ${WRKSRC}/tests && pytest-${PYVERSSUFFIX}
 
-.include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-graphviz/PLIST b/graphics/py-graphviz/PLIST
index 03f781858d8..f4a9a6d15b8 100644
--- a/graphics/py-graphviz/PLIST
+++ b/graphics/py-graphviz/PLIST
@@ -1,76 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1 2015/11/19 07:38:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/07/17 13:05:47 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/pygraphviz/__init__.py
-${PYSITELIB}/pygraphviz/__init__.pyc
-${PYSITELIB}/pygraphviz/__init__.pyo
-${PYSITELIB}/pygraphviz/_graphviz.so
-${PYSITELIB}/pygraphviz/agraph.py
-${PYSITELIB}/pygraphviz/agraph.pyc
-${PYSITELIB}/pygraphviz/agraph.pyo
-${PYSITELIB}/pygraphviz/graphviz.i
-${PYSITELIB}/pygraphviz/graphviz.py
-${PYSITELIB}/pygraphviz/graphviz.pyc
-${PYSITELIB}/pygraphviz/graphviz.pyo
-${PYSITELIB}/pygraphviz/graphviz_wrap.c
-${PYSITELIB}/pygraphviz/release.py
-${PYSITELIB}/pygraphviz/release.pyc
-${PYSITELIB}/pygraphviz/release.pyo
-${PYSITELIB}/pygraphviz/tests/__init__.py
-${PYSITELIB}/pygraphviz/tests/__init__.pyc
-${PYSITELIB}/pygraphviz/tests/__init__.pyo
-${PYSITELIB}/pygraphviz/tests/test.py
-${PYSITELIB}/pygraphviz/tests/test.pyc
-${PYSITELIB}/pygraphviz/tests/test.pyo
-${PYSITELIB}/pygraphviz/tests/test_attribute_defaults.py
-${PYSITELIB}/pygraphviz/tests/test_attribute_defaults.pyc
-${PYSITELIB}/pygraphviz/tests/test_attribute_defaults.pyo
-${PYSITELIB}/pygraphviz/tests/test_attributes.py
-${PYSITELIB}/pygraphviz/tests/test_attributes.pyc
-${PYSITELIB}/pygraphviz/tests/test_attributes.pyo
-${PYSITELIB}/pygraphviz/tests/test_clear.py
-${PYSITELIB}/pygraphviz/tests/test_clear.pyc
-${PYSITELIB}/pygraphviz/tests/test_clear.pyo
-${PYSITELIB}/pygraphviz/tests/test_drawing.py
-${PYSITELIB}/pygraphviz/tests/test_drawing.pyc
-${PYSITELIB}/pygraphviz/tests/test_drawing.pyo
-${PYSITELIB}/pygraphviz/tests/test_edge_attributes.py
-${PYSITELIB}/pygraphviz/tests/test_edge_attributes.pyc
-${PYSITELIB}/pygraphviz/tests/test_edge_attributes.pyo
-${PYSITELIB}/pygraphviz/tests/test_graph.py
-${PYSITELIB}/pygraphviz/tests/test_graph.pyc
-${PYSITELIB}/pygraphviz/tests/test_graph.pyo
-${PYSITELIB}/pygraphviz/tests/test_html.py
-${PYSITELIB}/pygraphviz/tests/test_html.pyc
-${PYSITELIB}/pygraphviz/tests/test_html.pyo
-${PYSITELIB}/pygraphviz/tests/test_layout.py
-${PYSITELIB}/pygraphviz/tests/test_layout.pyc
-${PYSITELIB}/pygraphviz/tests/test_layout.pyo
-${PYSITELIB}/pygraphviz/tests/test_node_attributes.py
-${PYSITELIB}/pygraphviz/tests/test_node_attributes.pyc
-${PYSITELIB}/pygraphviz/tests/test_node_attributes.pyo
-${PYSITELIB}/pygraphviz/tests/test_readwrite.py
-${PYSITELIB}/pygraphviz/tests/test_readwrite.pyc
-${PYSITELIB}/pygraphviz/tests/test_readwrite.pyo
-${PYSITELIB}/pygraphviz/tests/test_string.py
-${PYSITELIB}/pygraphviz/tests/test_string.pyc
-${PYSITELIB}/pygraphviz/tests/test_string.pyo
-${PYSITELIB}/pygraphviz/tests/test_subgraph.py
-${PYSITELIB}/pygraphviz/tests/test_subgraph.pyc
-${PYSITELIB}/pygraphviz/tests/test_subgraph.pyo
-${PYSITELIB}/pygraphviz/tests/test_unicode.py
-${PYSITELIB}/pygraphviz/tests/test_unicode.pyc
-${PYSITELIB}/pygraphviz/tests/test_unicode.pyo
-${PYSITELIB}/pygraphviz/version.py
-${PYSITELIB}/pygraphviz/version.pyc
-${PYSITELIB}/pygraphviz/version.pyo
-share/doc/pygraphviz-${PKGVERSION}/INSTALL.txt
-share/doc/pygraphviz-${PKGVERSION}/examples/attributes.py
-share/doc/pygraphviz-${PKGVERSION}/examples/django_simple.py
-share/doc/pygraphviz-${PKGVERSION}/examples/miles.py
-share/doc/pygraphviz-${PKGVERSION}/examples/simple.py
-share/doc/pygraphviz-${PKGVERSION}/examples/star.py
-share/doc/pygraphviz-${PKGVERSION}/examples/subgraph.py
-share/doc/pygraphviz-${PKGVERSION}/examples/utf8_encoding.py
+${PYSITELIB}/graphviz/__init__.py
+${PYSITELIB}/graphviz/__init__.pyc
+${PYSITELIB}/graphviz/__init__.pyo
+${PYSITELIB}/graphviz/_compat.py
+${PYSITELIB}/graphviz/_compat.pyc
+${PYSITELIB}/graphviz/_compat.pyo
+${PYSITELIB}/graphviz/backend.py
+${PYSITELIB}/graphviz/backend.pyc
+${PYSITELIB}/graphviz/backend.pyo
+${PYSITELIB}/graphviz/dot.py
+${PYSITELIB}/graphviz/dot.pyc
+${PYSITELIB}/graphviz/dot.pyo
+${PYSITELIB}/graphviz/files.py
+${PYSITELIB}/graphviz/files.pyc
+${PYSITELIB}/graphviz/files.pyo
+${PYSITELIB}/graphviz/lang.py
+${PYSITELIB}/graphviz/lang.pyc
+${PYSITELIB}/graphviz/lang.pyo
+${PYSITELIB}/graphviz/tools.py
+${PYSITELIB}/graphviz/tools.pyc
+${PYSITELIB}/graphviz/tools.pyo
diff --git a/graphics/py-graphviz/distinfo b/graphics/py-graphviz/distinfo
index 4f5f243956f..1d40896d921 100644
--- a/graphics/py-graphviz/distinfo
+++ b/graphics/py-graphviz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/03/23 17:06:53 joerg Exp $
+$NetBSD: distinfo,v 1.3 2018/07/17 13:05:47 adam Exp $
 
-SHA1 (pygraphviz-1.3.1.tar.gz) = 1ecd96727d0c160e1d00519c56dc4672af929ca7
-RMD160 (pygraphviz-1.3.1.tar.gz) = ad690efaf662dde04163a1acee0f4edfcf588221
-SHA512 (pygraphviz-1.3.1.tar.gz) = e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc
-Size (pygraphviz-1.3.1.tar.gz) = 103336 bytes
+SHA1 (graphviz-0.8.4.zip) = 5262cee2158b92fc99d5bedd68cb697911794168
+RMD160 (graphviz-0.8.4.zip) = f40842bf9bc574b34754f7b1bfd267e5a75fc633
+SHA512 (graphviz-0.8.4.zip) = 88f77093525e16b65e983d58f6b3f341b5da90aebe7bc2dd168278928b7e0950c0c9d59c7969610ef05d27b19d8a61c2a44a7ad4127d1d8b5828f9a51bfd1fb3
+Size (graphviz-0.8.4.zip) = 166273 bytes