diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 5413c57f9..9c211608f 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -191,7 +191,7 @@ class FreqtradeBot(object): Trade.session.flush() except TemporaryError as error: - logger.warning('%s, retrying in 30 seconds...', error) + logger.warning(f"Error: {error}, retrying in {constants.RETRY_TIMEOUT} seconds...") time.sleep(constants.RETRY_TIMEOUT) except OperationalException: tb = traceback.format_exc() diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index bf05e1902..1d6147357 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -172,7 +172,7 @@ class IStrategy(ABC): dataframe = self.advise_sell(dataframe, metadata) self._last_candle_seen_per_pair[pair] = dataframe.iloc[-1]['date'] else: - logger.debug("Skippinig TA Analysis for already analyzed candle") + logger.debug("Skipping TA Analysis for already analyzed candle") dataframe['buy'] = 0 dataframe['sell'] = 0 diff --git a/freqtrade/tests/strategy/test_interface.py b/freqtrade/tests/strategy/test_interface.py index f2e8c577f..d6ef0c8e7 100644 --- a/freqtrade/tests/strategy/test_interface.py +++ b/freqtrade/tests/strategy/test_interface.py @@ -204,7 +204,7 @@ def test_analyze_ticker_default(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 1 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) caplog.clear() @@ -214,7 +214,7 @@ def test_analyze_ticker_default(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 2 assert buy_mock.call_count == 2 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) @@ -242,7 +242,7 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None: assert buy_mock.call_count == 1 assert buy_mock.call_count == 1 assert log_has('TA Analysis Launched', caplog.record_tuples) - assert not log_has('Skippinig TA Analysis for already analyzed candle', + assert not log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) caplog.clear() @@ -257,5 +257,5 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None: assert ret['buy'].sum() == 0 assert ret['sell'].sum() == 0 assert not log_has('TA Analysis Launched', caplog.record_tuples) - assert log_has('Skippinig TA Analysis for already analyzed candle', + assert log_has('Skipping TA Analysis for already analyzed candle', caplog.record_tuples) diff --git a/requirements-dev.txt b/requirements-dev.txt index 768509903..1bbf5cbe1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ flake8==3.7.5 flake8-type-annotations==0.1.0 flake8-tidy-imports==2.0.0 -pytest==4.2.0 +pytest==4.2.1 pytest-mock==1.10.1 pytest-asyncio==0.10.0 pytest-cov==2.6.1 diff --git a/requirements.txt b/requirements.txt index 164e4dd7c..9d3bc6d0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -ccxt==1.18.225 +ccxt==1.18.234 SQLAlchemy==1.2.17 python-telegram-bot==11.1.0 -arrow==0.13.0 +arrow==0.13.1 cachetools==3.1.0 requests==2.21.0 urllib3==1.24.1