CVS commit: pkgsrc/devel

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Dec 28 15:39:43 UTC 2025

Modified Files:
        pkgsrc/devel/py-pydantic: Makefile
        pkgsrc/devel/py-pydantic-core: Makefile
Removed Files:
        pkgsrc/devel/py-pydantic/patches: patch-pyproject.toml

Log Message:
devel/py-pydantic-*: Drop incorrect relaxation of exact dep and add caution

As posted to tech-pkg on 5 December, pydantic really does have an
exact dependency on pydantic-core (even though the version numbers do
not match).  The previous update was broken, and matrix-synapse failed
to build.

Drop the patch to pyproject.toml that relaxes the dependency, as 1)
wrong and 2) not documented or reported upstream (who would say no,
it's right).

Add comments that these two packages need to be updated in sync with
version numbers that meet upstream's dependency patterns.

No PKGREVISION++, as the binary package doesn't change.  It's just
that a future bad update will cause a build failure, if someone does
that without reading the comments.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/py-pydantic/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/py-pydantic-core/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/py-pydantic/patches/patch-pyproject.toml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-pydantic/Makefile
diff -u pkgsrc/devel/py-pydantic/Makefile:1.36 pkgsrc/devel/py-pydantic/Makefile:1.37
--- pkgsrc/devel/py-pydantic/Makefile:1.36      Fri Dec 26 10:49:13 2025
+++ pkgsrc/devel/py-pydantic/Makefile   Sun Dec 28 15:39:43 2025
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2025/12/26 10:49:13 adam Exp $
+# $NetBSD: Makefile,v 1.37 2025/12/28 15:39:43 gdt Exp $
 
+# NB: pydantic expresses an exact dependency on pydantic-core.  While
+# unfortunate, it is actually true, and pydantic with non-matching
+# versions of pydantic-core fail to build matrix-synapse.
+# https://github.com/pydantic/pydantic/issues/12189#issuecomment-3227083571
 DISTNAME=      pydantic-2.12.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python

Index: pkgsrc/devel/py-pydantic-core/Makefile
diff -u pkgsrc/devel/py-pydantic-core/Makefile:1.34 pkgsrc/devel/py-pydantic-core/Makefile:1.35
--- pkgsrc/devel/py-pydantic-core/Makefile:1.34 Fri Dec 26 10:40:35 2025
+++ pkgsrc/devel/py-pydantic-core/Makefile      Sun Dec 28 15:39:43 2025
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2025/12/26 10:40:35 adam Exp $
+# $NetBSD: Makefile,v 1.35 2025/12/28 15:39:43 gdt Exp $
 
+# NB: pydantic expresses an exact dependency on pydantic-core.  While
+# unfortunate, it is actually true, and pydantic with non-matching
+# versions of pydantic-core fail to build matrix-synapse.
+# https://github.com/pydantic/pydantic/issues/12189#issuecomment-3227083571
 DISTNAME=      pydantic_core-2.41.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
 CATEGORIES=    devel python