From: Klemens Nanni <kn@openbsd.org>
Subject: Re: [WIP] databases/py-redis: update to 5.0.8
To: OpenBSD ports <ports@openbsd.org>, Remi Pointel <rpointel@openbsd.org>
Date: Thu,  3 Oct 2024 19:54:46 +0000

30.09.2024 11:33, Kirill A. Korinsky пишет:
> Folks,
> 
> I think that this diff may trigger a kind of fallout and now is a good time
> to move forward on it.

If you anticipate fallout or aren't sure and want folks to test it,
I recommend testing at least some consumers yourself and/or or check
which dependency tree might be critical.

If you want bulk builders to throw this into a tree, perhaps indicate
so in the subject, so they can keep an eye out for it.
 
> On Wed, 04 Sep 2024 12:56:12 +0200,
> Stuart Henderson <stu@spacehopper.org> wrote:
>>
>> On 2024/09/04 12:26, Kirill A. Korinsky wrote:
>>
>>> Moved, and I had also discovered that they had missed the last release on
>>> pypi, see https://github.com/redis/redis-py/issues/3344
>>
>> Let's patch the version in setup.py and fix MODPY_EGG_VERSION stuff.
>>
>> I think this is probably ok (though I do prefer GH_* than DIST_TUPLE
>> for simple things with single distfiles, portroach is more likely to
>> find updates that way)
>>
> 
> Here I've reinlined the diff:
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/py-redis/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- Makefile	6 May 2024 12:22:36 -0000	1.45
> +++ Makefile	30 Sep 2024 08:33:21 -0000
> @@ -1,16 +1,12 @@
>  COMMENT =		Python interface to Redis
>  
> -MODPY_EGG_VERSION =	3.5.3
> +MODPY_EGG_VERSION =	5.0.9
> +DIST_TUPLE =		github redis redis-py v${MODPY_EGG_VERSION} .
>  
> -GH_ACCOUNT =		andymccurdy
> -GH_PROJECT =		redis-py
> -GH_TAGNAME =		${MODPY_EGG_VERSION}
> -
> -PKGNAME =		py-redis-${MODPY_EGG_VERSION}
> +PKGNAME =		py-${DISTNAME:S/-py//}
>  CATEGORIES =		databases
> -REVISION =		5
>  
> -HOMEPAGE =		https://github.com/andymccurdy/redis-py/
> +HOMEPAGE =		https://github.com/redis/redis-py
>  
>  MAINTAINER =		Remi Pointel <rpointel@openbsd.org>
>  
> @@ -23,11 +19,22 @@ FLAVORS =		python3
>  FLAVOR =		python3
>  
>  MODPY_PYBUILD =		setuptools
> +MODPY_PYTEST_ARGS =	--disable-pytest-warnings \
> +			-m "onlynoncluster and not redismod"
>  
>  # Be sure to have a redis server running on localhost
>  TEST_IS_INTERACTIVE =	Yes
>  
> +RUN_DEPENDS =		devel/py-async-timeout${MODPY_FLAVOR} \
> +
>  TEST_DEPENDS =		databases/redis \
> -			devel/py-mock${MODPY_FLAVOR}
> +			devel/py-cachetools${MODPY_FLAVOR} \
> +			devel/py-invoke${MODPY_FLAVOR} \
> +			devel/py-mock${MODPY_FLAVOR} \
> +			devel/py-test-asyncio${MODPY_FLAVOR} \
> +			devel/py-test-cov${MODPY_FLAVOR} \
> +			devel/py-uvloop${MODPY_FLAVOR} \
> +			math/py-numpy${MODPY_FLAVOR} \
> +			textproc/py-ujson${MODPY_FLAVOR} \

Careful with line continuation on the last line,  if the next line
is not an empty one, you're joining the next variable/target as value.