Merge branch 'develop' into data_handler

2020-01-04 11:36:27 +01:00
parent 699c0d6bc3 3798f94d4c
commit 2409261cb7
18 changed files with 400 additions and 325 deletions
--- a/tests/data/test_btanalysis.py
+++ b/tests/data/test_btanalysis.py
@@ -20,7 +20,7 @@ def test_load_backtest_data(testdatadir):
    filename = testdatadir / "backtest-result_test.json"
    bt_data = load_backtest_data(filename)
    assert isinstance(bt_data, DataFrame)
-    assert list(bt_data.columns) == BT_DATA_COLUMNS + ["profitabs"]
+    assert list(bt_data.columns) == BT_DATA_COLUMNS + ["profit"]
    assert len(bt_data) == 179

    # Test loading from string (must yield same result)