Merge branch 'develop' into pr/wizrds/7303

2022-09-20 06:56:15 +02:00
parent 3274bb0751 32d46e8a6b
commit 914eccecec
103 changed files with 1189 additions and 442 deletions
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2287,7 +2287,7 @@ def tickers():


@pytest.fixture
-def result(testdatadir):
+def dataframe_1m(testdatadir):
    with (testdatadir / 'UNITTEST_BTC-1m.json').open('r') as data_file:
        return ohlcv_to_dataframe(json.load(data_file), '1m', pair="UNITTEST/BTC",
                                  fill_missing=True)