ducpy 3.2.3__tar.gz → 3.3.0__tar.gz

{ducpy-3.2.3 → ducpy-3.3.0}/Cargo.lock

@@ -412,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "ducpy-native"
-version = "3.2.3"
+version = "3.3.0"
 dependencies = [
  "duc",
  "pyo3",

{ducpy-3.2.3 → ducpy-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducpy
-Version: 3.2.3
+Version: 3.3.0
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: nanoid>=2.0.0
 License-File: LICENSE

{ducpy-3.2.3 → ducpy-3.3.0}/packages/ducpy/crate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ducpy-native"
-version = "3.2.3"
+version = "3.3.0"
 edition = "2021"
 description = "Python native extension for the duc file format (used by ducpy)"
 publish = false

{ducpy-3.2.3 → ducpy-3.3.0}/packages/ducrs/build.rs

@@ -1,6 +1,6 @@
 use std::env;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 /// Extract raw `PRAGMA user_version = <N>;` from `duc.sql`.
 fn schema_user_version_from_sql(sql: &str) -> u32 {
@@ -24,23 +24,45 @@ fn decode_user_version_to_semver(user_version: u32) -> String {
     format!("{major}.{minor}.{patch}")
 }
 
+fn find_schema_dir(manifest_dir: &Path) -> Result<PathBuf, Box<dyn std::error::Error>> {
+    if let Ok(path) = env::var("DUC_SCHEMA_DIR") {
+        let candidate = PathBuf::from(path);
+        if candidate.join("duc.sql").is_file() {
+            return Ok(candidate);
+        }
+    }
+
+    for ancestor in manifest_dir.ancestors() {
+        for candidate in [
+            ancestor.join("schema"),
+            ancestor.join("packages").join("ducpy").join("schema"),
+        ] {
+            if candidate.join("duc.sql").is_file() {
+                return Ok(candidate);
+            }
+        }
+    }
+
+    Err(format!(
+        "Could not locate schema/duc.sql from {}. Set DUC_SCHEMA_DIR to a directory containing duc.sql.",
+        manifest_dir.display()
+    )
+    .into())
+}
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
-    let schema_dir = manifest_dir.join("..").join("..").join("schema");
+    let schema_dir = find_schema_dir(&manifest_dir)?;
     let out_dir = PathBuf::from(env::var("OUT_DIR")?);
+    println!("cargo:rerun-if-env-changed=DUC_SCHEMA_DIR");
 
     // Copy schema files into OUT_DIR so bootstrap.rs can include_str! them
     // even when the crate is built from an sdist in a temp directory.
     for name in ["duc.sql", "version_control.sql", "search.sql"] {
         let src = schema_dir.join(name);
         let dst = out_dir.join(name);
-        match fs::read_to_string(&src) {
-            Ok(contents) => fs::write(&dst, contents)?,
-            Err(e) => {
-                eprintln!("cargo:warning=Could not read {:?}: {e}. Writing empty stub.", src);
-                fs::write(&dst, "")?;
-            }
-        }
+        let contents = fs::read_to_string(&src)?;
+        fs::write(&dst, contents)?;
         println!("cargo:rerun-if-changed={}", src.display());
     }
     // Scan schema/migrations/*.sql, parse (from, to) from filenames like
@@ -127,4 +149,4 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("cargo:rerun-if-changed=build.rs");
 
     Ok(())
-} 
+} 

{ducpy-3.2.3 → ducpy-3.3.0}/pyproject.toml

@@ -32,7 +32,9 @@ build-backend = "maturin"
 [tool.maturin]
 module-name = "ducpy_native"
 include = [
-    { path = "LICENSE", format = "sdist" }
+    { path = "LICENSE", format = "sdist" },
+    { path = "schema/**/*", format = "sdist" },
+    { path = "schema/**/*", format = "wheel" }
 ]
 manifest-path = "packages/ducpy/crate/Cargo.toml"
 python-source = "src"