git: ce9f0810a3dc - main - devel/py-pytest-services: Add missing dependencies

The branch main has been updated by nivit:

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

commit ce9f0810a3dc5d322c3053f51e9f0470941f49c5
Author:     Pete Diamond <lazeraman@gmail.com>
AuthorDate: 2026-10-18 15:17:00 +0000
Commit:     Nicola Vitale <nivit@FreeBSD.org>
CommitDate: 2026-10-18 15:19:12 +0000

    devel/py-pytest-services: Add missing dependencies
    
    - Add option MEMCACHED (default OFF)
    - Bump PORTREVISION
    - Enable tests
    - Pet portclippy
    
    PR:             298718
---
 devel/py-pytest-services/Makefile                  | 24 +++++++++++++++++++---
 .../files/patch-pytest__services_memcached.py      | 19 +++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/devel/py-pytest-services/Makefile b/devel/py-pytest-services/Makefile
index 91fa22cd9d8b..a29a77698b8e 100644
--- a/devel/py-pytest-services/Makefile
+++ b/devel/py-pytest-services/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	pytest-services
 DISTVERSION=	2.2.2
-DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Fixtures and utility functions to run service processes for pytest
@@ -15,11 +16,28 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.1:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	pytest-${PYTHON_VER}:devel/py-pytest@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=8:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zc.lockfile>=2.0:devel/py-zc.lockfile@${PY_FLAVOR}
+# tests: 5 passed, 1 skipped
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=0:devel/py-astroid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pylibmc>=0:databases/py-pylibmc@${PY_FLAVOR} \
+		memcached:databases/memcached \
+		Xvfb:x11-servers/xorg-server@xvfb
 
-USES=		python
+USES=		pytest python
 USE_PYTHON=	autoplist pep517
+PYTEST_ARGS=	-p no:black -p no:markdown
+
+TEST_ENV=	USER=${USER}
 
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=	MEMCACHED
+
+MEMCACHED_DESC=		Enables memcached support
+MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylibmc>=0:databases/py-pylibmc@${PY_FLAVOR}
+
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-services/files/patch-pytest__services_memcached.py b/devel/py-pytest-services/files/patch-pytest__services_memcached.py
new file mode 100644
index 000000000000..823ce99263a6
--- /dev/null
+++ b/devel/py-pytest-services/files/patch-pytest__services_memcached.py
@@ -0,0 +1,19 @@
+--- pytest_services/memcached.py.orig	2025-07-16 00:29:03 UTC
++++ pytest_services/memcached.py
+@@ -14,9 +14,15 @@ def memcached(request, run_services, memcached_socket,
+ def memcached(request, run_services, memcached_socket, watcher_getter):
+     """The memcached instance which is ready to be used by the tests."""
+     if run_services:
++        try:
++            user=os.environ['USER']
++            arguments=['-u', user]
++        except KeyError:
++            arguments=[]
++        arguments.extend(['-s', memcached_socket])
+         return watcher_getter(
+             name='memcached',
+-            arguments=['-s', memcached_socket],
++            arguments=arguments,
+             checker=lambda: os.path.exists(memcached_socket),
+             request=request,
+         )