git: a8b914bfdbce - main - databases/py-redis2: Clean up Makefile

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sat, 16 Apr 2022 04:22:07 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a8b914bfdbce9c2130c01f87f55ee71f5961be00

commit a8b914bfdbce9c2130c01f87f55ee71f5961be00
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-16 03:57:07 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-04-16 04:19:17 +0000

    databases/py-redis2: Clean up Makefile
    
    - Change MASTER_SITES from GitHub to CHEESESHOP
    - Update do-test:
---
 databases/py-redis2/Makefile | 25 ++++++++++++-------------
 databases/py-redis2/distinfo |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/databases/py-redis2/Makefile b/databases/py-redis2/Makefile
index 102bac14675d..990872741b2b 100644
--- a/databases/py-redis2/Makefile
+++ b/databases/py-redis2/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	redis
 PORTVERSION=	2.10.6
 PORTREVISION=	2
 CATEGORIES=	databases python
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
@@ -13,27 +14,25 @@ COMMENT=	Python client for Redis key-value store
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	redis-server:databases/redis
-
-OPTIONS_DEFINE=	HIREDIS
-
-HIREDIS_DESC=	High performance response parser (via hiredis)
-
-HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.0,1:devel/py-pytest@${PY_FLAVOR} \
+		redis-server:databases/redis
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist concurrent
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	andymccurdy
-GH_PROJECT=	${PORTNAME}-py
-
 NO_ARCH=	yes
+
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis
+
 PORTSCOUT=	limit:^2\.
 
-# Needs redis-server to be running
+OPTIONS_DEFINE=	HIREDIS
+HIREDIS_DESC=	High performance response parser
+
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR}
+
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/databases/py-redis2/distinfo b/databases/py-redis2/distinfo
index 4a453d1f3ff6..8f3d4e051c0a 100644
--- a/databases/py-redis2/distinfo
+++ b/databases/py-redis2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508148992
-SHA256 (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = e28e24539d6590a8b88498f2d30f7fe3e2be1171d7a91fe1fa6c5b6982519015
-SIZE (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = 94869
+TIMESTAMP = 1649423748
+SHA256 (redis-2.10.6.tar.gz) = a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f
+SIZE (redis-2.10.6.tar.gz) = 97299