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-03-29 23:27:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-maturin (Old) and /work/SRC/openSUSE:Factory/.python-maturin.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-maturin" Wed Mar 29 23:27:16 2023 rev:27 rq:1075083 version:0.14.16 Changes: -------- --- /work/SRC/openSUSE:Factory/python-maturin/python-maturin.changes 2023-03-19 00:31:09.972258572 +0100 +++ /work/SRC/openSUSE:Factory/.python-maturin.new.31432/python-maturin.changes 2023-03-29 23:27:35.239581187 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 02:18:48 UTC 2023 - Mia Herkt <m...@0x0.st> + +- Update to v0.14.16: + * Deprecate package.metadata.maturin.name in favor of + tool.maturin.module-name in pyproject.toml + gh#PyO3/maturin#1531 + +------------------------------------------------------------------- Old: ---- maturin-0.14.15.tar.gz New: ---- maturin-0.14.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-maturin.spec ++++++ --- /var/tmp/diff_new_pack.7TFSka/_old 2023-03-29 23:27:37.219591768 +0200 +++ /var/tmp/diff_new_pack.7TFSka/_new 2023-03-29 23:27:37.255591960 +0200 @@ -17,7 +17,7 @@ Name: python-maturin -Version: 0.14.15 +Version: 0.14.16 Release: 0 Summary: Rust/Python Interoperability License: Apache-2.0 OR MIT @@ -25,7 +25,7 @@ Source: https://files.pythonhosted.org/packages/source/m/maturin/maturin-%{version}.tar.gz Source1: vendor.tar.xz Source2: cargo_config -Patch: vendor-update-ahash-dependency.patch +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.15.tar.gz -> maturin-0.14.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/.cirrus.yml new/maturin-0.14.16/.cirrus.yml --- old/maturin-0.14.15/.cirrus.yml 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/.cirrus.yml 2023-03-26 07:07:15.000000000 +0200 @@ -1,5 +1,8 @@ env: RUST_BACKTRACE: 1 + CARGO_INCREMENTAL: 0 + CARGO_TERM_COLOR: always + CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse build_and_test: &BUILD_AND_TEST # only run tasks on pull request or bors related branches @@ -20,11 +23,6 @@ image_family: freebsd-13-1 env: PATH: $HOME/.cargo/bin:$PATH - registry_cache: - folder: $HOME/.cargo/registry - fingerprint_script: - - echo $CIRRUS_OS - - cat Cargo.lock target_cache: folder: target fingerprint_script: @@ -41,11 +39,6 @@ image: ghcr.io/cirruslabs/macos-monterey-xcode env: PATH: $HOME/.cargo/bin:/opt/homebrew/opt/python@3.10/bin:$PATH - registry_cache: - folder: $HOME/.cargo/registry - fingerprint_script: - - echo $CIRRUS_OS - - cat Cargo.lock target_cache: folder: target fingerprint_script: @@ -63,11 +56,6 @@ memory: 4G env: PATH: /root/.cargo/bin:$PATH - registry_cache: - folder: /root/.cargo/registry - fingerprint_script: - - echo $CIRRUS_OS - - cat Cargo.lock target_cache: folder: target fingerprint_script: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/Cargo.lock new/maturin-0.14.16/Cargo.lock --- old/maturin-0.14.15/Cargo.lock 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/Cargo.lock 2023-03-26 07:07:15.000000000 +0200 @@ -763,70 +763,6 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] name = "encoding_rs" version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1373,7 +1309,7 @@ [[package]] name = "maturin" -version = "0.14.15" +version = "0.14.16" dependencies = [ "anyhow", "base64", @@ -1500,13 +1436,13 @@ [[package]] name = "msi" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "9121a6741e9cd1db15795b0615862eb945fc24b15bafce2ce7084eb27c91ac90" +checksum = "eaa7bfcd0ffc3b4dc4a555e5ada4d302b4b6b5ce8d6bc07a6ea703ea63aff149" dependencies = [ "byteorder", "cfb", - "encoding", + "encoding_rs", "uuid", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/Cargo.toml new/maturin-0.14.16/Cargo.toml --- old/maturin-0.14.15/Cargo.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.14.16/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.15" +version = "0.14.16" 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.15/Changelog.md new/maturin-0.14.16/Changelog.md --- old/maturin-0.14.15/Changelog.md 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/Changelog.md 2023-03-26 07:07:15.000000000 +0200 @@ -7,6 +7,10 @@ ## [Unreleased] +## [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) + ## [0.14.15] - 2023-03-03 * Add sdist and sccache support to `generate-ci` command @@ -826,7 +830,8 @@ * Initial Release -[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.15...HEAD +[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.16...HEAD +[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 [0.14.13]: https://github.com/pyo3/maturin/compare/v0.14.12...v0.14.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/PKG-INFO new/maturin-0.14.16/PKG-INFO --- old/maturin-0.14.15/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/maturin-0.14.16/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +1,15 @@ Metadata-Version: 2.1 Name: maturin -Version: 0.14.15 +Version: 0.14.16 Classifier: Topic :: Software Development :: Build Tools Classifier: Programming Language :: Rust Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Requires-Dist: tomli>=1.1.0 ; python_version<'3.11' -Requires-Dist: patchelf; extra == 'patchelf' Requires-Dist: ziglang~=0.10.0; extra == 'zig' -Provides-Extra: patchelf +Requires-Dist: patchelf; extra == 'patchelf' Provides-Extra: zig +Provides-Extra: patchelf Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages Keywords: python,cffi,packaging,pypi,pyo3 Home-Page: https://github.com/pyo3/maturin @@ -18,9 +18,9 @@ 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: Source Code, https://github.com/PyO3/maturin Project-URL: Issues, https://github.com/PyO3/maturin/issues -Project-URL: Documentation, https://maturin.rs Project-URL: Changelog, https://maturin.rs/changelog.html # Maturin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/setup.py new/maturin-0.14.16/setup.py --- old/maturin-0.14.15/setup.py 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/setup.py 2023-03-26 07:07:15.000000000 +0200 @@ -1,4 +1,4 @@ -# maturin is self bootstraping, however on platforms like alpine linux that aren't +# maturin is self bootstrapping, however on platforms like alpine linux that aren't # manylinux, pip will try installing maturin from the source distribution. # That source distribution obviously can't depend on maturin, so we're using # the always available setuptools. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/src/build_options.rs new/maturin-0.14.16/src/build_options.rs --- old/maturin-0.14.15/src/build_options.rs 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/src/build_options.rs 2023-03-26 07:07:15.000000000 +0200 @@ -510,11 +510,11 @@ }), )?; - if !bridge.is_bin() && module_name.contains('-') { + if !bridge.is_bin() && project_layout.extension_name.contains('-') { bail!( "The module name must not contain a minus `-` \ (Make sure you have set an appropriate [lib] name or \ - [package.metadata.maturin] name in your Cargo.toml)" + [tool.maturin] module-name in your pyproject.toml)" ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/src/project_layout.rs new/maturin-0.14.16/src/project_layout.rs --- old/maturin-0.14.15/src/project_layout.rs 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/src/project_layout.rs 2023-03-26 07:07:15.000000000 +0200 @@ -128,8 +128,15 @@ .unwrap_or(crate_name) .to_owned(); - let extension_name = extra_metadata.name.as_ref().unwrap_or(&module_name); - + let extension_name = pyproject + .and_then(|x| x.module_name()) + .or_else(|| { + if extra_metadata.name.is_some() { + eprintln!("â ï¸ Warning: specify [package.metadata.maturin] name in Cargo.toml is deprecated, use module-name in [tool.maturin] section in pyproject.toml instead"); + } + extra_metadata.name.as_deref() + }) + .unwrap_or(&module_name); let project_root = if pyproject_file.is_file() { pyproject_file.parent().unwrap_or(manifest_dir) } else { @@ -143,7 +150,7 @@ Some(py_src) => project_root.join(py_src), None => match extra_metadata.python_source.as_ref() { Some(py_src) => { - println!("â ï¸ Warning: specify python-source in Cargo.toml is deprecated, use python-source in [tool.maturin] section in pyproject.toml instead"); + eprintln!("â ï¸ Warning: specify python-source in Cargo.toml is deprecated, use python-source in [tool.maturin] section in pyproject.toml instead"); manifest_dir.join(py_src) } None => match pyproject.and_then(|x| x.project_name()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maturin-0.14.15/src/pyproject_toml.rs new/maturin-0.14.16/src/pyproject_toml.rs --- old/maturin-0.14.15/src/pyproject_toml.rs 2023-03-03 10:38:14.000000000 +0100 +++ new/maturin-0.14.16/src/pyproject_toml.rs 2023-03-26 07:07:15.000000000 +0200 @@ -86,6 +86,8 @@ #[serde(rename_all = "kebab-case")] pub struct ToolMaturin { // maturin specific options + // extension module name, accepts setuptools style import name like `foo.bar` + module_name: Option<String>, // TODO(0.15.0): remove deprecated sdist_include: Option<Vec<String>>, include: Option<Vec<GlobPattern>>, @@ -172,6 +174,11 @@ self.tool.as_ref()?.maturin.as_ref() } + /// Returns the value of `[tool.maturin.module-name]` in pyproject.toml + pub fn module_name(&self) -> Option<&str> { + self.maturin()?.module_name.as_deref() + } + /// Returns the value of `[tool.maturin.sdist-include]` in pyproject.toml #[deprecated( since = "0.14.0", ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/python-maturin/vendor.tar.xz /work/SRC/openSUSE:Factory/.python-maturin.new.31432/vendor.tar.xz differ: char 27, line 1
