git: 3073fa91b1d8 - main - devel/py-pydantic-extra-types: Allow build with py-python-ulid 3.0.0+

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 17 Oct 2024 19:06:42 UTC
The branch main has been updated by sunpoet:

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

commit 3073fa91b1d8ef0455562863ec4b0944727d02d6
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-10-17 19:03:01 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-10-17 19:03:01 +0000

    devel/py-pydantic-extra-types: Allow build with py-python-ulid 3.0.0+
    
    - Bump PORTREVISION for package change
    
    Obtained from:  https://github.com/pydantic/pydantic-extra-types/commit/927dcd1069545bb9d2e06012f79a4a87a0c398a7
                    https://github.com/pydantic/pydantic-extra-types/commit/5a21d9e7288a223bc772be119abcce4d768d2c97
---
 devel/py-pydantic-extra-types/Makefile                   |  5 +++--
 devel/py-pydantic-extra-types/files/patch-pyproject.toml | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/devel/py-pydantic-extra-types/Makefile b/devel/py-pydantic-extra-types/Makefile
index 4781e1436a91..164bcc8609bb 100644
--- a/devel/py-pydantic-extra-types/Makefile
+++ b/devel/py-pydantic-extra-types/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pydantic-extra-types
 PORTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,13 +33,13 @@ PYTHON_ULID_DESC=	ULID support
 ALL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pendulum>=2.0.0<4.0.0:devel/py-pendulum@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}phonenumbers>=8<9:devel/py-phonenumbers@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycountry>=23:textproc/py-pycountry@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}python-ulid>=1<3:textproc/py-python-ulid@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}python-ulid>=1<4:textproc/py-python-ulid@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pytz>=2024.1,1:devel/py-pytz@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}semver>=3.0.2:devel/py-semver@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}tzdata>=2024.1:devel/py-tzdata@${PY_FLAVOR}
 PENDULUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pendulum>=2.0.0<4.0.0:devel/py-pendulum@${PY_FLAVOR}
 PHONENUMBERS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phonenumbers>=8<9:devel/py-phonenumbers@${PY_FLAVOR}
 PYCOUNTRY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycountry>=23:textproc/py-pycountry@${PY_FLAVOR}
-PYTHON_ULID_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}python-ulid>=1<3:textproc/py-python-ulid@${PY_FLAVOR}
+PYTHON_ULID_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}python-ulid>=1<4:textproc/py-python-ulid@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-pydantic-extra-types/files/patch-pyproject.toml b/devel/py-pydantic-extra-types/files/patch-pyproject.toml
index 2fb7bfa3b062..8872eeb6a070 100644
--- a/devel/py-pydantic-extra-types/files/patch-pyproject.toml
+++ b/devel/py-pydantic-extra-types/files/patch-pyproject.toml
@@ -1,17 +1,22 @@
 --- pyproject.toml.orig	2020-02-02 00:00:00 UTC
 +++ pyproject.toml
-@@ -50,7 +50,7 @@ all = [
+@@ -49,8 +49,8 @@ all = [
+     'pycountry>=23',
      'semver>=3.0.2',
      'python-ulid>=1,<2; python_version<"3.9"',
-     'python-ulid>=1,<3; python_version>="3.9"',
+-    'python-ulid>=1,<3; python_version>="3.9"',
 -    'pendulum>=3.0.0,<4.0.0',
++    'python-ulid>=1,<4; python_version>="3.9"',
 +    'pendulum>=2.0.0,<4.0.0',
      'pytz>=2024.1',
      'tzdata>=2024.1',
  ]
-@@ -61,7 +61,7 @@ python_ulid = [
+@@ -59,9 +59,9 @@ python_ulid = [
+ semver = ['semver>=3.0.2']
+ python_ulid = [
      'python-ulid>=1,<2; python_version<"3.9"',
-     'python-ulid>=1,<3; python_version>="3.9"',
+-    'python-ulid>=1,<3; python_version>="3.9"',
++    'python-ulid>=1,<4; python_version>="3.9"',
  ]
 -pendulum = ['pendulum>=3.0.0,<4.0.0']
 +pendulum = ['pendulum>=2.0.0,<4.0.0']