adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into kraken_support

Browse Source
This commit is contained in:
iuvbio 2019-02-15 23:27:41 +01:00
commit 8ed3658447
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/freqtradebot.py
View File

@ -191,7 +191,7 @@ class FreqtradeBot(object):
Trade.session.flush() Trade.session.flush()
except TemporaryError as error: 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) time.sleep(constants.RETRY_TIMEOUT)
except OperationalException: except OperationalException:
tb = traceback.format_exc() tb = traceback.format_exc()

2
freqtrade/strategy/interface.py
View File

@ -172,7 +172,7 @@ class IStrategy(ABC):
dataframe = self.advise_sell(dataframe, metadata) dataframe = self.advise_sell(dataframe, metadata)
self._last_candle_seen_per_pair[pair] = dataframe.iloc[-1]['date'] self._last_candle_seen_per_pair[pair] = dataframe.iloc[-1]['date']
else: else:
logger.debug("Skippinig TA Analysis for already analyzed candle") logger.debug("Skipping TA Analysis for already analyzed candle")
dataframe['buy'] = 0 dataframe['buy'] = 0
dataframe['sell'] = 0 dataframe['sell'] = 0

8
freqtrade/tests/strategy/test_interface.py
View File

@ -204,7 +204,7 @@ def test_analyze_ticker_default(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 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.record_tuples)
caplog.clear() 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 buy_mock.call_count == 2 assert buy_mock.call_count == 2
assert log_has('TA Analysis Launched', caplog.record_tuples) 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.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 buy_mock.call_count == 1 assert buy_mock.call_count == 1
assert log_has('TA Analysis Launched', caplog.record_tuples) 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.record_tuples)
caplog.clear() caplog.clear()
@ -257,5 +257,5 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None:
assert ret['buy'].sum() == 0 assert ret['buy'].sum() == 0
assert ret['sell'].sum() == 0 assert ret['sell'].sum() == 0
assert not log_has('TA Analysis Launched', caplog.record_tuples) 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) caplog.record_tuples)

2
requirements-dev.txt
View File

@ -4,7 +4,7 @@
flake8==3.7.5 flake8==3.7.5
flake8-type-annotations==0.1.0 flake8-type-annotations==0.1.0
flake8-tidy-imports==2.0.0 flake8-tidy-imports==2.0.0
pytest==4.2.0 pytest==4.2.1
pytest-mock==1.10.1 pytest-mock==1.10.1
pytest-asyncio==0.10.0 pytest-asyncio==0.10.0
pytest-cov==2.6.1 pytest-cov==2.6.1

4
requirements.txt
View File

@ -1,7 +1,7 @@
ccxt==1.18.225 ccxt==1.18.234
SQLAlchemy==1.2.17 SQLAlchemy==1.2.17
python-telegram-bot==11.1.0 python-telegram-bot==11.1.0
arrow==0.13.0 arrow==0.13.1
cachetools==3.1.0 cachetools==3.1.0
requests==2.21.0 requests==2.21.0
urllib3==1.24.1 urllib3==1.24.1