From f8ddb1060725482dc914f2065a092ae4ec482b6a Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 22 Aug 2019 17:09:58 +0200 Subject: [PATCH] switch indicators to nargs argument type --- freqtrade/configuration/cli_options.py | 10 ++++++---- freqtrade/plot/plotting.py | 4 ++-- freqtrade/tests/test_plotting.py | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/freqtrade/configuration/cli_options.py b/freqtrade/configuration/cli_options.py index d7e4e61b1..bf1ec3620 100644 --- a/freqtrade/configuration/cli_options.py +++ b/freqtrade/configuration/cli_options.py @@ -292,14 +292,16 @@ AVAILABLE_CLI_OPTIONS = { "indicators1": Arg( '--indicators1', help='Set indicators from your strategy you want in the first row of the graph. ' - 'Comma-separated list. Example: `ema3,ema5`. Default: `%(default)s`.', - default='sma,ema3,ema5', + 'Space-separated list. Example: `ema3 ema5`. Default: `%(default)s`.', + default=['sma', 'ema3', 'ema5'], + nargs='+', ), "indicators2": Arg( '--indicators2', help='Set indicators from your strategy you want in the third row of the graph. ' - 'Comma-separated list. Example: `fastd,fastk`. Default: `%(default)s`.', - default='macd,macdsignal', + 'Space-separated list. Example: `fastd fastk`. Default: `%(default)s`.', + default=['macd', 'macdsignal'], + nargs='+', ), "plot_limit": Arg( '--plot-limit', diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py index 62cbf0baa..a057d3d94 100644 --- a/freqtrade/plot/plotting.py +++ b/freqtrade/plot/plotting.py @@ -346,8 +346,8 @@ def analyse_and_plot_pairs(config: Dict[str, Any]): pair=pair, data=dataframe, trades=trades_pair, - indicators1=config["indicators1"].split(","), - indicators2=config["indicators2"].split(",") + indicators1=config["indicators1"], + indicators2=config["indicators2"], ) store_plot_file(fig, filename=generate_plot_filename(pair, config['ticker_interval']), diff --git a/freqtrade/tests/test_plotting.py b/freqtrade/tests/test_plotting.py index 90306ffdb..2790fc7db 100644 --- a/freqtrade/tests/test_plotting.py +++ b/freqtrade/tests/test_plotting.py @@ -294,8 +294,8 @@ def test_analyse_and_plot_pairs(default_conf, mocker, caplog): default_conf["datadir"] = history.make_testdata_path(None) default_conf['exportfilename'] = str( history.make_testdata_path(None) / "backtest-result_test.json") - default_conf['indicators1'] = "sma5,ema10" - default_conf['indicators2'] = "macd" + default_conf['indicators1'] = ["sma5", "ema10"] + default_conf['indicators2'] = ["macd"] default_conf['pairs'] = ["ETH/BTC", "LTC/BTC"] candle_mock = MagicMock() @@ -353,4 +353,4 @@ def test_plot_profit(default_conf, mocker, caplog): assert store_mock.call_count == 1 assert profit_mock.call_args_list[0][0][0] == default_conf['pairs'] - assert store_mock.call_args_list[0][1]['auto_open'] == True + assert store_mock.call_args_list[0][1]['auto_open'] is True