adelorenzo
/
stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4126 from freqtrade/dependabot/pip/develop/pandas-1.2.0 

Bump pandas from 1.1.5 to 1.2.0
This commit is contained in:
Matthias 2020-12-28 10:09:05 +01:00 committed by GitHub
parent fe8898c7f8 0d4cf32086
commit d4e42987e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/data/btanalysis.py
View File

@ -347,7 +347,7 @@ def create_cum_profit(df: pd.DataFrame, trades: pd.DataFrame, col_name: str,
# Resample to timeframe to make sure trades match candles
_trades_sum = trades.resample(f'{timeframe_minutes}min', on='close_date'
)[['profit_percent']].sum()
df.loc[:, col_name] = _trades_sum.cumsum()
df.loc[:, col_name] = _trades_sum['profit_percent'].cumsum()
# Set first value to 0
df.loc[df.iloc[0].name, col_name] = 0
# FFill to get continuous

2
requirements.txt
View File

@ -1,5 +1,5 @@
numpy==1.19.4
pandas==1.1.5
pandas==1.2.0
ccxt==1.39.79
aiohttp==3.7.3

2
tests/rpc/test_rpc_apiserver.py
View File

@ -929,7 +929,7 @@ def test_api_pair_candles(botclient, ohlcv_history):
['2017-11-26 08:55:00', 8.88e-05, 8.942e-05, 8.88e-05,
8.893e-05, 0.05874751, 8.886500000000001e-05, 1, 0, 1511686500000, 8.88e-05, None],
['2017-11-26 09:00:00', 8.891e-05, 8.893e-05, 8.875e-05, 8.877e-05,
0.7039405, 8.885000000000002e-05, 0, 0, 1511686800000, None, None]
0.7039405, 8.885e-05, 0, 0, 1511686800000, None, None]
])