From 94287d66a80068ec0e0857bc6aa72b62bb491a4c Mon Sep 17 00:00:00 2001 From: enenn Date: Thu, 12 Apr 2018 18:13:35 +0200 Subject: [PATCH] Flake8 fixes --- freqtrade/exchange/__init__.py | 1 - freqtrade/optimize/backtesting.py | 2 -- freqtrade/tests/exchange/test_exchange.py | 2 ++ freqtrade/tests/optimize/test_backtesting.py | 5 +++-- freqtrade/tests/optimize/test_hyperopt.py | 7 ++++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/freqtrade/exchange/__init__.py b/freqtrade/exchange/__init__.py index 26e49654f..6406fe769 100644 --- a/freqtrade/exchange/__init__.py +++ b/freqtrade/exchange/__init__.py @@ -350,4 +350,3 @@ def get_fee(symbol='ETH/BTC', type='', side='', amount=1, return _API.calculate_fee(symbol=symbol, type=type, side=side, amount=amount, price=price, takerOrMaker=taker_or_maker)['rate'] - diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index a162ea3bd..268d199e0 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -6,13 +6,11 @@ This module contains the backtesting logic from argparse import Namespace from typing import Dict, Tuple, Any, List, Optional -import ccxt import arrow from pandas import DataFrame, Series from tabulate import tabulate import freqtrade.optimize as optimize -import freqtrade.exchange as exchange from freqtrade import exchange from freqtrade.analyze import Analyze from freqtrade.arguments import Arguments diff --git a/freqtrade/tests/exchange/test_exchange.py b/freqtrade/tests/exchange/test_exchange.py index d6fa420e5..d7a4b35a9 100644 --- a/freqtrade/tests/exchange/test_exchange.py +++ b/freqtrade/tests/exchange/test_exchange.py @@ -108,6 +108,7 @@ def test_validate_pairs_stake_exception(default_conf, mocker, caplog): ): validate_pairs(default_conf['exchange']['pair_whitelist']) + def test_buy_dry_run(default_conf, mocker): default_conf['dry_run'] = True mocker.patch.dict('freqtrade.exchange._CONF', default_conf) @@ -116,6 +117,7 @@ def test_buy_dry_run(default_conf, mocker): assert 'id' in order assert 'dry_run_buy_' in order['id'] + def test_buy_prod(default_conf, mocker): api_mock = MagicMock() order_id = 'test_prod_buy_{}'.format(randint(0, 10 ** 6)) diff --git a/freqtrade/tests/optimize/test_backtesting.py b/freqtrade/tests/optimize/test_backtesting.py index d4f8b86aa..8fd90bca5 100644 --- a/freqtrade/tests/optimize/test_backtesting.py +++ b/freqtrade/tests/optimize/test_backtesting.py @@ -16,7 +16,7 @@ from freqtrade import optimize from freqtrade.analyze import Analyze from freqtrade.arguments import Arguments from freqtrade.optimize.backtesting import Backtesting, start, setup_configuration -from freqtrade.tests.conftest import default_conf, log_has +from freqtrade.tests.conftest import log_has # Avoid to reinit the same object again and again _BACKTESTING = None @@ -45,7 +45,8 @@ def trim_dictlist(dict_list, num): def load_data_test(what): timerange = ((None, 'line'), None, -100) - data = optimize.load_data(None, ticker_interval='1m', pairs=['UNITTEST/BTC'], timerange=timerange) + data = optimize.load_data(None, ticker_interval='1m', + pairs=['UNITTEST/BTC'], timerange=timerange) pair = data['UNITTEST/BTC'] datalen = len(pair) # Depending on the what parameter we now adjust the diff --git a/freqtrade/tests/optimize/test_hyperopt.py b/freqtrade/tests/optimize/test_hyperopt.py index 799ca4b5d..9f6b2e5df 100644 --- a/freqtrade/tests/optimize/test_hyperopt.py +++ b/freqtrade/tests/optimize/test_hyperopt.py @@ -1,5 +1,4 @@ # pragma pylint: disable=missing-docstring,W0212,C0103 -import json import os import signal from copy import deepcopy @@ -25,7 +24,8 @@ def init_hyperopt(default_conf, mocker): global _HYPEROPT_INITIALIZED, _HYPEROPT if not _HYPEROPT_INITIALIZED: mocker.patch('freqtrade.exchange.validate_pairs', MagicMock(return_value=True)) - mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', MagicMock(return_value=default_conf)) + mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', + MagicMock(return_value=default_conf)) mocker.patch('freqtrade.exchange.validate_pairs', MagicMock()) _HYPEROPT = Hyperopt(default_conf) _HYPEROPT_INITIALIZED = True @@ -66,7 +66,8 @@ def test_start(mocker, default_conf, caplog) -> None: start_mock = MagicMock() mocker.patch('freqtrade.logger.Logger.set_format', MagicMock()) mocker.patch('freqtrade.optimize.hyperopt.Hyperopt.start', start_mock) - mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', MagicMock(return_value=default_conf)) + mocker.patch('freqtrade.optimize.hyperopt.hyperopt_optimize_conf', + MagicMock(return_value=default_conf)) mocker.patch('freqtrade.freqtradebot.exchange.validate_pairs', MagicMock()) args = [