adelorenzo
/
stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix help strings shown to the user

This commit is contained in:
hroff-1902 2019-06-22 23:51:29 +03:00
parent d8286d7a98
commit 451d4a400e
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
freqtrade/arguments.py
View File

@ -87,9 +87,9 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'-c', '--config', '-c', '--config',
help="Specify configuration file (default: %(default)s). " help=f'Specify configuration file (default: {constants.DEFAULT_CONFIG}). '
"Multiple --config options may be used. " f'Multiple --config options may be used. '
"Can be set to '-' to read config from stdin.", f'Can be set to `-` to read config from stdin.',
dest='config', dest='config',
action='append', action='append',
metavar='PATH', metavar='PATH',
@ -122,9 +122,9 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'--dynamic-whitelist', '--dynamic-whitelist',
help='Dynamically generate and update whitelist' help='Dynamically generate and update whitelist '
' based on 24h BaseVolume (default: %(const)s).' 'based on 24h BaseVolume (default: %(const)s). '
' DEPRECATED.', 'DEPRECATED.',
dest='dynamic_whitelist', dest='dynamic_whitelist',
const=constants.DYNAMIC_WHITELIST, const=constants.DYNAMIC_WHITELIST,
type=int, type=int,
@ -133,8 +133,8 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'--db-url', '--db-url',
help='Override trades database URL, this is useful if dry_run is enabled' help=f'Override trades database URL, this is useful if dry_run is enabled '
' or in custom deployments (default: %(default)s).', f'or in custom deployments (default: {constants.DEFAULT_DB_DRYRUN_URL}.',
dest='db_url', dest='db_url',
metavar='PATH', metavar='PATH',
) )
@ -228,10 +228,10 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'--export-filename', '--export-filename',
help='Save backtest results to this filename \ help='Save backtest results to this filename '
requires --export to be set as well\ 'requires --export to be set as well. '
Example --export-filename=user_data/backtest_data/backtest_today.json\ 'Example --export-filename=user_data/backtest_data/backtest_today.json '
(default: %(default)s)', '(default: %(default)s)',
default=os.path.join('user_data', 'backtest_data', 'backtest-result.json'), default=os.path.join('user_data', 'backtest_data', 'backtest-result.json'),
dest='exportfilename', dest='exportfilename',
metavar='PATH', metavar='PATH',
@ -246,8 +246,8 @@ class Arguments(object):
parser.add_argument( parser.add_argument(
'--stoplosses', '--stoplosses',
help='Defines a range of stoploss against which edge will assess the strategy ' help='Defines a range of stoploss against which edge will assess the strategy '
'the format is "min,max,step" (without any space).' 'the format is "min,max,step" (without any space). '
'example: --stoplosses=-0.01,-0.1,-0.001', 'Example: --stoplosses=-0.01,-0.1,-0.001',
dest='stoploss_range', dest='stoploss_range',
) )
@ -289,8 +289,8 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'-s', '--spaces', '-s', '--spaces',
help='Specify which parameters to hyperopt. Space separate list. \ help='Specify which parameters to hyperopt. Space separate list. '
Default: %(default)s.', 'Default: %(default)s.',
choices=['all', 'buy', 'sell', 'roi', 'stoploss'], choices=['all', 'buy', 'sell', 'roi', 'stoploss'],
default='all', default='all',
nargs='+', nargs='+',
@ -467,13 +467,14 @@ class Arguments(object):
) )
parser.add_argument( parser.add_argument(
'--exchange', '--exchange',
help='Exchange name (default: %(default)s). Only valid if no config is provided.', help=f'Exchange name (default: {constants.DEFAULT_EXCHANGE}). '
f'Only valid if no config is provided.',
dest='exchange', dest='exchange',
) )
parser.add_argument( parser.add_argument(
'-t', '--timeframes', '-t', '--timeframes',
help='Specify which tickers to download. Space separated list. \ help=f'Specify which tickers to download. Space separated list. '
Default: %(default)s.', f'Default: {constants.DEFAULT_DOWNLOAD_TICKER_INTERVALS}.',
choices=['1m', '3m', '5m', '15m', '30m', '1h', '2h', '4h', choices=['1m', '3m', '5m', '15m', '30m', '1h', '2h', '4h',
'6h', '8h', '12h', '1d', '3d', '1w'], '6h', '8h', '12h', '1d', '3d', '1w'],
nargs='+', nargs='+',

2
freqtrade/constants.py
View File

@ -4,6 +4,7 @@
bot constants bot constants
""" """
DEFAULT_CONFIG = 'config.json' DEFAULT_CONFIG = 'config.json'
DEFAULT_EXCHANGE = 'bittrex'
DYNAMIC_WHITELIST = 20 # pairs DYNAMIC_WHITELIST = 20 # pairs
PROCESS_THROTTLE_SECS = 5 # sec PROCESS_THROTTLE_SECS = 5 # sec
DEFAULT_TICKER_INTERVAL = 5 # min DEFAULT_TICKER_INTERVAL = 5 # min
@ -21,6 +22,7 @@ ORDERTYPE_POSSIBILITIES = ['limit', 'market']
ORDERTIF_POSSIBILITIES = ['gtc', 'fok', 'ioc'] ORDERTIF_POSSIBILITIES = ['gtc', 'fok', 'ioc']
AVAILABLE_PAIRLISTS = ['StaticPairList', 'VolumePairList'] AVAILABLE_PAIRLISTS = ['StaticPairList', 'VolumePairList']
DRY_RUN_WALLET = 999.9 DRY_RUN_WALLET = 999.9
DEFAULT_DOWNLOAD_TICKER_INTERVALS = '1m 5m'
TICKER_INTERVALS = [ TICKER_INTERVALS = [
'1m', '3m', '5m', '15m', '30m', '1m', '3m', '5m', '15m', '30m',