move setup_utils_config to configuration module

freqtrade/commands/__init__.py

@@ -23,4 +23,3 @@ from freqtrade.commands.pairlist_commands import start_test_pairlist
 from freqtrade.commands.plot_commands import (start_plot_dataframe,
                                               start_plot_profit)
 from freqtrade.commands.trade_commands import start_trading
-from freqtrade.commands.utils import setup_utils_configuration

freqtrade/commands/data_commands.py

@@ -4,14 +4,13 @@ from typing import Any, Dict, List
 
 import arrow
 
-from freqtrade.configuration import TimeRange
+from freqtrade.configuration import TimeRange, setup_utils_configuration
 from freqtrade.data.history import (convert_trades_to_ohlcv,
                                     refresh_backtest_ohlcv_data,
                                     refresh_backtest_trades_data)
 from freqtrade.exceptions import OperationalException
 from freqtrade.resolvers import ExchangeResolver
 from freqtrade.state import RunMode
-from .utils import setup_utils_configuration
 
 logger = logging.getLogger(__name__)
 

freqtrade/commands/deploy_commands.py

@@ -3,6 +3,7 @@ import sys
 from pathlib import Path
 from typing import Any, Dict
 
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.configuration.directory_operations import (copy_sample_files,
                                                           create_userdata_dir)
 from freqtrade.constants import USERPATH_HYPEROPTS, USERPATH_STRATEGY
@@ -10,8 +11,6 @@ from freqtrade.exceptions import OperationalException
 from freqtrade.misc import render_template
 from freqtrade.state import RunMode
 
-from .utils import setup_utils_configuration
-
 logger = logging.getLogger(__name__)
 
 

freqtrade/commands/hyperopt_commands.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List
 
 from colorama import init as colorama_init
 
-from .utils import setup_utils_configuration
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.exceptions import OperationalException
 from freqtrade.state import RunMode
 

freqtrade/commands/list_commands.py

@@ -8,6 +8,7 @@ from typing import Any, Dict
 import rapidjson
 from tabulate import tabulate
 
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.constants import USERPATH_STRATEGY
 from freqtrade.exceptions import OperationalException
 from freqtrade.exchange import (available_exchanges, ccxt_exchanges,
@@ -16,8 +17,6 @@ from freqtrade.misc import plural
 from freqtrade.resolvers import ExchangeResolver, StrategyResolver
 from freqtrade.state import RunMode
 
-from .utils import setup_utils_configuration
-
 logger = logging.getLogger(__name__)
 
 

freqtrade/commands/optimize_commands.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any, Dict
 
 from freqtrade import constants
-from freqtrade.commands.utils import setup_utils_configuration
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.exceptions import DependencyException, OperationalException
 from freqtrade.state import RunMode
 

freqtrade/commands/pairlist_commands.py

@@ -3,11 +3,10 @@ from typing import Any, Dict
 
 import rapidjson
 
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.resolvers import ExchangeResolver
 from freqtrade.state import RunMode
 
-from .utils import setup_utils_configuration
-
 logger = logging.getLogger(__name__)
 
 

freqtrade/commands/plot_commands.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict
 
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.exceptions import OperationalException
 from freqtrade.state import RunMode
-from freqtrade.commands.utils import setup_utils_configuration
 
 
 def validate_plot_args(args: Dict[str, Any]):

freqtrade/configuration/__init__.py

@@ -1,5 +1,6 @@
 # flake8: noqa: F401
 
+from freqtrade.configuration.config_setup import setup_utils_configuration
 from freqtrade.configuration.check_exchange import check_exchange, remove_credentials
 from freqtrade.configuration.timerange import TimeRange
 from freqtrade.configuration.configuration import Configuration

freqtrade/configuration/config_setup.py

@@ -1,8 +1,9 @@
 import logging
 from typing import Any, Dict
 
-from freqtrade.configuration import (Configuration, remove_credentials,
+from .config_validation import validate_config_consistency
-                                     validate_config_consistency)
+from .configuration import Configuration
+from .check_exchange import remove_credentials
 from freqtrade.state import RunMode
 
 logger = logging.getLogger(__name__)

tests/commands/test_commands.py

@@ -4,13 +4,13 @@ from unittest.mock import MagicMock, PropertyMock
 
 import pytest
 
-from freqtrade.commands import (setup_utils_configuration,
+from freqtrade.commands import (start_create_userdir, start_download_data,
-                                start_create_userdir, start_download_data,
                                 start_hyperopt_list, start_hyperopt_show,
                                 start_list_exchanges, start_list_markets,
                                 start_list_strategies, start_list_timeframes,
                                 start_new_hyperopt, start_new_strategy,
                                 start_test_pairlist, start_trading)
+from freqtrade.configuration import setup_utils_configuration
 from freqtrade.exceptions import OperationalException
 from freqtrade.state import RunMode
 from tests.conftest import (get_args, log_has, log_has_re, patch_exchange,
@@ -639,7 +639,7 @@ def test_start_list_strategies(mocker, caplog, capsys):
     args = [
         "list-strategies",
         "--strategy-path",
-        str(Path(__file__).parent / "strategy"),
+        str(Path(__file__).parent.parent / "strategy"),
         "-1"
     ]
     pargs = get_args(args)
@@ -654,7 +654,7 @@ def test_start_list_strategies(mocker, caplog, capsys):
     args = [
         "list-strategies",
         "--strategy-path",
-        str(Path(__file__).parent / "strategy"),
+        str(Path(__file__).parent.parent / "strategy"),
     ]
     pargs = get_args(args)
     # pargs['config'] = None