mirror of
https://github.com/freqtrade/freqtrade.git
synced 2024-11-10 10:21:59 +00:00
Require pairs argument
This commit is contained in:
parent
0300128cb8
commit
3f04930f38
|
@ -519,6 +519,13 @@ class Arguments(object):
|
||||||
"""
|
"""
|
||||||
Parses given arguments for plot_dataframe
|
Parses given arguments for plot_dataframe
|
||||||
"""
|
"""
|
||||||
|
self.parser.add_argument(
|
||||||
|
'-p', '--pairs',
|
||||||
|
help='Show profits for only this pairs. Pairs are comma-separated.',
|
||||||
|
dest='pairs',
|
||||||
|
required=True,
|
||||||
|
default=None
|
||||||
|
)
|
||||||
self.parser.add_argument(
|
self.parser.add_argument(
|
||||||
'--indicators1',
|
'--indicators1',
|
||||||
help='Set indicators from your strategy you want in the first row of the graph. Separate '
|
help='Set indicators from your strategy you want in the first row of the graph. Separate '
|
||||||
|
|
|
@ -191,13 +191,22 @@ def test_plot_dataframe_options() -> None:
|
||||||
'--indicators1', 'sma10,sma100',
|
'--indicators1', 'sma10,sma100',
|
||||||
'--indicators2', 'macd,fastd,fastk',
|
'--indicators2', 'macd,fastd,fastk',
|
||||||
'--plot-limit', '30',
|
'--plot-limit', '30',
|
||||||
|
'-p', 'UNITTEST/BTC',
|
||||||
]
|
]
|
||||||
arguments = Arguments(args, '')
|
arguments = Arguments(args, '')
|
||||||
arguments.plot_dataframe_options()
|
arguments.plot_dataframe_options()
|
||||||
args = arguments.parse_args(True)
|
pargs = arguments.parse_args(True)
|
||||||
assert args.indicators1 == "sma10,sma100"
|
assert pargs.indicators1 == "sma10,sma100"
|
||||||
assert args.indicators2 == "macd,fastd,fastk"
|
assert pargs.indicators2 == "macd,fastd,fastk"
|
||||||
assert args.plot_limit == 30
|
assert pargs.plot_limit == 30
|
||||||
|
assert pargs.pairs == "UNITTEST/BTC"
|
||||||
|
|
||||||
|
# Pop pairs argument
|
||||||
|
args = args[:-2]
|
||||||
|
arguments = Arguments(args, '')
|
||||||
|
arguments.plot_dataframe_options()
|
||||||
|
with pytest.raises(SystemExit, match=r'2'):
|
||||||
|
arguments.parse_args(True)
|
||||||
|
|
||||||
|
|
||||||
def test_check_int_positive() -> None:
|
def test_check_int_positive() -> None:
|
||||||
|
|
|
@ -89,7 +89,7 @@ def get_tickers_data(strategy, exchange, pairs: List[str], timerange: TimeRange,
|
||||||
ticker_interval=ticker_interval,
|
ticker_interval=ticker_interval,
|
||||||
refresh_pairs=_CONF.get('refresh_pairs', False),
|
refresh_pairs=_CONF.get('refresh_pairs', False),
|
||||||
timerange=timerange,
|
timerange=timerange,
|
||||||
exchange=Exchange(_CONF),
|
exchange=exchange,
|
||||||
live=live,
|
live=live,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -132,6 +132,8 @@ def analyse_and_plot_pairs(args: Namespace):
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
strategy, exchange, pairs = get_trading_env(args)
|
strategy, exchange, pairs = get_trading_env(args)
|
||||||
|
pairs = args.pairs.split(',')
|
||||||
|
|
||||||
# Set timerange to use
|
# Set timerange to use
|
||||||
timerange = Arguments.parse_timerange(args.timerange)
|
timerange = Arguments.parse_timerange(args.timerange)
|
||||||
ticker_interval = strategy.ticker_interval
|
ticker_interval = strategy.ticker_interval
|
||||||
|
@ -170,7 +172,6 @@ def plot_parse_args(args: List[str]) -> Namespace:
|
||||||
:return: args: Array with all arguments
|
:return: args: Array with all arguments
|
||||||
"""
|
"""
|
||||||
arguments = Arguments(args, 'Graph dataframe')
|
arguments = Arguments(args, 'Graph dataframe')
|
||||||
arguments.scripts_options()
|
|
||||||
arguments.plot_dataframe_options()
|
arguments.plot_dataframe_options()
|
||||||
arguments.common_args_parser()
|
arguments.common_args_parser()
|
||||||
arguments.optimizer_shared_options(arguments.parser)
|
arguments.optimizer_shared_options(arguments.parser)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user