Merge branch 'develop' into test_coverage

This commit is contained in:
kryofly
2018-01-11 19:49:33 +01:00
25 changed files with 390 additions and 253 deletions

View File

@@ -3,10 +3,10 @@ from datetime import datetime
from unittest.mock import MagicMock
from functools import reduce
import pytest
import arrow
import pytest
from jsonschema import validate
from telegram import Message, Chat, Update
from telegram import Chat, Message, Update
from freqtrade.misc import CONF_SCHEMA
@@ -29,10 +29,10 @@ def default_conf():
"fiat_display_currency": "USD",
"dry_run": True,
"minimal_roi": {
"40": 0.0,
"30": 0.01,
"20": 0.02,
"0": 0.04
"40": 0.0,
"30": 0.01,
"20": 0.02,
"0": 0.04
},
"stoploss": -0.10,
"unfilledtimeout": 600,