Merge branch 'develop' of https://github.com/berlinguyinca/freqtrade into develop

This commit is contained in:
Gert Wohlgemuth 2018-04-23 20:11:19 -07:00
commit 57e6abc571
4 changed files with 14 additions and 3 deletions

View File

@ -1,4 +1,4 @@
FROM python:3.6.4-slim-stretch FROM python:3.6.5-slim-stretch
# Install TA-lib # Install TA-lib
RUN apt-get update && apt-get -y install curl build-essential && apt-get clean RUN apt-get update && apt-get -y install curl build-essential && apt-get clean

View File

@ -127,3 +127,14 @@ Day Profit BTC Profit USD
## /version ## /version
> **Version:** `0.14.3` > **Version:** `0.14.3`
### using proxy with telegram
in [freqtrade/freqtrade/rpc/telegram.py](https://github.com/gcarq/freqtrade/blob/develop/freqtrade/rpc/telegram.py) replace
```
self._updater = Updater(token=self._config['telegram']['token'], workers=0)
```
with
```
self._updater = Updater(token=self._config['telegram']['token'], request_kwargs={'proxy_url': 'socks5://127.0.0.1:1080/'}, workers=0)
```

View File

@ -378,7 +378,7 @@ class FreqtradeBot(object):
if self.analyze.should_sell(trade, current_rate, datetime.utcnow(), buy, sell): if self.analyze.should_sell(trade, current_rate, datetime.utcnow(), buy, sell):
self.execute_sell(trade, current_rate) self.execute_sell(trade, current_rate)
return True return True
logger.info('Found no sell signals for whitelisted currencies. Trying again..')
return False return False
def check_handle_timedout(self, timeoutvalue: int) -> None: def check_handle_timedout(self, timeoutvalue: int) -> None:

View File

@ -1,5 +1,5 @@
python-bittrex==0.3.0 python-bittrex==0.3.0
SQLAlchemy==1.2.6 SQLAlchemy==1.2.7
python-telegram-bot==10.0.2 python-telegram-bot==10.0.2
arrow==0.12.1 arrow==0.12.1
cachetools==2.0.1 cachetools==2.0.1