py-txtorcon: updated to 20.0.0

v20.0.0:
I'm pleased to announce txtorcon 20.0.0. This fixes a few bugs and
officially deprecates Python 2 support.

 * Use real GeoIP database or nothing (https://github.com/meejah/txtorcon/issues/250)
 * Change abstract base classes import in preperation for Python 3.8
 * Python 3.4 is no longer supported
 * Python 2 is deprecated; all new code should be Python 3. Support
   for Python 2 will be removed in a future release.

3 files changed, 69 insertions, 74 deletions

diff --git a/net/py-txtorcon/Makefile b/net/py-txtorcon/Makefile
index f4b0489f574..5f9b7d0fe67 100644
--- a/net/py-txtorcon/Makefile
+++ b/net/py-txtorcon/Makefile
@@ -1,35 +1,30 @@
-# $NetBSD: Makefile,v 1.2 2019/02/28 06:31:57 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/16 17:55:38 adam Exp $
 
-DISTNAME=	txtorcon-19.0.0
+DISTNAME=	txtorcon-20.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
-MASTER_SITES=	${MASTER_SITE_GITHUB:=meejah/}
-GITHUB_PROJECT=	txtorcon
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_PYPI:=t/txtorcon/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://txtorcon.readthedocs.io/
 COMMENT=	Twisted Python library for controlling tor daemon
 LICENSE=	mit
 
-USE_LANGUAGES=	# none
-
-.include "../../lang/python/pyversion.mk"
-
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
 DEPENDS+=	${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
+DEPENDS+=	${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
-.if ${_PYTHON_VERSION} < 33
-DEPENDS+=	${PYPKGPREFIX}-ipaddress>=1.0.16:../../net/py-ipaddress
-.endif
 DEPENDS+=	${PYPKGPREFIX}-twisted>=15.5.0:../../net/py-twisted
-
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
+USE_LANGUAGES=	# none
+
 CHECK_INTERPRETER_SKIP+=	share/txtorcon/examples/*
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 do-test:
-	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+	cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-txtorcon/PLIST b/net/py-txtorcon/PLIST
index 6d33f55503c..4f532811826 100644
--- a/net/py-txtorcon/PLIST
+++ b/net/py-txtorcon/PLIST
@@ -1,81 +1,81 @@
-@comment $NetBSD: PLIST,v 1.3 2019/02/28 06:31:57 wiz Exp $
-${PYSITELIB}/twisted/plugins/txtorcon_endpoint_parser.pyo
-${PYSITELIB}/twisted/plugins/txtorcon_endpoint_parser.pyc
+@comment $NetBSD: PLIST,v 1.4 2020/05/16 17:55:38 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}/twisted/plugins/txtorcon_endpoint_parser.py
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/twisted/plugins/txtorcon_endpoint_parser.pyc
+${PYSITELIB}/twisted/plugins/txtorcon_endpoint_parser.pyo
 ${PYSITELIB}/txtorcon/__init__.py
-${PYSITELIB}/txtorcon/__init__.pyo
 ${PYSITELIB}/txtorcon/__init__.pyc
-${PYSITELIB}/txtorcon/_metadata.pyo
-${PYSITELIB}/txtorcon/_metadata.pyc
-${PYSITELIB}/txtorcon/_microdesc_parser.pyo
-${PYSITELIB}/txtorcon/_microdesc_parser.pyc
-${PYSITELIB}/txtorcon/addrmap.pyo
-${PYSITELIB}/txtorcon/addrmap.pyc
-${PYSITELIB}/txtorcon/attacher.pyo
-${PYSITELIB}/txtorcon/attacher.pyc
-${PYSITELIB}/txtorcon/circuit.pyo
-${PYSITELIB}/txtorcon/circuit.pyc
-${PYSITELIB}/txtorcon/controller.pyo
-${PYSITELIB}/txtorcon/controller.pyc
-${PLIST.py3x}${PYSITELIB}/txtorcon/controller_py3.pyo
-${PLIST.py3x}${PYSITELIB}/txtorcon/controller_py3.pyc
-${PYSITELIB}/txtorcon/endpoints.pyo
-${PYSITELIB}/txtorcon/endpoints.pyc
-${PYSITELIB}/txtorcon/interface.pyo
-${PYSITELIB}/txtorcon/interface.pyc
-${PYSITELIB}/txtorcon/log.pyo
-${PYSITELIB}/txtorcon/log.pyc
-${PYSITELIB}/txtorcon/onion.pyo
-${PYSITELIB}/txtorcon/onion.pyc
-${PYSITELIB}/txtorcon/router.pyo
-${PYSITELIB}/txtorcon/router.pyc
-${PYSITELIB}/txtorcon/socks.pyo
-${PYSITELIB}/txtorcon/socks.pyc
-${PYSITELIB}/txtorcon/spaghetti.pyo
-${PYSITELIB}/txtorcon/spaghetti.pyc
-${PYSITELIB}/txtorcon/stream.pyo
-${PYSITELIB}/txtorcon/stream.pyc
-${PYSITELIB}/txtorcon/testutil.pyo
-${PYSITELIB}/txtorcon/testutil.pyc
-${PYSITELIB}/txtorcon/torconfig.pyo
-${PYSITELIB}/txtorcon/torconfig.pyc
-${PYSITELIB}/txtorcon/torcontrolprotocol.pyo
-${PYSITELIB}/txtorcon/torcontrolprotocol.pyc
-${PYSITELIB}/txtorcon/torinfo.pyo
-${PYSITELIB}/txtorcon/torinfo.pyc
-${PYSITELIB}/txtorcon/torstate.pyo
-${PYSITELIB}/txtorcon/torstate.pyc
-${PYSITELIB}/txtorcon/util.pyo
-${PYSITELIB}/txtorcon/util.pyc
-${PYSITELIB}/txtorcon/web.pyo
-${PYSITELIB}/txtorcon/web.pyc
+${PYSITELIB}/txtorcon/__init__.pyo
 ${PYSITELIB}/txtorcon/_metadata.py
+${PYSITELIB}/txtorcon/_metadata.pyc
+${PYSITELIB}/txtorcon/_metadata.pyo
 ${PYSITELIB}/txtorcon/_microdesc_parser.py
+${PYSITELIB}/txtorcon/_microdesc_parser.pyc
+${PYSITELIB}/txtorcon/_microdesc_parser.pyo
 ${PYSITELIB}/txtorcon/addrmap.py
+${PYSITELIB}/txtorcon/addrmap.pyc
+${PYSITELIB}/txtorcon/addrmap.pyo
 ${PYSITELIB}/txtorcon/attacher.py
+${PYSITELIB}/txtorcon/attacher.pyc
+${PYSITELIB}/txtorcon/attacher.pyo
 ${PYSITELIB}/txtorcon/circuit.py
+${PYSITELIB}/txtorcon/circuit.pyc
+${PYSITELIB}/txtorcon/circuit.pyo
 ${PYSITELIB}/txtorcon/controller.py
+${PYSITELIB}/txtorcon/controller.pyc
+${PYSITELIB}/txtorcon/controller.pyo
 ${PYSITELIB}/txtorcon/controller_py3.py
+${PLIST.py3x}${PYSITELIB}/txtorcon/controller_py3.pyc
+${PLIST.py3x}${PYSITELIB}/txtorcon/controller_py3.pyo
 ${PYSITELIB}/txtorcon/endpoints.py
+${PYSITELIB}/txtorcon/endpoints.pyc
+${PYSITELIB}/txtorcon/endpoints.pyo
 ${PYSITELIB}/txtorcon/interface.py
+${PYSITELIB}/txtorcon/interface.pyc
+${PYSITELIB}/txtorcon/interface.pyo
 ${PYSITELIB}/txtorcon/log.py
+${PYSITELIB}/txtorcon/log.pyc
+${PYSITELIB}/txtorcon/log.pyo
 ${PYSITELIB}/txtorcon/onion.py
+${PYSITELIB}/txtorcon/onion.pyc
+${PYSITELIB}/txtorcon/onion.pyo
 ${PYSITELIB}/txtorcon/router.py
+${PYSITELIB}/txtorcon/router.pyc
+${PYSITELIB}/txtorcon/router.pyo
 ${PYSITELIB}/txtorcon/socks.py
+${PYSITELIB}/txtorcon/socks.pyc
+${PYSITELIB}/txtorcon/socks.pyo
 ${PYSITELIB}/txtorcon/spaghetti.py
+${PYSITELIB}/txtorcon/spaghetti.pyc
+${PYSITELIB}/txtorcon/spaghetti.pyo
 ${PYSITELIB}/txtorcon/stream.py
+${PYSITELIB}/txtorcon/stream.pyc
+${PYSITELIB}/txtorcon/stream.pyo
 ${PYSITELIB}/txtorcon/testutil.py
+${PYSITELIB}/txtorcon/testutil.pyc
+${PYSITELIB}/txtorcon/testutil.pyo
 ${PYSITELIB}/txtorcon/torconfig.py
+${PYSITELIB}/txtorcon/torconfig.pyc
+${PYSITELIB}/txtorcon/torconfig.pyo
 ${PYSITELIB}/txtorcon/torcontrolprotocol.py
+${PYSITELIB}/txtorcon/torcontrolprotocol.pyc
+${PYSITELIB}/txtorcon/torcontrolprotocol.pyo
 ${PYSITELIB}/txtorcon/torinfo.py
+${PYSITELIB}/txtorcon/torinfo.pyc
+${PYSITELIB}/txtorcon/torinfo.pyo
 ${PYSITELIB}/txtorcon/torstate.py
+${PYSITELIB}/txtorcon/torstate.pyc
+${PYSITELIB}/txtorcon/torstate.pyo
 ${PYSITELIB}/txtorcon/util.py
+${PYSITELIB}/txtorcon/util.pyc
+${PYSITELIB}/txtorcon/util.pyo
 ${PYSITELIB}/txtorcon/web.py
+${PYSITELIB}/txtorcon/web.pyc
+${PYSITELIB}/txtorcon/web.pyo
 share/txtorcon/INSTALL
 share/txtorcon/Makefile
 share/txtorcon/README.rst
@@ -98,7 +98,7 @@ share/txtorcon/examples/launch_tor_with_simplehttpd.py
 share/txtorcon/examples/minimal_endpoint.py
 share/txtorcon/examples/monitor.py
 share/txtorcon/examples/readme.py
-share/txtorcon/examples/readme3.py
+share/txtorcon/examples/readme2.py
 share/txtorcon/examples/stem_relay_descriptor.py
 share/txtorcon/examples/stream_circuit_logger.py
 share/txtorcon/examples/tor_info.py
diff --git a/net/py-txtorcon/distinfo b/net/py-txtorcon/distinfo
index 2bbbbdf207e..b0de331f6ed 100644
--- a/net/py-txtorcon/distinfo
+++ b/net/py-txtorcon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2019/02/28 06:31:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2020/05/16 17:55:38 adam Exp $
 
-SHA1 (txtorcon-19.0.0.tar.gz) = a4cdef41e60e065ee226a095d6775c5d11aba871
-RMD160 (txtorcon-19.0.0.tar.gz) = 6b1fafc75efc2f3e3f43feb9371a78cc56b4225f
-SHA512 (txtorcon-19.0.0.tar.gz) = 5eda79379b2a0adf20a4a1515519ba651e759014073a8cc78587d5d796ce2a60ccf87e49239991a48922365fb43449519659ce18679c0dad4a109f44dd6be64c
-Size (txtorcon-19.0.0.tar.gz) = 387177 bytes
+SHA1 (txtorcon-20.0.0.tar.gz) = 3293b0fa0bda0165448b88faaa414c7ea1242191
+RMD160 (txtorcon-20.0.0.tar.gz) = bfe72404f5a649addd8b60d0fafe92e1e99dc25f
+SHA512 (txtorcon-20.0.0.tar.gz) = 4856c86b3eac432b8e2dddec4d4ef3172452d084a5685f90335d366e918e2e80a223a7a31ff78ddb6dff1ddbbfc1e26f6d0ae9fb99bd47d6894cc6dd29365da8
+Size (txtorcon-20.0.0.tar.gz) = 306139 bytes