Skip to content

Commit 6332a3e

Browse files
Fix: some unit tests failed when using Pandas 2.0
Issue #176
1 parent 633a7e7 commit 6332a3e

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

openeo_driver/ProcessGraphDeserializer.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,17 +1081,17 @@ def _period_to_intervals(start, end, period) -> List[Tuple[pd.Timestamp, pd.Time
10811081
# TODO: "hour" support?
10821082
if "day" == period:
10831083
offset = timedelta(days=1)
1084-
start_dates = pd.date_range(start - offset, end, freq='D', closed='left')
1085-
end_dates = pd.date_range(start, end + offset, freq='D', closed='left')
1084+
start_dates = pd.date_range(start - offset, end, freq="D", inclusive="left")
1085+
end_dates = pd.date_range(start, end + offset, freq="D", inclusive="left")
10861086
intervals = zip(start_dates, end_dates)
10871087
elif "week" == period:
10881088
offset = timedelta(weeks=1)
1089-
start_dates = pd.date_range(start - offset, end, freq='W', closed='left')
1090-
end_dates = pd.date_range(start, end + offset, freq='W', closed='left')
1089+
start_dates = pd.date_range(start - offset, end, freq="W", inclusive="left")
1090+
end_dates = pd.date_range(start, end + offset, freq="W", inclusive="left")
10911091
intervals = zip(start_dates, end_dates)
10921092
elif "dekad" == period:
10931093
offset = timedelta(days=10)
1094-
start_dates = pd.date_range(start - offset, end, freq='MS', closed='left')
1094+
start_dates = pd.date_range(start - offset, end, freq="MS", inclusive="left")
10951095
ten_days = pd.Timedelta(days=10)
10961096
first_dekad_month = [(date, date + ten_days) for date in start_dates]
10971097
second_dekad_month = [(date + ten_days, date + ten_days + ten_days) for date in start_dates]
@@ -1114,8 +1114,12 @@ def _period_to_intervals(start, end, period) -> List[Tuple[pd.Timestamp, pd.Time
11141114
intervals = [(p.to_timestamp(), month_shift(p.to_timestamp(), months=6)) for p in periods]
11151115
elif "year" == period:
11161116
offset = timedelta(weeks=52)
1117-
start_dates = pd.date_range(start - offset, end, freq='A-DEC', closed='left') + timedelta(days=1)
1118-
end_dates = pd.date_range(start, end + offset, freq='A-DEC', closed='left') + timedelta(days=1)
1117+
start_dates = pd.date_range(
1118+
start - offset, end, freq="A-DEC", inclusive="left"
1119+
) + timedelta(days=1)
1120+
end_dates = pd.date_range(
1121+
start, end + offset, freq="A-DEC", inclusive="left"
1122+
) + timedelta(days=1)
11191123
intervals = zip(start_dates, end_dates)
11201124
# TODO: "decade" support?
11211125
# TODO: "decade-ad" support?

tests/test_save_result_netcdf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def test_aggregate_polygon_result_basic(tmp_path):
4343
timeseries_ds.red.sel(feature=1)
4444
timeseries_ds.red.sel( t='2019-10-16')
4545
print(timeseries_ds)
46-
assert_array_equal( 4, timeseries_ds.red.sel(feature=1).sel( t="2019-10-15T08:15:45Z").data)
46+
assert_array_equal(
47+
4, timeseries_ds.red.sel(feature=1).sel(t="2019-10-15T08:15:45").data
48+
)
4749

4850

4951
def test_aggregate_polygon_result_nan_values(tmp_path):
@@ -150,4 +152,4 @@ def test_aggregate_polygon_result_CSV(tmp_path):
150152

151153
timeseries_ds.red.sel( t='2017-09-05')
152154

153-
assert_allclose( timeseries_ds.red.sel(feature=2).sel( t='2017-09-06').data,4645.719597)
155+
assert_allclose( timeseries_ds.red.sel(feature=2).sel( t='2017-09-06').data,4645.719597)

0 commit comments

Comments
 (0)