ngiab-data-preprocess 4.6.0__tar.gz → 4.6.2__tar.gz

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.6.0
+Version: 4.6.2
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess
@@ -20,7 +20,7 @@ Requires-Dist: igraph==0.11.4
 Requires-Dist: s3fs==2024.3.1
 Requires-Dist: xarray==2024.2.0
 Requires-Dist: zarr==2.17.1
-Requires-Dist: netCDF4>=1.6.5
+Requires-Dist: netCDF4<1.7.3,>=1.6.5
 Requires-Dist: dask==2024.4.1
 Requires-Dist: dask[distributed]==2024.4.1
 Requires-Dist: h5netcdf==1.3.0

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/modules/data_processing/file_paths.py

@@ -13,7 +13,6 @@ class FilePaths:
     hydrofabric_dir = Path("~/.ngiab/hydrofabric/v2.2").expanduser()
     hydrofabric_download_log = Path("~/.ngiab/hydrofabric/v2.2/download_log.json").expanduser()
     no_update_hf = Path("~/.ngiab/hydrofabric/v2.2/no_update").expanduser()
-    cache_dir = Path("~/.ngiab/zarr_cache").expanduser()
     output_dir = None
     data_sources = Path(__file__).parent.parent / "data_sources"
     map_app_static = Path(__file__).parent.parent / "map_app" / "static"
@@ -53,8 +52,6 @@ class FilePaths:
             self.output_dir = Path(output_dir)
             self.folder_name = self.output_dir.stem
 
-        self.cache_dir.mkdir(parents=True, exist_ok=True)
-
     @classmethod
     def get_working_dir(cls) -> Path | None:
         try:

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/modules/data_processing/forcings.py

@@ -382,7 +382,7 @@ def compute_zonal_stats(
 
     cat_chunks: List[pd.DataFrame] = np.array_split(catchments, num_partitions)  # type: ignore
 
-    progress_file = FilePaths(output_dir=forcings_dir.parent.stem).forcing_progress_file
+    progress_file = FilePaths(output_dir=forcings_dir.parent).forcing_progress_file
     ex_var_name = list(gridded_data.data_vars)[0]
     example_time_chunks = get_index_chunks(gridded_data[ex_var_name])
     all_steps = len(example_time_chunks) * len(gridded_data.data_vars)

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/modules/ngiab_data_cli/__main__.py

@@ -9,6 +9,7 @@ with rich.status.Status("loading") as status:
     import subprocess
     import time
     from multiprocessing import cpu_count
+    from pathlib import Path
 
     import geopandas as gpd
     from data_processing.create_realization import create_lstm_realization, create_realization
@@ -143,7 +144,7 @@ def main() -> None:
 
         if args.output_root:
             with open(FilePaths.config_file, "w") as config_file:
-                config_file.write(args.output_root)
+                config_file.write(str(Path(args.output_root).expanduser().absolute()))
             logging.info(
                 f"Changed default directory where outputs are stored to {args.output_root}"
             )

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/modules/ngiab_data_preprocess.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.6.0
+Version: 4.6.2
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess
@@ -20,7 +20,7 @@ Requires-Dist: igraph==0.11.4
 Requires-Dist: s3fs==2024.3.1
 Requires-Dist: xarray==2024.2.0
 Requires-Dist: zarr==2.17.1
-Requires-Dist: netCDF4>=1.6.5
+Requires-Dist: netCDF4<1.7.3,>=1.6.5
 Requires-Dist: dask==2024.4.1
 Requires-Dist: dask[distributed]==2024.4.1
 Requires-Dist: h5netcdf==1.3.0

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/modules/ngiab_data_preprocess.egg-info/requires.txt

@@ -7,7 +7,7 @@ igraph==0.11.4
 s3fs==2024.3.1
 xarray==2024.2.0
 zarr==2.17.1
-netCDF4>=1.6.5
+netCDF4<1.7.3,>=1.6.5
 dask==2024.4.1
 dask[distributed]==2024.4.1
 h5netcdf==1.3.0

{ngiab_data_preprocess-4.6.0 → ngiab_data_preprocess-4.6.2}/pyproject.toml

@@ -19,7 +19,7 @@ filterwarnings = [
 ]
 [project]
 name = "ngiab_data_preprocess"
-version = "v4.6.0"
+version = "v4.6.2"
 authors = [{ name = "Josh Cunningham", email = "jcunningham8@ua.edu" }]
 description = "Graphical Tools for creating Next Gen Water model input data."
 readme = "README.md"
@@ -39,7 +39,7 @@ dependencies = [
     "s3fs==2024.3.1",
     "xarray==2024.2.0",
     "zarr==2.17.1",
-    "netCDF4>=1.6.5",
+    "netCDF4>=1.6.5,<1.7.3",
     "dask==2024.4.1",
     "dask[distributed]==2024.4.1",
     "h5netcdf==1.3.0",