From cea82533f97a5a3cd8f76940de5c400271f5c890 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 11 Nov 2025 08:30:50 +0000
Subject: [PATCH] update to py3-caldav-2.1.0 add a note about niquests vs
 requests (2.x.0 releases expected to use requests, 2.x.1 niquests).

---
 productivity/py-caldav/Makefile | 54 +++++++++++++++++++--------------
 productivity/py-caldav/distinfo |  4 +--
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/productivity/py-caldav/Makefile b/productivity/py-caldav/Makefile
index 33a7da37c50..30997a7cd7e 100644
--- a/productivity/py-caldav/Makefile
+++ b/productivity/py-caldav/Makefile
@@ -1,35 +1,45 @@
-COMMENT =		caldav client library for Python
+COMMENT=	caldav client library for Python
 
-MODPY_DISTV =		2.0.1
-GH_ACCOUNT =		python-caldav
-GH_PROJECT =		caldav
-GH_TAGNAME =		v${MODPY_DISTV}
-PKGNAME =		py-${DISTNAME}
+# N.B. https://github.com/python-caldav/caldav/issues/530
+# 2.x.0 releases are expected to done using "requests" as a dep
+# 2.x.1 releases are expected to done using "niquests"
+# niquests depends on urllib3-future which *overrides* urllib3 in
+# a default install. either stick to py-caldav versions using
+# "requests", or if porting niquests, be sure to set the env var
+# during urllib3-future build to stop it overriding urllib3.
+#
+# python-caldav 3.x hoping to move to httpx, avoiding these problems
+MODPY_DISTV=	2.1.0
+GH_ACCOUNT=	python-caldav
+GH_PROJECT=	caldav
+GH_TAGNAME=	v${MODPY_DISTV}
+PKGNAME=	py-${DISTNAME}
 
-CATEGORIES =		productivity net
+CATEGORIES=	productivity net
 
-# Apache 2.0 - GPLv3
-PERMIT_PACKAGE =	Yes
+# either GPLv3+ or Apache 2.0
+PERMIT_PACKAGE=	Yes
 
-MODULES =		lang/python
+MODULES=	lang/python
+MODPY_PYBUILD=	hatch-vcs
 
-MODPY_PYBUILD =		hatch-vcs
+# yes, even though it's hatch
+MAKE_ENV=	SETUPTOOLS_SCM_PRETEND_VERSION=${MODPY_DISTV}
 
-RUN_DEPENDS =		devel/py-icalendar \
-			productivity/py-recurring-ical-events \
-			textproc/py-lxml \
-			www/py-requests
+RUN_DEPENDS=	devel/py-icalendar \
+		productivity/py-recurring-ical-events \
+		textproc/py-lxml \
+		www/py-requests
 
-TEST_DEPENDS =		devel/py-tzlocal \
-			textproc/py-vobject
+TEST_DEPENDS=	devel/py-tzlocal \
+		textproc/py-vobject
 
 # skip tests that run against actual servers and that require network access
 # and additional dependencies, as well as tests for documentation which is not
 # packaged.
-MODPY_PYTEST_ARGS=	--ignore 'tests/test_caldav.py' \
-			--ignore 'tests/test_docs.py' \
-			--ignore 'tests/test_examples.py'
-
-MAKE_ENV=		SETUPTOOLS_SCM_PRETEND_VERSION=${MODPY_DISTV}
+MODPY_PYTEST_ARGS= \
+		--ignore 'tests/test_caldav.py' \
+		--ignore 'tests/test_docs.py' \
+		--ignore 'tests/test_examples.py'
 
 .include <bsd.port.mk>
diff --git a/productivity/py-caldav/distinfo b/productivity/py-caldav/distinfo
index ee8dda7090c..fdad539f2b8 100644
--- a/productivity/py-caldav/distinfo
+++ b/productivity/py-caldav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (caldav-2.0.1.tar.gz) = Us+Qiww05nexrl+v2j9jts3YJBJ/CRVQcxkZuRFyjC8=
-SIZE (caldav-2.0.1.tar.gz) = 169649
+SHA256 (caldav-2.1.0.tar.gz) = BCQiVKeZI/GGZrIkBazS9ImT0AXTVaebUXbLed+BDNU=
+SIZE (caldav-2.1.0.tar.gz) = 180647