Merge branch 'develop' into fix/backtest_toomanyopen

2018-11-24 10:38:30 +01:00
parent 59cd4fe0ef e4d9d72ff1
commit 805f509498
47 changed files with 2615 additions and 301 deletions
--- a/freqtrade/tests/optimize/init.py
+++ b/freqtrade/tests/optimize/init.py
@@ -31,8 +31,8 @@ class BTContainer(NamedTuple):


 def _get_frame_time_from_offset(offset):
-    return ticker_start_time.shift(
-        minutes=(offset * TICKER_INTERVAL_MINUTES[tests_ticker_interval])).datetime
+    return ticker_start_time.shift(minutes=(offset * TICKER_INTERVAL_MINUTES[tests_ticker_interval])
+                                   ).datetime.replace(tzinfo=None)


 def _build_backtest_dataframe(ticker_with_signals):