From c15f73aa1f35aaea7db1d701ed6d745fd80ecbb6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 31 Oct 2021 09:55:19 +0100 Subject: [PATCH] Rename command to backtesting-show --- docs/utils.md | 6 +++--- freqtrade/commands/__init__.py | 2 +- freqtrade/commands/arguments.py | 28 ++++++++++++------------- freqtrade/commands/optimize_commands.py | 4 ++-- tests/commands/test_commands.py | 8 +++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/utils.md b/docs/utils.md index 6934e0a5c..4a032db26 100644 --- a/docs/utils.md +++ b/docs/utils.md @@ -586,9 +586,9 @@ Adding `--show-pair-list` outputs a sorted pair list you can easily copy/paste i Only using winning pairs can lead to an overfitted strategy, which will not work well on future data. Make sure to extensively test your strategy in dry-run before risking real money. ``` -usage: freqtrade backtest-show [-h] [-v] [--logfile FILE] [-V] [-c PATH] - [-d PATH] [--userdir PATH] - [--export-filename PATH] [--show-pair-list] +usage: freqtrade backtesting-show [-h] [-v] [--logfile FILE] [-V] [-c PATH] + [-d PATH] [--userdir PATH] + [--export-filename PATH] [--show-pair-list] optional arguments: -h, --help show this help message and exit diff --git a/freqtrade/commands/__init__.py b/freqtrade/commands/__init__.py index ba977b6bd..129836000 100644 --- a/freqtrade/commands/__init__.py +++ b/freqtrade/commands/__init__.py @@ -16,7 +16,7 @@ from freqtrade.commands.hyperopt_commands import start_hyperopt_list, start_hype from freqtrade.commands.list_commands import (start_list_exchanges, start_list_markets, start_list_strategies, start_list_timeframes, start_show_trades) -from freqtrade.commands.optimize_commands import (start_backtest_show, start_backtesting, +from freqtrade.commands.optimize_commands import (start_backtesting, start_backtesting_show, start_edge, start_hyperopt) from freqtrade.commands.pairlist_commands import start_test_pairlist from freqtrade.commands.plot_commands import start_plot_dataframe, start_plot_profit diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 9d14bb38d..032f7dd51 100644 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -175,15 +175,15 @@ class Arguments: self.parser = argparse.ArgumentParser(description='Free, open source crypto trading bot') self._build_args(optionlist=['version'], parser=self.parser) - from freqtrade.commands import (start_backtest_show, start_backtesting, start_convert_data, - start_convert_trades, start_create_userdir, - start_download_data, start_edge, start_hyperopt, - start_hyperopt_list, start_hyperopt_show, start_install_ui, - start_list_data, start_list_exchanges, start_list_markets, - start_list_strategies, start_list_timeframes, - start_new_config, start_new_strategy, start_plot_dataframe, - start_plot_profit, start_show_trades, start_test_pairlist, - start_trading, start_webserver) + from freqtrade.commands import (start_backtesting, start_backtesting_show, + start_convert_data, start_convert_trades, + start_create_userdir, start_download_data, start_edge, + start_hyperopt, start_hyperopt_list, start_hyperopt_show, + start_install_ui, start_list_data, start_list_exchanges, + start_list_markets, start_list_strategies, + start_list_timeframes, start_new_config, start_new_strategy, + start_plot_dataframe, start_plot_profit, start_show_trades, + start_test_pairlist, start_trading, start_webserver) subparsers = self.parser.add_subparsers(dest='command', # Use custom message when no subhandler is added @@ -267,14 +267,14 @@ class Arguments: backtesting_cmd.set_defaults(func=start_backtesting) self._build_args(optionlist=ARGS_BACKTEST, parser=backtesting_cmd) - # Add backtest-show subcommand - backtest_show_cmd = subparsers.add_parser( - 'backtest-show', + # Add backtesting-show subcommand + backtesting_show_cmd = subparsers.add_parser( + 'backtesting-show', help='Show past Backtest results', parents=[_common_parser], ) - backtest_show_cmd.set_defaults(func=start_backtest_show) - self._build_args(optionlist=ARGS_BACKTEST_SHOW, parser=backtest_show_cmd) + backtesting_show_cmd.set_defaults(func=start_backtesting_show) + self._build_args(optionlist=ARGS_BACKTEST_SHOW, parser=backtesting_show_cmd) # Add edge subcommand edge_cmd = subparsers.add_parser('edge', help='Edge module.', diff --git a/freqtrade/commands/optimize_commands.py b/freqtrade/commands/optimize_commands.py index 4acc0d939..f230b696c 100644 --- a/freqtrade/commands/optimize_commands.py +++ b/freqtrade/commands/optimize_commands.py @@ -54,15 +54,15 @@ def start_backtesting(args: Dict[str, Any]) -> None: backtesting.start() -def start_backtest_show(args: Dict[str, Any]) -> None: +def start_backtesting_show(args: Dict[str, Any]) -> None: """ Show previous backtest result """ config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE) - from freqtrade.optimize.optimize_reports import show_backtest_results, show_sorted_pairlist from freqtrade.data.btanalysis import load_backtest_stats + from freqtrade.optimize.optimize_reports import show_backtest_results, show_sorted_pairlist results = load_backtest_stats(config['exportfilename']) diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index fcccca539..e0d0cc38d 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -8,7 +8,7 @@ from zipfile import ZipFile import arrow import pytest -from freqtrade.commands import (start_backtest_show, start_convert_data, start_convert_trades, +from freqtrade.commands import (start_backtesting_show, start_convert_data, start_convert_trades, start_create_userdir, start_download_data, start_hyperopt_list, start_hyperopt_show, start_install_ui, start_list_data, start_list_exchanges, start_list_markets, start_list_strategies, @@ -1391,17 +1391,17 @@ def test_show_trades(mocker, fee, capsys, caplog): start_show_trades(pargs) -def test_backtest_show(mocker, testdatadir, capsys): +def test_backtesting_show(mocker, testdatadir, capsys): sbr = mocker.patch('freqtrade.optimize.optimize_reports.show_backtest_results') args = [ - "backtest-show", + "backtesting-show", "--export-filename", f"{testdatadir / 'backtest-result_new.json'}", "--show-pair-list" ] pargs = get_args(args) pargs['config'] = None - start_backtest_show(pargs) + start_backtesting_show(pargs) assert sbr.call_count == 1 out, err = capsys.readouterr() assert "Pairs for Strategy" in out