Merge branch 'develop' into feature/objectify

This commit is contained in:
gcarq
2018-03-19 19:10:19 +01:00
9 changed files with 19 additions and 14 deletions

View File

@@ -53,13 +53,13 @@ python3 ./freqtrade/main.py backtesting --datadir freqtrade/tests/testdata-20180
**With a (custom) strategy file**
```bash
python3.6 ./freqtrade/main.py -s currentstrategy backtesting
python3 ./freqtrade/main.py -s currentstrategy backtesting
```
Where `-s currentstrategy` refers to a filename `currentstrategy.py` in `freqtrade/user_data/strategies`
**Exporting trades to file**
```bash
freqtrade backtesting --export trades
python3 ./freqtrade/main.py backtesting --export trades
```
**Running backtest with smaller testset**
@@ -99,7 +99,7 @@ cd user_data/data-20180113
Possibly edit pairs.json file to include/exclude pairs
```bash
python freqtrade/tests/testdata/download_backtest_data.py -p pairs.json
python3 freqtrade/tests/testdata/download_backtest_data.py -p pairs.json
```
The script will read your pairs.json file, and download ticker data

View File

@@ -129,7 +129,7 @@ docker images
You can run a one-off container that is immediately deleted upon exiting with the following command (`config.json` must be in the current working directory):
```bash
docker run --rm -v `pwd`/config.json:/freqtrade/config.json -it freqtrade
docker run --rm -v /etc/localtime:/etc/localtime:ro -v `pwd`/config.json:/freqtrade/config.json -it freqtrade
```
In this example, the database will be created inside the docker instance and will be lost when you will refresh your image.
@@ -152,6 +152,7 @@ mv tradesv3.sqlite ~/.freqtrade
```bash
docker run -d \
--name freqtrade \
-v /etc/localtime:/etc/localtime:ro \
-v ~/.freqtrade/config.json:/freqtrade/config.json \
-v ~/.freqtrade/tradesv3.sqlite:/freqtrade/tradesv3.sqlite \
freqtrade

View File

@@ -73,5 +73,5 @@ The `-p` pair argument, can be used to plot a single pair
Example
```
python3.6 scripts/plot_profit.py --datadir ../freqtrade/freqtrade/tests/testdata-20171221/ -p BTC_LTC
python3 scripts/plot_profit.py --datadir ../freqtrade/freqtrade/tests/testdata-20171221/ -p BTC_LTC
```

View File

@@ -15,7 +15,7 @@ The only things you need is a working Telegram bot and its API token.
Below we explain how to create your Telegram Bot, and how to get your
Telegram user id.
### 1. Create your instagram bot
### 1. Create your Telegram bot
**1.1. Start a chat with https://telegram.me/BotFather**
**1.2. Send the message** `/newbot`
*BotFather response:*