py-pygraphviz: updated to 1.7

pygraphviz-1.7

Drop Python 3.6 support
Add Python 3.9 support
Require Graphviz 2.42+, (Graphviz 2.46+ recommended)
Improve installation process and documentation
Switch from nose to pytest
Remove old Python 2 code
AGraph.eq includes attribute comparison

3 files changed, 25 insertions, 31 deletions

diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile
index a36f3f012f9..764a2fe5b15 100644
--- a/graphics/py-pygraphviz/Makefile
+++ b/graphics/py-pygraphviz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/11/04 10:01:29 adam Exp $
+# $NetBSD: Makefile,v 1.10 2021/02/05 22:06:16 adam Exp $
 
-DISTNAME=	pygraphviz-1.6
+DISTNAME=	pygraphviz-1.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygraphviz/}
@@ -17,7 +17,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
 
 USE_TOOLS+=	pkg-config
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	27 36
 
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/graphics/py-pygraphviz/PLIST b/graphics/py-pygraphviz/PLIST
index ec229a9bc10..5637c37ef9e 100644
--- a/graphics/py-pygraphviz/PLIST
+++ b/graphics/py-pygraphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/11/04 10:01:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/02/05 22:06:16 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -15,21 +15,18 @@ ${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/scraper.py
+${PYSITELIB}/pygraphviz/scraper.pyc
+${PYSITELIB}/pygraphviz/scraper.pyo
+${PYSITELIB}/pygraphviz/testing.py
+${PYSITELIB}/pygraphviz/testing.pyc
+${PYSITELIB}/pygraphviz/testing.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
@@ -57,9 +54,9 @@ ${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_setup.py
-${PYSITELIB}/pygraphviz/tests/test_setup.pyc
-${PYSITELIB}/pygraphviz/tests/test_setup.pyo
+${PYSITELIB}/pygraphviz/tests/test_scraper.py
+${PYSITELIB}/pygraphviz/tests/test_scraper.pyc
+${PYSITELIB}/pygraphviz/tests/test_scraper.pyo
 ${PYSITELIB}/pygraphviz/tests/test_string.py
 ${PYSITELIB}/pygraphviz/tests/test_string.pyc
 ${PYSITELIB}/pygraphviz/tests/test_string.pyo
@@ -69,14 +66,11 @@ ${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
+share/doc/pygraphviz-${PKGVERSION}/examples/plot_attributes.py
+share/doc/pygraphviz-${PKGVERSION}/examples/plot_miles.py
+share/doc/pygraphviz-${PKGVERSION}/examples/plot_simple.py
+share/doc/pygraphviz-${PKGVERSION}/examples/plot_star.py
+share/doc/pygraphviz-${PKGVERSION}/examples/plot_subgraph.py
+share/doc/pygraphviz-${PKGVERSION}/examples/skip_django_simple.py
+share/doc/pygraphviz-${PKGVERSION}/examples/skip_utf8_encoding.py
diff --git a/graphics/py-pygraphviz/distinfo b/graphics/py-pygraphviz/distinfo
index c162f235938..1d94369fca4 100644
--- a/graphics/py-pygraphviz/distinfo
+++ b/graphics/py-pygraphviz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/11/04 10:01:29 adam Exp $
+$NetBSD: distinfo,v 1.6 2021/02/05 22:06:16 adam Exp $
 
-SHA1 (pygraphviz-1.6.zip) = 848dd67e5a2f3485c00ab46d56f44339fe70b3f4
-RMD160 (pygraphviz-1.6.zip) = 678553828ebae0ce9d77eac1f489b37a2cbb5579
-SHA512 (pygraphviz-1.6.zip) = 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
-Size (pygraphviz-1.6.zip) = 117043 bytes
+SHA1 (pygraphviz-1.7.zip) = c2623b395bba226ba3a79726f79b7c103a66a1f3
+RMD160 (pygraphviz-1.7.zip) = 88a13bc1bb91bf97dcca92649d6d9dcaa12d084e
+SHA512 (pygraphviz-1.7.zip) = 09438931d1930a70f7da94b0a12b449c0836ad707c6c8abed49bae0db162c136002d170398ed02dc56a5029269490ce3156d2d4b0f30602a11165bc0038998ea
+Size (pygraphviz-1.7.zip) = 118754 bytes