Merge branch 'develop' into data_handler

2019-12-30 19:40:43 +01:00
parent 814cc20c6b 2537b8cb0c
commit 699c0d6bc3
53 changed files with 319 additions and 156 deletions
--- a/tests/strategy/test_strategy.py
+++ b/tests/strategy/test_strategy.py
@@ -8,7 +8,7 @@ from pathlib import Path
 import pytest
 from pandas import DataFrame

-from freqtrade import OperationalException
+from freqtrade.exceptions import OperationalException
 from freqtrade.resolvers import StrategyResolver
 from freqtrade.strategy.interface import IStrategy
 from tests.conftest import log_has, log_has_re