On 8/12/24 4:02 PM, Renaud Allard wrote:
On 8/12/24 3:57 PM, Landry Breuil wrote:Le Mon, Aug 12, 2024 at 03:19:28PM +0200, Renaud Allard a écrit :On 8/12/24 3:05 PM, Renaud Allard wrote:Hello,Here is a WIP for devel/py-pydantic 2.8.2 devel/py-pydantic-core-2.21.0It will more than likely break geo/pygeoapi unless this patch is applied: https://github.com/geopython/pygeoapi/pull/1353/files But it should "unbreak" net/synapse. It's all untested ATM. Any comments? Best RegardsSorry, I had forgotten to "CVS rm" the patches.-MODPY_PYBUILD = setuptools +MODPY_PYBUILD = hatchling -BUILD_DEPENDS = lang/cython${MODPY_FLAVOR} -RUN_DEPENDS = devel/py-typing-extensions${MODPY_FLAVOR} +BUILD_DEPENDS = devel/py-hatchling${MODPY_FLAVOR} \there's no need for hatchling in BDEP if its used in PYBUILD. i wont make comments on mixed python/rust ports, but with the attached diff the pygeoapi command doesnt blow upon startup. you also have to check py-pydantic-compat and py-inflect.net/synapse workspy-pydantic-compat works, but py-inflect is broken. It seems that from v7.2.0, there is no more need for pydantic, but we are still at 6.0.4.
textproc/inflect supports pydantic v2 starting at version 6.2.0. I am not sure if it's better to upgrade it to the latest version or use 6.2.0 though. Tests run mostly fine.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-inflect/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile 6 May 2024 12:24:08 -0000 1.3
+++ Makefile 12 Aug 2024 14:22:26 -0000
@@ -1,9 +1,8 @@
COMMENT= correctly generate plurals, singular nouns, ordinals, etc
-MODPY_EGG_VERSION= 6.0.4
+MODPY_EGG_VERSION= 6.2.0
DISTNAME= inflect-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 0
CATEGORIES= textproc
@@ -18,6 +17,7 @@ MODULES= lang/python
MODPY_PI= Yes
MODPY_PYBUILD= setuptools_scm
RUN_DEPENDS= devel/py-pydantic${MODPY_FLAVOR}
+TEST_DEPENDS= devel/py-annotated_types${MODPY_FLAVOR}
FLAVORS= python3
FLAVOR= python3
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-inflect/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 6 Apr 2023 07:10:11 -0000 1.2
+++ distinfo 12 Aug 2024 14:22:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (inflect-6.0.4.tar.gz) = GEJkmhe2ytZoEqXJvfrLYxDh57bdijHwJnZt8bYmEus=
-SIZE (inflect-6.0.4.tar.gz) = 71131
+SHA256 (inflect-6.2.0.tar.gz) = UYCI70FKThXfcOa8tA0CHaTUI8xsL9TAytVQDTn4Zic=
+SIZE (inflect-6.2.0.tar.gz) = 71776
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-inflect/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 27 Nov 2022 10:55:14 -0000 1.1.1.1
+++ pkg/PLIST 12 Aug 2024 14:22:26 -0000
@@ -9,4 +9,15 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/inflect/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/inflect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/inflect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}pydantic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}pydantic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}pydantic1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/${MODPY_PYCACHE}pydantic1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/pydantic.py
+lib/python${MODPY_VERSION}/site-packages/inflect/compat/pydantic1.py
lib/python${MODPY_VERSION}/site-packages/inflect/py.typed
smime.p7s
Description: S/MIME Cryptographic Signature
