Wed Sep 27 12:49:10 2023 UTC ()
py-maturin: update to 1.2.3nb2.

Fix wheel name on macOS>=11 using upstream patch.


(wiz)
diff -r1.13 -r1.14 pkgsrc/devel/py-maturin/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/py-maturin/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs
cvs diff -r1.13 -r1.14 pkgsrc/devel/py-maturin/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-maturin/Makefile 2023/08/26 18:20:32 1.13
+++ pkgsrc/devel/py-maturin/Makefile 2023/09/27 12:49:10 1.14
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.13 2023/08/26 18:20:32 tnn Exp $ 1# $NetBSD: Makefile,v 1.14 2023/09/27 12:49:10 wiz Exp $
2 2
3DISTNAME= maturin-1.2.3 3DISTNAME= maturin-1.2.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= devel python 6CATEGORIES= devel python
7MASTER_SITES= ${MASTER_SITE_PYPI:=m/maturin/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=m/maturin/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/PyO3/maturin 10HOMEPAGE= https://github.com/PyO3/maturin
11COMMENT= Build and publish crates with pyo3, rust-cpython and cffi bindings 11COMMENT= Build and publish crates with pyo3, rust-cpython and cffi bindings
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-rust>=1.4.0:../../devel/py-setuptools-rust 14TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-rust>=1.4.0:../../devel/py-setuptools-rust
15TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.36.2:../../devel/py-wheel 15TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.36.2:../../devel/py-wheel
16DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli 16DEPENDS+= ${PYPKGPREFIX}-tomli>=1.1.0:../../textproc/py-tomli
17 17
18PYTHON_VERSIONS_INCOMPATIBLE= 27 18PYTHON_VERSIONS_INCOMPATIBLE= 27
cvs diff -r1.13 -r1.14 pkgsrc/devel/py-maturin/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-maturin/distinfo 2023/08/26 18:20:32 1.13
+++ pkgsrc/devel/py-maturin/distinfo 2023/09/27 12:49:10 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.13 2023/08/26 18:20:32 tnn Exp $ 1$NetBSD: distinfo,v 1.14 2023/09/27 12:49:10 wiz Exp $
2 2
3BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa 3BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
4SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 4SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
5Size (adler-1.0.2.crate) = 12778 bytes 5Size (adler-1.0.2.crate) = 12778 bytes
6BLAKE2s (ahash-0.7.6.crate) = 5a260485860dccfc4af4ad41b107d11c1a1a0fadb036ef801484ecc98d4a6bc8 6BLAKE2s (ahash-0.7.6.crate) = 5a260485860dccfc4af4ad41b107d11c1a1a0fadb036ef801484ecc98d4a6bc8
7SHA512 (ahash-0.7.6.crate) = 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 7SHA512 (ahash-0.7.6.crate) = 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
8Size (ahash-0.7.6.crate) = 38030 bytes 8Size (ahash-0.7.6.crate) = 38030 bytes
9BLAKE2s (aho-corasick-0.7.20.crate) = e435fcd774a78d21bafe7b56bad76b8595dcd87a850c6ef2a41206c7ec6439c5 9BLAKE2s (aho-corasick-0.7.20.crate) = e435fcd774a78d21bafe7b56bad76b8595dcd87a850c6ef2a41206c7ec6439c5
10SHA512 (aho-corasick-0.7.20.crate) = ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 10SHA512 (aho-corasick-0.7.20.crate) = ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5
11Size (aho-corasick-0.7.20.crate) = 111440 bytes 11Size (aho-corasick-0.7.20.crate) = 111440 bytes
12BLAKE2s (anstream-0.3.2.crate) = 30d7df665d61e32cf9e00cd5a0fdabe3593927e6dc8d04f9c4abd5ffcf359efd 12BLAKE2s (anstream-0.3.2.crate) = 30d7df665d61e32cf9e00cd5a0fdabe3593927e6dc8d04f9c4abd5ffcf359efd
13SHA512 (anstream-0.3.2.crate) = b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8 13SHA512 (anstream-0.3.2.crate) = b896e5208a2ee6a3c98bf3bb9ac1c52792de114dfa5709dadcac6183ea19ea63230dffd3217e571354a71d69b8eafbb0189e05f8f77f50922020de54e3aeecc8
14Size (anstream-0.3.2.crate) = 19504 bytes 14Size (anstream-0.3.2.crate) = 19504 bytes
@@ -861,14 +861,14 @@ Size (xattr-1.0.1.crate) = 12258 bytes @@ -861,14 +861,14 @@ Size (xattr-1.0.1.crate) = 12258 bytes
861BLAKE2s (xwin-0.2.14.crate) = fb1bc14a3aaafa7f5ed764135bbedc27b7e59af044a53220eca2c14c2341c630 861BLAKE2s (xwin-0.2.14.crate) = fb1bc14a3aaafa7f5ed764135bbedc27b7e59af044a53220eca2c14c2341c630
862SHA512 (xwin-0.2.14.crate) = b4f9be6fc17b47a59d40d583c93756b04b037a66081279429f51df07b802d571d504a30e2b1d0083c266ff70c4299e87d0b8ee4f08297ea8614a1d7735fe0370 862SHA512 (xwin-0.2.14.crate) = b4f9be6fc17b47a59d40d583c93756b04b037a66081279429f51df07b802d571d504a30e2b1d0083c266ff70c4299e87d0b8ee4f08297ea8614a1d7735fe0370
863Size (xwin-0.2.14.crate) = 222492 bytes 863Size (xwin-0.2.14.crate) = 222492 bytes
864BLAKE2s (yansi-0.5.1.crate) = 320911635584dafa034235f47c39057166574bad71fa932fb689f67e63e8ee14 864BLAKE2s (yansi-0.5.1.crate) = 320911635584dafa034235f47c39057166574bad71fa932fb689f67e63e8ee14
865SHA512 (yansi-0.5.1.crate) = 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 865SHA512 (yansi-0.5.1.crate) = 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
866Size (yansi-0.5.1.crate) = 16525 bytes 866Size (yansi-0.5.1.crate) = 16525 bytes
867BLAKE2s (zeroize-1.6.0.crate) = f2055440b7c90a2a0ebd0997466b65fc1f83ae7af9f346740346de90c914e36a 867BLAKE2s (zeroize-1.6.0.crate) = f2055440b7c90a2a0ebd0997466b65fc1f83ae7af9f346740346de90c914e36a
868SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b 868SHA512 (zeroize-1.6.0.crate) = 9ebc81c10516440476b5c198dd4ff0d284a0a37cee11a2cdfb5a1995f95b72d05beb827483b16e8b764f720fbcf30a5e5d8b1517cfbbf572bcb27c2efb18393b
869Size (zeroize-1.6.0.crate) = 19049 bytes 869Size (zeroize-1.6.0.crate) = 19049 bytes
870BLAKE2s (zip-0.6.6.crate) = 15924ef38e254a34cdd26b50150f93b39672575b8644389c6a191e99f4d71e0f 870BLAKE2s (zip-0.6.6.crate) = 15924ef38e254a34cdd26b50150f93b39672575b8644389c6a191e99f4d71e0f
871SHA512 (zip-0.6.6.crate) = affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef 871SHA512 (zip-0.6.6.crate) = affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
872Size (zip-0.6.6.crate) = 65789 bytes 872Size (zip-0.6.6.crate) = 65789 bytes
873SHA1 (patch-maturin_____init____.py) = 6e6dc8976125b25e3bfefda0542139e87989ccf2 873SHA1 (patch-maturin_____init____.py) = 6e6dc8976125b25e3bfefda0542139e87989ccf2
874SHA1 (patch-src_build__context.rs) = c85ba6c62a66064bdafa3e2234d903581749faf9 874SHA1 (patch-src_build__context.rs) = 8644aaa72f0f7ea3e98efc4c9a102c8b7e6e8af0
cvs diff -r1.1 -r1.2 pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs (expand / switch to unified diff)

--- pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs 2023/08/26 18:20:32 1.1
+++ pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs 2023/09/27 12:49:10 1.2
@@ -1,24 +1,59 @@ @@ -1,24 +1,59 @@
1$NetBSD: patch-src_build__context.rs,v 1.1 2023/08/26 18:20:32 tnn Exp $ 1$NetBSD: patch-src_build__context.rs,v 1.2 2023/09/27 12:49:10 wiz Exp $
2 2
3Fix wrong python wheel tag on NetBSD/evbarm. 3Fix wrong python wheel tag on NetBSD/evbarm.
4 4
 5Fix wrong python wheel tag on macOS.
 6https://github.com/PyO3/maturin/pull/1778
 7
5--- src/build_context.rs.orig 2023-08-17 05:08:34.000000000 +0000 8--- src/build_context.rs.orig 2023-08-17 05:08:34.000000000 +0000
6+++ src/build_context.rs 9+++ src/build_context.rs
7@@ -557,6 +557,17 @@ impl BuildContext { 10@@ -557,6 +557,17 @@ impl BuildContext {
8 format!("macosx_{x86_64_tag}_x86_64") 11 format!("macosx_{x86_64_tag}_x86_64")
9 } 12 }
10 } 13 }
11+ // NetBSD evbarm 14+ // NetBSD evbarm
12+ (Os::NetBsd, Arch::Armv7L) 15+ (Os::NetBsd, Arch::Armv7L)
13+ | (Os::NetBsd, Arch::Aarch64) => { 16+ | (Os::NetBsd, Arch::Aarch64) => {
14+ let release = target.get_platform_release()?; 17+ let release = target.get_platform_release()?;
15+ format!( 18+ format!(
16+ "{}_{}_{}", 19+ "{}_{}_{}",
17+ target.target_os().to_string().to_ascii_lowercase(), 20+ target.target_os().to_string().to_ascii_lowercase(),
18+ release, 21+ release,
19+ "evbarm" 22+ "evbarm"
20+ ) 23+ )
21+ } 24+ }
22 // FreeBSD 25 // FreeBSD
23 (Os::FreeBsd, _) 26 (Os::FreeBsd, _)
24 // NetBSD 27 // NetBSD
 28@@ -1150,7 +1161,21 @@ fn macosx_deployment_target(
 29 arm64_ver = (major, minor);
 30 }
 31 }
 32- Ok((x86_64_ver, arm64_ver))
 33+ Ok((
 34+ python_macosx_target_version(x86_64_ver),
 35+ python_macosx_target_version(arm64_ver),
 36+ ))
 37+}
 38+
 39+#[inline]
 40+fn python_macosx_target_version(version: (u16, u16)) -> (u16, u16) {
 41+ let (major, minor) = version;
 42+ if major >= 11 {
 43+ // pip only supports (major, 0) for macOS 11+
 44+ (major, 0)
 45+ } else {
 46+ (major, minor)
 47+ }
 48 }
 49
 50 pub(crate) fn rustc_macosx_target_version(target: &str) -> (u16, u16) {
 51@@ -1277,7 +1302,7 @@ mod test {
 52 );
 53 assert_eq!(
 54 macosx_deployment_target(Some("11.1"), false).unwrap(),
 55- ((11, 1), (11, 1))
 56+ ((11, 0), (11, 0))
 57 );
 58 }
 59 }