Skip to content

Commit 0f24dbf

Browse files
committed
REF: Avoid deprecated pandas.Index.__and__
1 parent a114c86 commit 0f24dbf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

backtesting/backtesting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ def __init__(self,
10541054

10551055
if len(data) == 0:
10561056
raise ValueError('OHLC `data` is empty')
1057-
if len(data.columns & {'Open', 'High', 'Low', 'Close', 'Volume'}) != 5:
1057+
if len(data.columns.intersection({'Open', 'High', 'Low', 'Close', 'Volume'})) != 5:
10581058
raise ValueError("`data` must be a pandas.DataFrame with columns "
10591059
"'Open', 'High', 'Low', 'Close', and (optionally) 'Volume'")
10601060
if data[['Open', 'High', 'Low', 'Close']].isnull().values.any():

backtesting/lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def random_ohlc_data(example_data: pd.DataFrame, *,
317317
def shuffle(x):
318318
return x.sample(frac=frac, replace=frac > 1, random_state=random_state)
319319

320-
if len(example_data.columns & {'Open', 'High', 'Low', 'Close'}) != 4:
320+
if len(example_data.columns.intersection({'Open', 'High', 'Low', 'Close'})) != 4:
321321
raise ValueError("`data` must be a pandas.DataFrame with columns "
322322
"'Open', 'High', 'Low', 'Close'")
323323
while True:

0 commit comments

Comments
 (0)