dsgrid-toolkit 0.3.0__tar.gz → 0.3.2__tar.gz

{dsgrid_toolkit-0.3.0 → dsgrid_toolkit-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsgrid-toolkit
-Version: 0.3.0
+Version: 0.3.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License

dsgrid_toolkit-0.3.2/build_backend.py

@@ -0,0 +1,81 @@
+"""Custom build backend that wraps maturin but allows fallback when Rust is unavailable.
+
+This allows `pip install -e .` to succeed even without a Rust toolchain installed,
+while still building the Rust extension when building wheels for distribution.
+"""
+
+import shutil
+import sys
+import warnings
+
+# Check if Rust toolchain is available
+RUST_AVAILABLE = shutil.which("cargo") is not None
+
+
+def _warn_no_rust():
+    """Warn that Rust extension will not be built."""
+    msg = (
+        "Rust toolchain (cargo) not found. The dsgrid Rust extension (minimal_patterns) "
+        "will not be built. Some functionality will be unavailable. "
+        "To build the Rust extension, install Rust from https://rustup.rs/"
+    )
+    # Use warnings module - this is typically shown by pip
+    warnings.warn(msg, UserWarning, stacklevel=2)
+    # Also print directly to stderr for visibility
+    print(f"\n{'='*70}", file=sys.stderr)
+    print("WARNING: Rust toolchain not found.", file=sys.stderr)
+    print("Building dsgrid without Rust extension (minimal_patterns).", file=sys.stderr)
+    print("Some functionality will be unavailable.", file=sys.stderr)
+    print(f"{'='*70}\n", file=sys.stderr)
+    # Flush to ensure it appears
+    sys.stderr.flush()
+
+
+# For wheel builds (CI), always use maturin
+def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
+    """Build wheel - requires Rust for distribution builds."""
+    import maturin
+
+    return maturin.build_wheel(wheel_directory, config_settings, metadata_directory)
+
+
+def build_sdist(sdist_directory, config_settings=None):
+    """Build source distribution."""
+    import maturin
+
+    return maturin.build_sdist(sdist_directory, config_settings)
+
+
+def get_requires_for_build_wheel(config_settings=None):
+    """Get requirements for building wheel."""
+    return ["maturin>=1.0,<2.0"]
+
+
+def get_requires_for_build_sdist(config_settings=None):
+    """Get requirements for building sdist."""
+    return ["maturin>=1.0,<2.0"]
+
+
+# For editable installs, allow fallback without Rust
+def build_editable(wheel_directory, config_settings=None, metadata_directory=None):
+    """Build editable install - can work without Rust."""
+    if RUST_AVAILABLE:
+        import maturin
+
+        return maturin.build_editable(wheel_directory, config_settings, metadata_directory)
+    else:
+        _warn_no_rust()
+        # Fall back to setuptools for editable install without Rust extension
+        import setuptools.build_meta
+
+        return setuptools.build_meta.build_editable(
+            wheel_directory, config_settings, metadata_directory
+        )
+
+
+def get_requires_for_build_editable(config_settings=None):
+    """Get requirements for editable install."""
+    if RUST_AVAILABLE:
+        return ["maturin>=1.0,<2.0"]
+    else:
+        return ["setuptools>=61.0"]

{dsgrid_toolkit-0.3.0 → dsgrid_toolkit-0.3.2}/dsgrid/__init__.py

@@ -9,7 +9,7 @@ __description__ = (
     "Python API for registring and accessing demand-side grid model (dsgrid) datasets"
 )
 __url__ = "https://github.com/dsgrid/dsgrid"
-__version__ = "0.3.0"
+__version__ = "0.3.2"
 __author__ = "NREL"
 __maintainer_email__ = "elaine.hale@nrel.gov"
 __license__ = "BSD-3"

{dsgrid_toolkit-0.3.0 → dsgrid_toolkit-0.3.2}/pyproject.toml

@@ -61,6 +61,7 @@ module-name = "dsgrid.minimal_patterns"
 python-source = "."
 features = ["pyo3/extension-module"]
 manifest-path = "rust/Cargo.toml"
+include = ["build_backend.py"]
 
 [tool.setuptools]
 # Used as fallback when Rust toolchain is not available

{dsgrid_toolkit-0.3.0 → dsgrid_toolkit-0.3.2}/rust/Cargo.lock

@@ -185,9 +185,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.2.52"
+version = "1.2.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
+checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -203,9 +203,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 dependencies = [
  "num-traits",
 ]
@@ -246,7 +246,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "dsgrid-patterns"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "ahash",
  "anyhow",
@@ -283,9 +283,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
 [[package]]
 name = "flate2"
@@ -459,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.83"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -596,9 +596,9 @@ checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -668,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
@@ -856,18 +856,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -878,9 +878,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -888,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -901,18 +901,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "xxhash-rust"

{dsgrid_toolkit-0.3.0 → dsgrid_toolkit-0.3.2}/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dsgrid-patterns"
-version = "0.3.0"
+version = "0.3.2"
 edition = "2021"
 readme = "README.md"