rashdf 0.7.0__tar.gz → 0.7.2__tar.gz

{rashdf-0.7.0 → rashdf-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: rashdf
-Version: 0.7.0
+Version: 0.7.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -23,7 +23,7 @@ Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: kerchunk; extra == "dev"
-Requires-Dist: zarr; extra == "dev"
+Requires-Dist: zarr==2.18.2; extra == "dev"
 Requires-Dist: dask; extra == "dev"
 Requires-Dist: fsspec; extra == "dev"
 Requires-Dist: s3fs; extra == "dev"

{rashdf-0.7.0 → rashdf-0.7.2}/pyproject.toml

@@ -12,11 +12,11 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-version = "0.7.0"
+version = "0.7.2"
 dependencies = ["h5py", "geopandas>=1.0,<2.0", "pyarrow", "xarray"]
 
 [project.optional-dependencies]
-dev = ["pre-commit", "ruff", "pytest", "pytest-cov", "kerchunk", "zarr", "dask", "fsspec", "s3fs", "fiona==1.9.6"]
+dev = ["pre-commit", "ruff", "pytest", "pytest-cov", "kerchunk", "zarr==2.18.2", "dask", "fsspec", "s3fs", "fiona==1.9.6"]
 docs = ["sphinx", "numpydoc", "sphinx_rtd_theme"]
 
 [project.urls]

{rashdf-0.7.0 → rashdf-0.7.2}/src/rashdf/plan.py

@@ -160,7 +160,7 @@ class RasPlanHdf(RasGeomHdf):
     OBS_DATA_PATH = "Event Conditions/Observed Data"
     RESULTS_UNSTEADY_PATH = "Results/Unsteady"
     RESULTS_UNSTEADY_SUMMARY_PATH = f"{RESULTS_UNSTEADY_PATH}/Summary"
-    VOLUME_ACCOUNTING_PATH = f"{RESULTS_UNSTEADY_PATH}/Volume Accounting"
+    VOLUME_ACCOUNTING_PATH = f"{RESULTS_UNSTEADY_SUMMARY_PATH}/Volume Accounting"
     BASE_OUTPUT_PATH = f"{RESULTS_UNSTEADY_PATH}/Output/Output Blocks/Base Output"
     SUMMARY_OUTPUT_2D_FLOW_AREAS_PATH = (
         f"{BASE_OUTPUT_PATH}/Summary Output/2D Flow Areas"
@@ -1121,7 +1121,7 @@ class RasPlanHdf(RasGeomHdf):
         """
         return self.reference_timeseries_output(reftype="lines")
 
-    def observed_timeseries_input(self, vartype: str = "Flow") -> dict:
+    def observed_timeseries_input(self, vartype: str = "Flow") -> xr.DataArray:
         """Return observed timeseries input data for reference lines and points from a HEC-RAS HDF plan file.
 
         Parameters
@@ -1132,8 +1132,8 @@ class RasPlanHdf(RasGeomHdf):
 
         Returns
         -------
-        xr.Dataset
-            An xarray Dataset with observed timeseries input data for both reference lines and reference points.
+        xr.DataArray
+            An xarray DataArray with observed timeseries input data for reference lines or reference points.
         """
         if vartype == "Flow":
             output_path = self.OBS_FLOW_OUTPUT_PATH
@@ -1511,7 +1511,7 @@ class RasPlanHdf(RasGeomHdf):
     def _zmeta(self, ds: xr.Dataset) -> Dict:
         """Given a xarray Dataset, return kerchunk-style zarr reference metadata."""
         from kerchunk.hdf import SingleHdf5ToZarr
-        import zarr
+        from zarr.storage import MemoryStore
         import base64
 
         encoding = {}
@@ -1546,7 +1546,7 @@ class RasPlanHdf(RasGeomHdf):
                 chunk_meta[chunk_key] = [str(self._loc), value["offset"], value["size"]]
         # "Write" the Dataset to a temporary in-memory zarr store (which
         # is the same a Python dictionary)
-        zarr_tmp = zarr.MemoryStore()
+        zarr_tmp = MemoryStore()
         # Use compute=False here because we don't _actually_ want to write
         # the data to the zarr store, we just want to generate the metadata.
         ds.to_zarr(zarr_tmp, mode="w", compute=False, encoding=encoding)

{rashdf-0.7.0 → rashdf-0.7.2}/src/rashdf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: rashdf
-Version: 0.7.0
+Version: 0.7.2
 Summary: Read data from HEC-RAS HDF files.
 Project-URL: repository, https://github.com/fema-ffrd/rashdf
 Classifier: Development Status :: 4 - Beta
@@ -23,7 +23,7 @@ Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: kerchunk; extra == "dev"
-Requires-Dist: zarr; extra == "dev"
+Requires-Dist: zarr==2.18.2; extra == "dev"
 Requires-Dist: dask; extra == "dev"
 Requires-Dist: fsspec; extra == "dev"
 Requires-Dist: s3fs; extra == "dev"

{rashdf-0.7.0 → rashdf-0.7.2}/src/rashdf.egg-info/requires.txt

@@ -9,7 +9,7 @@ ruff
 pytest
 pytest-cov
 kerchunk
-zarr
+zarr==2.18.2
 dask
 fsspec
 s3fs