py-kombu: updated to 4.2.2

4.2.2
- Support both Redis client version 2.x and version 3.x.

4 files changed, 22 insertions, 14 deletions

diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 82ba74f63d3..504f9f53995 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2018/06/18 07:11:11 adam Exp $
+# $NetBSD: Makefile,v 1.19 2018/12/16 14:38:18 adam Exp $
 
-DISTNAME=	kombu-4.2.1
+DISTNAME=	kombu-4.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/kombu/}
@@ -11,6 +11,12 @@ COMMENT=	Messaging framework for Python
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-amqp>=2.1.4:../../net/py-amqp
+DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
+TEST_DEPENDS+=	${PYPKGPREFIX}-Pyro-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-case>=1.5.2:../../devel/py-case
+TEST_DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 
 USE_LANGUAGES=	# none
 
diff --git a/net/py-kombu/PLIST b/net/py-kombu/PLIST
index fdd12664885..2eea8e7db59 100644
--- a/net/py-kombu/PLIST
+++ b/net/py-kombu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2018/06/18 07:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/12/16 14:38:18 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -119,6 +119,12 @@ ${PYSITELIB}/kombu/transport/SQS.pyo
 ${PYSITELIB}/kombu/transport/__init__.py
 ${PYSITELIB}/kombu/transport/__init__.pyc
 ${PYSITELIB}/kombu/transport/__init__.pyo
+${PYSITELIB}/kombu/transport/azureservicebus.py
+${PYSITELIB}/kombu/transport/azureservicebus.pyc
+${PYSITELIB}/kombu/transport/azureservicebus.pyo
+${PYSITELIB}/kombu/transport/azurestoragequeues.py
+${PYSITELIB}/kombu/transport/azurestoragequeues.pyc
+${PYSITELIB}/kombu/transport/azurestoragequeues.pyo
 ${PYSITELIB}/kombu/transport/base.py
 ${PYSITELIB}/kombu/transport/base.pyc
 ${PYSITELIB}/kombu/transport/base.pyo
diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo
index 927e2255564..be72155f43c 100644
--- a/net/py-kombu/distinfo
+++ b/net/py-kombu/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2018/06/18 07:11:11 adam Exp $
+$NetBSD: distinfo,v 1.16 2018/12/16 14:38:18 adam Exp $
 
-SHA1 (kombu-4.2.1.tar.gz) = 6d85817a2ed282f58d402cf79e989611d7cfad63
-RMD160 (kombu-4.2.1.tar.gz) = ee24b49f86823066753b280c7c79c8472a56f8a2
-SHA512 (kombu-4.2.1.tar.gz) = a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
-Size (kombu-4.2.1.tar.gz) = 423926 bytes
+SHA1 (kombu-4.2.2.tar.gz) = ff52a7605041cf3a1c62b6c584644611faafc9e7
+RMD160 (kombu-4.2.2.tar.gz) = ecf125ebadc134978af3f4154f8c4055e8ceb460
+SHA512 (kombu-4.2.2.tar.gz) = 3336a190eadadd4c279233919a0d4849243c6799c002529aa78a9d625678d6c088709e889c12ad9beedd5fe5efcd9b62bfce8ad560ea86ad652e84d9433c5c75
+Size (kombu-4.2.2.tar.gz) = 425735 bytes
diff --git a/net/py-kombu/options.mk b/net/py-kombu/options.mk
index 4707443bfac..f9ad87e8768 100644
--- a/net/py-kombu/options.mk
+++ b/net/py-kombu/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2018/06/18 07:11:11 adam Exp $
+# $NetBSD: options.mk,v 1.4 2018/12/16 14:38:18 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-kombu
 PKG_SUPPORTED_OPTIONS=	beanstalk couchdb mongo msgpack pyro redis slmq
-PKG_SUPPORTED_OPTIONS+=	sqlalchemy sqs yaml zeromq zookeeper
+PKG_SUPPORTED_OPTIONS+=	sqlalchemy sqs zeromq zookeeper
 PKG_SUGGESTED_OPTIONS+=	# blank
 
 .include "../../mk/bsd.options.mk"
@@ -51,10 +51,6 @@ DEPENDS+=	${PYPKGPREFIX}-boto3>=1.4.4:../../net/py-boto3
 DEPENDS+=	${PYPKGPREFIX}-curl-[0-9]*:../../www/py-curl
 .endif
 
-.if !empty(PKG_OPTIONS:Myaml)
-DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
-.endif
-
 .if !empty(PKG_OPTIONS:Mzeromq)
 DEPENDS+=	${PYPKGPREFIX}-zmq>=13.1.0:../../net/py-zmq
 .endif