net/py-pynsq: Update to 0.9.0b1

This beta brings Tornado > 5 support (our py-tornado port is > 5)

Changelog:

  https://github.com/nsqio/pynsq/blob/v0.9.0b1/ChangeLog.md

4 files changed, 11 insertions, 54 deletions

diff --git a/net/py-pynsq/Makefile b/net/py-pynsq/Makefile
index dbee11164b2d..f7b6b4d4e363 100644
--- a/net/py-pynsq/Makefile
+++ b/net/py-pynsq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pynsq
-PORTVERSION=	0.6.9
+PORTVERSION=	0.9.0b1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,22 +13,21 @@ COMMENT=	Official Python client library for NSQ
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} # <6
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.3.1:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR}
+		nsqd:net/nsq
 
-USES=		python:-2.7
+USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	distutils autoplist
 
-GH_ACCOUNT=	bitly
+GH_ACCOUNT=	nsqio
 
 NO_ARCH=	yes
 
-# test_reader requires nsqd(8)
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -a "--ignore=tests/test_reader.py"
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/net/py-pynsq/distinfo b/net/py-pynsq/distinfo
index 183354007235..93ccb3a51eec 100644
--- a/net/py-pynsq/distinfo
+++ b/net/py-pynsq/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bitly-pynsq-v0.6.9_GH0.tar.gz) = c874715a843528c7f10480c7137cd3bb3b867f5f080d34798071a9629dfdb281
-SIZE (bitly-pynsq-v0.6.9_GH0.tar.gz) = 40001
+TIMESTAMP = 1557051695
+SHA256 (nsqio-pynsq-v0.9.0b1_GH0.tar.gz) = 092194574b2f9840a09f1b61649967d3e446d8fa8f503da1d662fd136dd097f1
+SIZE (nsqio-pynsq-v0.9.0b1_GH0.tar.gz) = 43423
diff --git a/net/py-pynsq/files/patch-setup.py b/net/py-pynsq/files/patch-setup.py
deleted file mode 100644
index 50b64f6a70e2..000000000000
--- a/net/py-pynsq/files/patch-setup.py
+++ /dev/null
@@ -1,43 +0,0 @@
---- setup.py.orig	2016-02-21 16:49:18 UTC
-+++ setup.py
-@@ -1,17 +1,19 @@
--from setuptools import setup
-+from setuptools import setup, find_packages
- from setuptools.command.test import test as TestCommand
- import sys
- 
- 
- class PyTest(TestCommand):
--    def finalize_options(self):
--        TestCommand.finalize_options(self)
--        self.test_args = []
--        self.test_suite = True
-+    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-+
-+    def initialize_options(self):
-+        TestCommand.initialize_options(self)
-+        self.pytest_args = []
- 
-     def run_tests(self):
-+        #import here, cause outside the eggs aren't loaded
-         import pytest
--        errno = pytest.main(self.test_args)
-+        errno = pytest.main(self.pytest_args)
-         sys.exit(errno)
- 
- 
-@@ -31,12 +33,12 @@ setup(
-         'https://s3.amazonaws.com/bitly-downloads/nsq/pynsq-%s.tar.gz' %
-         version
-     ),
--    packages=['nsq'],
-     install_requires=['tornado'],
-     include_package_data=True,
-+    packages=find_packages(exclude=['tests']),
-     zip_safe=False,
-     tests_require=['pytest', 'mock', 'simplejson',
--                   'python-snappy', 'tornado'],
-+                   'python-snappy'],
-     cmdclass={'test': PyTest},
-     classifiers=[
-         'Development Status :: 4 - Beta',
diff --git a/net/py-pynsq/pkg-descr b/net/py-pynsq/pkg-descr
index e9ba684fd3d1..11986f07a4b2 100644
--- a/net/py-pynsq/pkg-descr
+++ b/net/py-pynsq/pkg-descr
@@ -5,4 +5,4 @@ consumers and producers and two low-level modules for both sync and async
 communication over the NSQ Protocol (if you wanted to write your own
 high-level functionality).
 
-WWW: https://github.com/bitly/pynsq
+WWW: https://github.com/nsqio/pynsq