Merge pull request #13048 from freqtrade/dependabot/pip/develop/pandas-3.0.2
chore(deps): bump pandas from 2.3.3 to 3.0.2
This commit is contained in:
+6
-6
@@ -176,20 +176,20 @@ def generate_test_data(
|
||||
|
||||
base = np.random.normal(base, 2, size=size)
|
||||
if timeframe == "1y":
|
||||
date = pd.date_range(start, periods=size, freq="1YS", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq="1YS", tz="UTC", unit="ms")
|
||||
elif timeframe == "1M":
|
||||
date = pd.date_range(start, periods=size, freq="1MS", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq="1MS", tz="UTC", unit="ms")
|
||||
elif timeframe == "3M":
|
||||
date = pd.date_range(start, periods=size, freq="3MS", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq="3MS", tz="UTC", unit="ms")
|
||||
elif timeframe == "1w" or timeframe == "7d":
|
||||
date = pd.date_range(start, periods=size, freq="1W-MON", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq="1W-MON", tz="UTC", unit="ms")
|
||||
else:
|
||||
tf_mins = timeframe_to_minutes(timeframe)
|
||||
if tf_mins >= 1:
|
||||
date = pd.date_range(start, periods=size, freq=f"{tf_mins}min", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq=f"{tf_mins}min", tz="UTC", unit="ms")
|
||||
else:
|
||||
tf_secs = timeframe_to_seconds(timeframe)
|
||||
date = pd.date_range(start, periods=size, freq=f"{tf_secs}s", tz="UTC")
|
||||
date = pd.date_range(start, periods=size, freq=f"{tf_secs}s", tz="UTC", unit="ms")
|
||||
df = pd.DataFrame(
|
||||
{
|
||||
"date": date,
|
||||
|
||||
@@ -207,10 +207,13 @@ def test_ohlcv_to_dataframe_multi(timeframe):
|
||||
|
||||
data1 = data.copy()
|
||||
if timeframe in ("1M", "3M", "1y"):
|
||||
data1.loc[:, "date"] = data1.loc[:, "date"] + pd.to_timedelta("1w")
|
||||
data1.loc[:, "date"] = data1.loc[:, "date"] + pd.to_timedelta("1W")
|
||||
else:
|
||||
# Shift by half a timeframe
|
||||
data1.loc[:, "date"] = data1.loc[:, "date"] + (pd.to_timedelta(timeframe) / 2)
|
||||
timeframe_f = (
|
||||
timeframe.upper() if timeframe.endswith("d") or timeframe.endswith("w") else timeframe
|
||||
)
|
||||
data1.loc[:, "date"] = data1.loc[:, "date"] + (pd.to_timedelta(timeframe_f) / 2)
|
||||
df2 = ohlcv_to_dataframe(data1, timeframe, "UNITTEST/USDT")
|
||||
|
||||
assert len(df2) == len(data) - 1
|
||||
|
||||
@@ -860,6 +860,9 @@ def test_backtest_one(default_conf, mocker, testdatadir) -> None:
|
||||
"funding_fees": [0.0, 0.0],
|
||||
}
|
||||
)
|
||||
# TODO: pandas3 - create correctly above ?!?
|
||||
expected["open_date"] = expected["open_date"].astype("datetime64[ms, UTC]")
|
||||
expected["close_date"] = expected["close_date"].astype("datetime64[ms, UTC]")
|
||||
pd.testing.assert_frame_equal(results, expected)
|
||||
assert "orders" in results.columns
|
||||
data_pair = processed[pair]
|
||||
|
||||
@@ -83,6 +83,9 @@ def test_backtest_position_adjustment(default_conf, fee, mocker, testdatadir) ->
|
||||
"funding_fees": [0.0, 0.0],
|
||||
}
|
||||
)
|
||||
# TODO: pandas3 - create correctly above ?!?
|
||||
expected["open_date"] = expected["open_date"].astype("datetime64[ms, UTC]")
|
||||
expected["close_date"] = expected["close_date"].astype("datetime64[ms, UTC]")
|
||||
results_no = results.drop(columns=["orders"])
|
||||
pd.testing.assert_frame_equal(results_no, expected, check_exact=True)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user