Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-maturin for openSUSE:Factory checked in at 2023-04-09 18:41:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-maturin (Old) and /work/SRC/openSUSE:Factory/.python-maturin.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-maturin" Sun Apr 9 18:41:08 2023 rev:28 rq:1078139 version:0.14.17 Changes: -------- --- /work/SRC/openSUSE:Factory/python-maturin/python-maturin.changes 2023-03-29 23:27:35.239581187 +0200 +++ /work/SRC/openSUSE:Factory/.python-maturin.new.19717/python-maturin.changes 2023-04-09 18:43:19.478534754 +0200 @@ -1,0 +2,9 @@ +Sun Apr 9 01:01:18 UTC 2023 - Mia Herkt <m...@0x0.st> + +- Update to v0.14.17: + * Fix wrong EXT_SUFFIX when cross compiling musllinux wheels for + Python 3.11 + gh#PyO3/maturin#1560 +- Drop vendor-update-ahash-dependency.patch + +------------------------------------------------------------------- Old: ---- maturin-0.14.16.tar.gz vendor-update-ahash-dependency.patch New: ---- maturin-0.14.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-maturin.spec ++++++ --- /var/tmp/diff_new_pack.Asf6id/_old 2023-04-09 18:43:20.442540207 +0200 +++ /var/tmp/diff_new_pack.Asf6id/_new 2023-04-09 18:43:20.450540253 +0200 @@ -17,7 +17,7 @@ Name: python-maturin -Version: 0.14.16 +Version: 0.14.17 Release: 0 Summary: Rust/Python Interoperability License: Apache-2.0 OR MIT @@ -25,7 +25,6 @@ Source: https://files.pythonhosted.org/packages/source/m/maturin/maturin-%{version}.tar.gz Source1: vendor.tar.xz Source2: cargo_config -Patch0: vendor-update-ahash-dependency.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools-rust >= 1.4.0} ++++++ maturin-0.14.16.tar.gz -> maturin-0.14.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/Cargo.lock new/maturin-0.14.17/Cargo.lock --- old/maturin-0.14.16/Cargo.lock 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/Cargo.lock 2023-04-06 11:38:20.000000000 +0200 @@ -1309,7 +1309,7 @@ [[package]] name = "maturin" -version = "0.14.16" +version = "0.14.17" dependencies = [ "anyhow", "base64", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/Cargo.toml new/maturin-0.14.17/Cargo.toml --- old/maturin-0.14.16/Cargo.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.14.17/Cargo.toml 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +1,7 @@ [package] authors = ["konstin <kons...@mailbox.org>", "messense <messe...@icloud.com>"] name = "maturin" -version = "0.14.16" +version = "0.14.17" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*", "guide/*", ".github/*"] homepage = "https://github.com/pyo3/maturin"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/Changelog.md new/maturin-0.14.17/Changelog.md --- old/maturin-0.14.16/Changelog.md 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/Changelog.md 2023-04-06 11:38:20.000000000 +0200 @@ -7,6 +7,10 @@ ## [Unreleased] +## [0.14.17] - 2023-04-06 + +* Fix wrong `EXT_SUFFIX` when cross compiling musllinux wheels for Python 3.11 in [#1560](https://github.com/PyO3/maturin/pull/1560) + ## [0.14.16] - 2023-03-26 * Deprecate `package.metadata.maturin.name` in favor of `tool.maturin.module-name` in `pyproject.toml` in [#1531](https://github.com/PyO3/maturin/pull/1531) @@ -830,7 +834,8 @@ * Initial Release -[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.16...HEAD +[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.17...HEAD +[0.14.17]: https://github.com/pyo3/maturin/compare/v0.14.16...v0.14.17 [0.14.16]: https://github.com/pyo3/maturin/compare/v0.14.15...v0.14.16 [0.14.15]: https://github.com/pyo3/maturin/compare/v0.14.14...v0.14.15 [0.14.14]: https://github.com/pyo3/maturin/compare/v0.14.13...v0.14.14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/PKG-INFO new/maturin-0.14.17/PKG-INFO --- old/maturin-0.14.16/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.14.17/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: maturin -Version: 0.14.16 +Version: 0.14.17 Classifier: Topic :: Software Development :: Build Tools Classifier: Programming Language :: Rust Classifier: Programming Language :: Python :: Implementation :: CPython @@ -18,10 +18,10 @@ License: MIT OR Apache-2.0 Requires-Python: >=3.7 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM -Project-URL: Documentation, https://maturin.rs +Project-URL: Changelog, https://maturin.rs/changelog.html Project-URL: Source Code, https://github.com/PyO3/maturin Project-URL: Issues, https://github.com/PyO3/maturin/issues -Project-URL: Changelog, https://maturin.rs/changelog.html +Project-URL: Documentation, https://maturin.rs # Maturin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/src/build_context.rs new/maturin-0.14.17/src/build_context.rs --- old/maturin-0.14.16/src/build_context.rs 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/src/build_context.rs 2023-04-06 11:38:20.000000000 +0200 @@ -130,7 +130,7 @@ // Having the wasmtime version hardcoded is not ideal, it's easy enough to overwrite metadata21 .requires_dist - .push("wasmtime>=6.0.0,<7.0.0".to_string()); + .push("wasmtime>=7.0.0,<8.0.0".to_string()); } Ok(metadata21) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/src/build_options.rs new/maturin-0.14.17/src/build_options.rs --- old/maturin-0.14.16/src/build_options.rs 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/src/build_options.rs 2023-04-06 11:38:20.000000000 +0200 @@ -1089,15 +1089,10 @@ let ver_minor = ver_minor.parse::<usize>().with_context(|| { format!("Invalid python interpreter minor version '{ver_minor}', expect a digit") })?; - let sysconfig = InterpreterConfig::lookup( - target.target_os(), - target.target_arch(), - python_impl, - (ver_major, ver_minor), - ) - .with_context(|| { - format!("Failed to find a {python_impl} {ver_major}.{ver_minor} interpreter") - })?; + let sysconfig = InterpreterConfig::lookup(target, python_impl, (ver_major, ver_minor)) + .with_context(|| { + format!("Failed to find a {python_impl} {ver_major}.{ver_minor} interpreter") + })?; debug!( "Found {} {}.{} in bundled sysconfig", sysconfig.interpreter_kind, sysconfig.major, sysconfig.minor, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/src/ci.rs new/maturin-0.14.17/src/ci.rs --- old/maturin-0.14.16/src/ci.rs 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/src/ci.rs 2023-04-06 11:38:20.000000000 +0200 @@ -151,7 +151,7 @@ | BridgeModel::Cffi | BridgeModel::UniFfi ); - let gen_cmd = std::env::args() + let mut gen_cmd = std::env::args() .enumerate() .map(|(i, arg)| { if i == 0 { @@ -162,12 +162,17 @@ }) .collect::<Vec<String>>() .join(" "); + if gen_cmd.starts_with("maturin new") || gen_cmd.starts_with("maturin init") { + gen_cmd = format!("{} generate-ci github", env!("CARGO_PKG_NAME")); + } let mut conf = format!( "# This file is autogenerated by maturin v{version} # To update, run # # {gen_cmd} # +name: CI + on: push: branches: @@ -509,6 +514,8 @@ .collect::<Vec<_>>() .join("\n"); let expected = indoc! {r#" + name: CI + on: push: branches: @@ -636,6 +643,8 @@ .collect::<Vec<_>>() .join("\n"); let expected = indoc! {r#" + name: CI + on: push: branches: @@ -757,6 +766,8 @@ .collect::<Vec<_>>() .join("\n"); let expected = indoc! {r#" + name: CI + on: push: branches: @@ -923,6 +934,8 @@ .collect::<Vec<_>>() .join("\n"); let expected = indoc! {r#" + name: CI + on: push: branches: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.16/src/python_interpreter/config.rs new/maturin-0.14.17/src/python_interpreter/config.rs --- old/maturin-0.14.16/src/python_interpreter/config.rs 2023-03-26 07:07:15.000000000 +0200 +++ new/maturin-0.14.17/src/python_interpreter/config.rs 2023-04-06 11:38:20.000000000 +0200 @@ -75,16 +75,28 @@ impl InterpreterConfig { /// Lookup a wellknown sysconfig for a given Python interpreter pub fn lookup( - os: Os, - arch: Arch, + target: &Target, python_impl: InterpreterKind, python_version: (usize, usize), - ) -> Option<&'static Self> { + ) -> Option<Self> { let (major, minor) = python_version; - if let Some(os_sysconfigs) = WELLKNOWN_SYSCONFIG.get(&os) { - if let Some(sysconfigs) = os_sysconfigs.get(&arch) { - return sysconfigs.iter().find(|s| { - s.interpreter_kind == python_impl && s.major == major && s.minor == minor + if let Some(os_sysconfigs) = WELLKNOWN_SYSCONFIG.get(&target.target_os()) { + if let Some(sysconfigs) = os_sysconfigs.get(&target.target_arch()) { + return sysconfigs.iter().find_map(|s| { + if s.interpreter_kind == python_impl && s.major == major && s.minor == minor { + if python_version >= (3, 11) && target.is_musl_target() { + // See https://github.com/pypa/auditwheel/issues/349 + let mut musl_config = s.clone(); + musl_config.ext_suffix = s + .ext_suffix + .replace("-gnu", &format!("-{}", target.target_env())); + Some(musl_config) + } else { + Some(s.clone()) + } + } else { + None + } }); } } @@ -255,10 +267,27 @@ #[test] fn test_pyo3_config_file() { - let sysconfig = - InterpreterConfig::lookup(Os::Linux, Arch::X86_64, InterpreterKind::CPython, (3, 10)) - .unwrap(); + let sysconfig = InterpreterConfig::lookup( + &Target::from_target_triple(Some("x86_64-unknown-linux-gnu".to_string())).unwrap(), + InterpreterKind::CPython, + (3, 10), + ) + .unwrap(); + assert_eq!(sysconfig.ext_suffix, ".cpython-310-x86_64-linux-gnu.so"); let config_file = sysconfig.pyo3_config_file(); assert_eq!(config_file, "implementation=CPython\nversion=3.10\nshared=true\nabi3=false\nbuild_flags=WITH_THREAD\nsuppress_build_script_link_lines=false\npointer_width=64"); } + + #[test] + fn test_pyo3_config_file_musl_python_3_11() { + let sysconfig = InterpreterConfig::lookup( + &Target::from_target_triple(Some("x86_64-unknown-linux-musl".to_string())).unwrap(), + InterpreterKind::CPython, + (3, 11), + ) + .unwrap(); + assert_eq!(sysconfig.ext_suffix, ".cpython-311-x86_64-linux-musl.so"); + let config_file = sysconfig.pyo3_config_file(); + assert_eq!(config_file, "implementation=CPython\nversion=3.11\nshared=true\nabi3=false\nbuild_flags=WITH_THREAD\nsuppress_build_script_link_lines=false\npointer_width=64"); + } } ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/python-maturin/vendor.tar.xz /work/SRC/openSUSE:Factory/.python-maturin.new.19717/vendor.tar.xz differ: char 27, line 1
