Merge branch 'develop' into money_mgt

This commit is contained in:
misagh 2018-09-21 17:42:42 +02:00
commit 21f4b85c7f
3 changed files with 6 additions and 6 deletions

View File

@ -16,10 +16,10 @@ WORKDIR /freqtrade
# Install dependencies # Install dependencies
COPY requirements.txt /freqtrade/ COPY requirements.txt /freqtrade/
RUN pip install numpy \ RUN pip install numpy --no-cache-dir \
&& pip install -r requirements.txt && pip install -r requirements.txt --no-cache-dir
# Install and execute # Install and execute
COPY . /freqtrade/ COPY . /freqtrade/
RUN pip install -e . RUN pip install -e . --no-cache-dir
ENTRYPOINT ["freqtrade"] ENTRYPOINT ["freqtrade"]

View File

@ -152,7 +152,7 @@ The project is currently setup in two main branches:
- `develop` - This branch has often new features, but might also cause breaking changes. - `develop` - This branch has often new features, but might also cause breaking changes.
- `master` - This branch contains the latest stable release. The bot 'should' be stable on this branch, and is generally well tested. - `master` - This branch contains the latest stable release. The bot 'should' be stable on this branch, and is generally well tested.
- `feat/*` - These are feature branches, which are beeing worked on heavily. Please don't use these unless you want to test a specific feature. - `feat/*` - These are feature branches, which are being worked on heavily. Please don't use these unless you want to test a specific feature.
## A note on Binance ## A note on Binance

View File

@ -1,5 +1,5 @@
ccxt==1.17.283 ccxt==1.17.327
SQLAlchemy==1.2.11 SQLAlchemy==1.2.12
python-telegram-bot==11.1.0 python-telegram-bot==11.1.0
arrow==0.12.1 arrow==0.12.1
cachetools==2.1.0 cachetools==2.1.0