From 2267a420a4f20d77b6adbf4dcb0d7a615a1bddb6 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 28 Apr 2018 00:30:42 +0300 Subject: [PATCH] Fix codestyle --- freqtrade/optimize/__init__.py | 9 ++++++--- freqtrade/tests/optimize/test_optimize.py | 2 +- freqtrade/tests/test_arguments.py | 3 ++- scripts/download_backtest_data.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/freqtrade/optimize/__init__.py b/freqtrade/optimize/__init__.py index 10043bf4d..58eb28cb1 100644 --- a/freqtrade/optimize/__init__.py +++ b/freqtrade/optimize/__init__.py @@ -122,7 +122,10 @@ def download_pairs(datadir, pairs: List[str], """For each pairs passed in parameters, download the ticker intervals""" for pair in pairs: try: - download_backtesting_testdata(datadir, pair=pair, interval=ticker_interval, timerange=timerange) + download_backtesting_testdata(datadir, + pair=pair, + interval=ticker_interval, + timerange=timerange) except BaseException: logger.info( 'Failed to download the pair: "%s", Interval: %s', @@ -139,7 +142,7 @@ def get_start_ts_from_timerange(timerange: Tuple[Tuple, int, int], interval: str if timerange[0][0] == 'date': return timerange[1] * 1000 - + if timerange[0][1] == 'line': num_minutes = timerange[2] * Constants.TICKER_INTERVAL_MINUTES[interval] return arrow.utcnow().shift(minutes=num_minutes).timestamp * 1000 @@ -156,7 +159,7 @@ def download_backtesting_testdata(datadir: str, Download the latest ticker intervals from the exchange for the pairs passed in parameters Based on @Rybolov work: https://github.com/rybolov/freqtrade-data :param pairs: list of pairs to download - :param interval: ticker interval + :param interval: ticker interval :param timerange: range of time to download :return: bool """ diff --git a/freqtrade/tests/optimize/test_optimize.py b/freqtrade/tests/optimize/test_optimize.py index a488f320e..e58f5bb2d 100644 --- a/freqtrade/tests/optimize/test_optimize.py +++ b/freqtrade/tests/optimize/test_optimize.py @@ -167,7 +167,7 @@ def test_get_start_ts_from_timerange(mocker) -> None: start = get_start_ts_from_timerange(((None, 'line'), None, -200), '5m') assert start == (1367900664 - 5 * 200 * 60) * 1000 - + def test_download_pairs_exception(ticker_history, mocker, caplog) -> None: mocker.patch('freqtrade.optimize.__init__.get_ticker_history', return_value=ticker_history) diff --git a/freqtrade/tests/test_arguments.py b/freqtrade/tests/test_arguments.py index e28aa010f..756f48778 100644 --- a/freqtrade/tests/test_arguments.py +++ b/freqtrade/tests/test_arguments.py @@ -93,7 +93,8 @@ def test_parse_timerange_incorrect() -> None: assert (('date', None), 1274486400, None) == Arguments.parse_timerange('20100522-') assert ((None, 'date'), None, 1274486400) == Arguments.parse_timerange('-20100522') - assert (('date', 'date'), 1274486400, 1438214400) == Arguments.parse_timerange('20100522-20150730') + timerange = Arguments.parse_timerange('20100522-20150730') + assert timerange == (('date', 'date'), 1274486400, 1438214400) with pytest.raises(Exception, match=r'Incorrect syntax.*'): Arguments.parse_timerange('-') diff --git a/scripts/download_backtest_data.py b/scripts/download_backtest_data.py index 3878f6a34..472442efb 100755 --- a/scripts/download_backtest_data.py +++ b/scripts/download_backtest_data.py @@ -47,7 +47,7 @@ for pair in PAIRS: if not data: print('\tNo data was downloaded') break - + print('\tData was downloaded for period %s - %s' % ( arrow.get(data[0][0] / 1000).format(), arrow.get(data[-1][0] / 1000).format()))