maturin 1.8.0__tar.gz → 1.8.1__tar.gz

{maturin-1.8.0 → maturin-1.8.1}/Cargo.lock

@@ -1388,7 +1388,7 @@ dependencies = [
 
 [[package]]
 name = "maturin"
-version = "1.8.0"
+version = "1.8.1"
 dependencies = [
  "anyhow",
  "base64 0.21.7",

{maturin-1.8.0 → maturin-1.8.1}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <konstin@mailbox.org>", "messense <messense@icloud.com>"]
 name = "maturin"
-version = "1.8.0"
+version = "1.8.1"
 description = "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
 exclude = [
     "test-crates/**/*",

{maturin-1.8.0 → maturin-1.8.1}/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.8.1]
+
+* Downgrade invalid version info in `pyproject.toml` error to warning in [#2417](https://github.com/PyO3/maturin/pull/2417)
+* Make `maturin develop` fail if version info is invalid in pyproject.toml in [#2418](https://github.com/PyO3/maturin/pull/2418)
+
 ## [1.8.0]
 
 * Don't add wheel data to sdist in [#2367](https://github.com/PyO3/maturin/pull/2367)
@@ -1026,7 +1031,8 @@ points-0.1.0-py2.py3-none-manylinux1_x86_64.whl | 2,8M | 752K | 85K
 
  * Initial Release
 
-[Unreleased]: https://github.com/pyo3/maturin/compare/v1.8.0...HEAD
+[Unreleased]: https://github.com/pyo3/maturin/compare/v1.8.1...HEAD
+[1.8.1]: https://github.com/pyo3/maturin/compare/v1.8.0...v1.8.1
 [1.8.0]: https://github.com/pyo3/maturin/compare/v1.7.8...v1.8.0
 [1.7.8]: https://github.com/pyo3/maturin/compare/v1.7.7...v1.7.8
 [1.7.7]: https://github.com/pyo3/maturin/compare/v1.7.6...v1.7.7

{maturin-1.8.0 → maturin-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maturin
-Version: 1.8.0
+Version: 1.8.1
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{maturin-1.8.0 → maturin-1.8.1}/src/develop.rs

@@ -403,6 +403,16 @@ pub fn develop(develop_options: DevelopOptions, venv_dir: &Path) -> Result<()> {
         .editable(true)
         .build()?;
 
+    // Ensure that version information is present, https://github.com/PyO3/maturin/issues/2416
+    if build_context
+        .pyproject_toml
+        .as_ref()
+        .is_some_and(|p| !p.warn_invalid_version_info())
+    {
+        bail!("Cannot build without valid version information. \
+               You need to specify either `project.version` or `project.dynamic = [\"version\"]` in pyproject.toml.");
+    }
+
     let interpreter =
         PythonInterpreter::check_executable(&python, &target, build_context.bridge())?.ok_or_else(
             || anyhow!("Expected `python` to be a python interpreter inside a virtualenv ಠ_ಠ"),

{maturin-1.8.0 → maturin-1.8.1}/src/metadata.rs

@@ -144,13 +144,18 @@ impl Metadata24 {
             }
 
             self.name.clone_from(&project.name);
-            if let Some(version) = &project.version {
-                if dynamic.contains("version") {
-                    bail!("`project.dynamic` must not specify `version` when `project.version` is present in pyproject.toml");
+
+            let version_ok = pyproject_toml.warn_invalid_version_info();
+            if !version_ok {
+                // This is a hard error for maturin>=2.0, see https://github.com/PyO3/maturin/issues/2416.
+                let current_major = env!("CARGO_PKG_VERSION_MAJOR").parse::<usize>().unwrap();
+                if current_major > 1 {
+                    bail!("Invalid version information in pyproject.toml.");
                 }
+            }
+
+            if let Some(version) = &project.version {
                 self.version = version.clone();
-            } else if !dynamic.contains("version") {
-                bail!("`project.version` field is required in pyproject.toml unless it is present in the `project.dynamic` list");
             }
 
             if let Some(description) = &project.description {

{maturin-1.8.0 → maturin-1.8.1}/src/pyproject_toml.rs

@@ -426,6 +426,30 @@ impl PyProjectToml {
         );
         false
     }
+
+    /// Having a pyproject.toml project table with neither `version` nor `dynamic = ['version']`
+    /// violates https://packaging.python.org/en/latest/specifications/pyproject-toml/#dynamic.
+    ///
+    /// Returns true if version information is specified correctly or no project table is present.
+    pub fn warn_invalid_version_info(&self) -> bool {
+        let Some(project) = &self.project else {
+            return true;
+        };
+        let has_static_version = project.version.is_some();
+        let has_dynamic_version = project
+            .dynamic
+            .as_ref()
+            .is_some_and(|d| d.iter().any(|s| s == "version"));
+        if has_static_version && has_dynamic_version {
+            eprintln!("⚠️  Warning: `project.dynamic` must not specify `version` when `project.version` is present in pyproject.toml");
+            return false;
+        }
+        if !has_static_version && !has_dynamic_version {
+            eprintln!("⚠️  Warning: `project.version` field is required in pyproject.toml unless it is present in the `project.dynamic` list");
+            return false;
+        }
+        true
+    }
 }
 
 #[cfg(test)]
@@ -544,6 +568,62 @@ mod tests {
         assert!(!without_constraint.warn_bad_maturin_version());
     }
 
+    #[test]
+    fn test_warn_invalid_version_info_conflict() {
+        let conflict = toml::from_str::<PyProjectToml>(
+            r#"[build-system]
+            requires = ["maturin==1.0.0"]
+
+            [project]
+            name = "..."
+            version = "1.2.3"
+            dynamic = ['version']
+            "#,
+        )
+        .unwrap();
+        assert!(!conflict.warn_invalid_version_info());
+    }
+
+    #[test]
+    fn test_warn_invalid_version_info_missing() {
+        let missing = toml::from_str::<PyProjectToml>(
+            r#"[build-system]
+            requires = ["maturin==1.0.0"]
+
+            [project]
+            name = "..."
+            "#,
+        )
+        .unwrap();
+        assert!(!missing.warn_invalid_version_info());
+    }
+
+    #[test]
+    fn test_warn_invalid_version_info_ok() {
+        let static_ver = toml::from_str::<PyProjectToml>(
+            r#"[build-system]
+            requires = ["maturin==1.0.0"]
+
+            [project]
+            name = "..."
+            version = "1.2.3"
+            "#,
+        )
+        .unwrap();
+        assert!(static_ver.warn_invalid_version_info());
+        let dynamic_ver = toml::from_str::<PyProjectToml>(
+            r#"[build-system]
+            requires = ["maturin==1.0.0"]
+
+            [project]
+            name = "..."
+            dynamic = ['version']
+            "#,
+        )
+        .unwrap();
+        assert!(dynamic_ver.warn_invalid_version_info());
+    }
+
     #[test]
     fn deserialize_include_exclude() {
         let single = r#"include = ["single"]"#;

{maturin-1.8.0 → maturin-1.8.1}/src/target.rs

@@ -463,11 +463,11 @@ impl Target {
                     PlatformTag::manylinux2010()
                 }
             }
+            Arch::Riscv64 => PlatformTag::Manylinux { x: 2, y: 31 },
             Arch::Armv5teL
             | Arch::Armv6L
             | Arch::Wasm32
             | Arch::Riscv32
-            | Arch::Riscv64
             | Arch::Mips64el
             | Arch::Mips64
             | Arch::Mipsel