Re: py-maturin and version requirement

[Greg Troxel <gdt%lexort.com@localhost>]

Jonathan Perkin <jperkin%pkgsrc.org@localhost> writes:

> * On 2025-03-20 at 16:38 GMT, Greg Troxel wrote:
>
>>  - bin-install is buggy because it should only install the version that
>>    would have been built
>
> Not this one.  pkg_add will choose the best matching version for the
> supplied match.  If the specified match is wrong and an older version
> than required is installed then that's a fault of the match.
>
> Changing the logic so that the match is overridden to the exact
> version that is currently supplied by pkgsrc would avoid the problem
> that you're running into, but it's the wrong approach and would result
> in a lot of needless builds when the existing binary package would
> suffice.

Yeah, I guess that would be like starting to turn regular builds into
pbulk, so no.

> Just fix the match to be correct.

I have a fix ready to commit.  With it I can still build py-rpds-py:

  => Tool dependency py312-maturin>=1.8.3: found py312-maturin-1.8.3

The benefit is that anyone who

  has py-maturin 1.7.8 installed, e.g. from 2024Q4 

  tries to build devel/py-rpds-py

will see an attempt to install py-maturin-1.8.3, instead of a mysterious
build failure, because a dependency requirement that exists is not
expressed.

I have no idea which of the 1.8.0-3 series is necessary; upstream's NEWS
doesn't address this.  I know 1.8.3, which is what is in pkgsrc now,
works for py-rpds-py.

This is just a bugfix, but sort of infrastructure.  I'm happy to do it
now or wait until after branch -- my tree will have it, so it won't
bother me to wait.  The minus is it's a change, which will trigger
rebuilds, and all changes have risk -- but it seems safe and it's easy
to revert if it'sn not.

Maya?

Index: devel/py-maturin/tool.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-maturin/tool.mk,v
retrieving revision 1.1
diff -u -p -r1.1 tool.mk
--- devel/py-maturin/tool.mk	13 Nov 2024 13:28:17 -0000	1.1
+++ devel/py-maturin/tool.mk	20 Mar 2025 22:01:22 -0000
@@ -8,7 +8,9 @@
 .if !defined(MATURIN_TOOL_MK)
 MATURIN_TOOL_MK:=
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
+# At least 1.7.8 fails to parse some now-considered-ok pyproject.toml
+# content.
+TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin>=1.8.3:../../devel/py-maturin
 
 WHEEL_ARGS+=	-Cbuild-args=${_MAKE_JOBS}
 .endif


----------------------------------------


Index: devel/py-maturin/tool.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-maturin/tool.mk,v
retrieving revision 1.1
diff -u -p -r1.1 tool.mk
--- devel/py-maturin/tool.mk	13 Nov 2024 13:28:17 -0000	1.1
+++ devel/py-maturin/tool.mk	20 Mar 2025 22:01:22 -0000
@@ -8,7 +8,9 @@
 .if !defined(MATURIN_TOOL_MK)
 MATURIN_TOOL_MK:=
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
+# At least 1.7.8 fails to parse some now-considered-ok pyproject.toml
+# content.
+TOOL_DEPENDS+=	${PYPKGPREFIX}-maturin>=1.8.3:../../devel/py-maturin
 
 WHEEL_ARGS+=	-Cbuild-args=${_MAKE_JOBS}
 .endif