ocf-data-sampler 0.2.11__tar.gz → 0.2.13__tar.gz

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocf-data-sampler
-Version: 0.2.11
+Version: 0.2.13
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License
@@ -38,11 +38,9 @@ Requires-Dist: zarr==2.18.3
 Requires-Dist: numcodecs==0.13.1
 Requires-Dist: dask
 Requires-Dist: matplotlib
-Requires-Dist: ocf_blosc2
 Requires-Dist: pvlib
 Requires-Dist: pydantic
 Requires-Dist: pyproj
-Requires-Dist: pathy
 Requires-Dist: pyaml_env
 Requires-Dist: pyresample
 Requires-Dist: h5netcdf

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/ocf_data_sampler/load/__init__.py

@@ -1,4 +1,3 @@
-import ocf_blosc2
 from ocf_data_sampler.load.gsp import open_gsp
 from ocf_data_sampler.load.nwp import open_nwp
 from ocf_data_sampler.load.satellite import open_sat_data

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/ocf_data_sampler/select/find_contiguous_time_periods.py

@@ -247,15 +247,10 @@ def intersection_of_2_dataframes_of_periods(a: pd.DataFrame, b: pd.DataFrame) ->
         # Five ways in which two periods may overlap:
         # a: |----| or |---|   or  |---| or   |--|   or |-|
         # b:  |--|       |---|   |---|      |------|    |-|
-        # In all five, `a` must always start before `b` ends,
-        # and `a` must always end after `b` starts:
+        # In all five, `a` must always start before (or equal to) where `b` ends,
+        # and `a` must always end after (or equal to) where `b` starts.
 
-        # TODO: <= and >= because we should allow overlap time periods of length 1. e.g.
-        # a: |----|      or   |---|
-        # b:      |--|            |---|
-        # These aren't allowed if we use < and >.
-
-        overlapping_periods = b[(a_period.start_dt < b.end_dt) & (a_period.end_dt > b.start_dt)]
+        overlapping_periods = b[(a_period.start_dt <= b.end_dt) & (a_period.end_dt >= b.start_dt)]
 
         # There are two ways in which two periods may *not* overlap:
         # a: |---|        or        |---|

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/ocf_data_sampler.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocf-data-sampler
-Version: 0.2.11
+Version: 0.2.13
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License
@@ -38,11 +38,9 @@ Requires-Dist: zarr==2.18.3
 Requires-Dist: numcodecs==0.13.1
 Requires-Dist: dask
 Requires-Dist: matplotlib
-Requires-Dist: ocf_blosc2
 Requires-Dist: pvlib
 Requires-Dist: pydantic
 Requires-Dist: pyproj
-Requires-Dist: pathy
 Requires-Dist: pyaml_env
 Requires-Dist: pyresample
 Requires-Dist: h5netcdf

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/ocf_data_sampler.egg-info/requires.txt

@@ -6,11 +6,9 @@ zarr==2.18.3
 numcodecs==0.13.1
 dask
 matplotlib
-ocf_blosc2
 pvlib
 pydantic
 pyproj
-pathy
 pyaml_env
 pyresample
 h5netcdf

{ocf_data_sampler-0.2.11 → ocf_data_sampler-0.2.13}/pyproject.toml

@@ -29,11 +29,9 @@ dependencies = [
     "numcodecs==0.13.1",
     "dask",
     "matplotlib",
-    "ocf_blosc2",
     "pvlib",
     "pydantic",
     "pyproj",
-    "pathy",
     "pyaml_env",
     "pyresample",
     "h5netcdf",