From 5c6039fd8b6c70c32f712455aab0470ccfa46711 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 4 Jul 2019 19:53:50 +0200 Subject: [PATCH 1/2] Fix #1997 - rename folder to dir --- freqtrade/configuration.py | 2 +- freqtrade/tests/optimize/test_backtesting.py | 8 ++++---- freqtrade/tests/optimize/test_edge_cli.py | 4 ++-- freqtrade/tests/optimize/test_hyperopt.py | 4 ++-- freqtrade/tests/test_configuration.py | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/freqtrade/configuration.py b/freqtrade/configuration.py index 82349700e..2bbec4654 100644 --- a/freqtrade/configuration.py +++ b/freqtrade/configuration.py @@ -254,7 +254,7 @@ class Configuration(object): config.update({'datadir': self._create_datadir(config, self.args.datadir)}) else: config.update({'datadir': self._create_datadir(config, None)}) - logger.info('Using data folder: %s ...', config.get('datadir')) + logger.info('Using data directory: %s ...', config.get('datadir')) def _load_optimize_config(self, config: Dict[str, Any]) -> Dict[str, Any]: """ diff --git a/freqtrade/tests/optimize/test_backtesting.py b/freqtrade/tests/optimize/test_backtesting.py index 28568f20c..498a04db5 100644 --- a/freqtrade/tests/optimize/test_backtesting.py +++ b/freqtrade/tests/optimize/test_backtesting.py @@ -183,7 +183,7 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) -> assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -235,7 +235,7 @@ def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) -> assert config['runmode'] == RunMode.BACKTEST assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -851,7 +851,7 @@ def test_backtest_start_live(default_conf, mocker, caplog): 'Parameter -l/--live detected ...', 'Ignoring max_open_trades (--disable-max-market-positions was used) ...', 'Parameter --timerange detected: -100 ...', - 'Using data folder: freqtrade/tests/testdata ...', + 'Using data directory: freqtrade/tests/testdata ...', 'Using stake_currency: BTC ...', 'Using stake_amount: 0.001 ...', 'Live: Downloading data for all defined pairs ...', @@ -910,7 +910,7 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog): 'Parameter -l/--live detected ...', 'Ignoring max_open_trades (--disable-max-market-positions was used) ...', 'Parameter --timerange detected: -100 ...', - 'Using data folder: freqtrade/tests/testdata ...', + 'Using data directory: freqtrade/tests/testdata ...', 'Using stake_currency: BTC ...', 'Using stake_amount: 0.001 ...', 'Live: Downloading data for all defined pairs ...', diff --git a/freqtrade/tests/optimize/test_edge_cli.py b/freqtrade/tests/optimize/test_edge_cli.py index 6b527543f..7cc41b095 100644 --- a/freqtrade/tests/optimize/test_edge_cli.py +++ b/freqtrade/tests/optimize/test_edge_cli.py @@ -32,7 +32,7 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) -> assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -71,7 +71,7 @@ def test_setup_edge_configuration_with_arguments(mocker, edge_conf, caplog) -> N assert 'datadir' in config assert config['runmode'] == RunMode.EDGE assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config diff --git a/freqtrade/tests/optimize/test_hyperopt.py b/freqtrade/tests/optimize/test_hyperopt.py index c3d6d0076..e5f87b022 100644 --- a/freqtrade/tests/optimize/test_hyperopt.py +++ b/freqtrade/tests/optimize/test_hyperopt.py @@ -61,7 +61,7 @@ def test_setup_hyperopt_configuration_without_arguments(mocker, default_conf, ca assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -111,7 +111,7 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo assert config['runmode'] == RunMode.HYPEROPT assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config diff --git a/freqtrade/tests/test_configuration.py b/freqtrade/tests/test_configuration.py index 38f17fbea..b34e75a28 100644 --- a/freqtrade/tests/test_configuration.py +++ b/freqtrade/tests/test_configuration.py @@ -306,7 +306,7 @@ def test_setup_configuration_without_arguments(mocker, default_conf, caplog) -> assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -356,7 +356,7 @@ def test_setup_configuration_with_arguments(mocker, default_conf, caplog) -> Non assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config @@ -418,7 +418,7 @@ def test_setup_configuration_with_stratlist(mocker, default_conf, caplog) -> Non assert 'pair_whitelist' in config['exchange'] assert 'datadir' in config assert log_has( - 'Using data folder: {} ...'.format(config['datadir']), + 'Using data directory: {} ...'.format(config['datadir']), caplog.record_tuples ) assert 'ticker_interval' in config From 17800c8ca561d48e5ad0da6484d148d63c76e54f Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 4 Jul 2019 19:56:48 +0200 Subject: [PATCH 2/2] Remove folder references (it's directory!) --- config_full.json.example | 2 +- docs/backtesting.md | 12 ++++++------ docs/bot-usage.md | 6 +++--- docs/configuration.md | 2 +- docs/docker.md | 2 +- docs/hyperopt.md | 2 +- docs/strategy-customization.md | 9 ++++----- freqtrade/tests/test_arguments.py | 4 ++-- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/config_full.json.example b/config_full.json.example index acecfb649..b6451859c 100644 --- a/config_full.json.example +++ b/config_full.json.example @@ -123,5 +123,5 @@ "process_throttle_secs": 5 }, "strategy": "DefaultStrategy", - "strategy_path": "/some/folder/" + "strategy_path": "user_data/strategies/" } diff --git a/docs/backtesting.md b/docs/backtesting.md index 8d8ea8030..2a5163e73 100644 --- a/docs/backtesting.md +++ b/docs/backtesting.md @@ -13,7 +13,7 @@ Backtesting will use the crypto-currencies (pair) from your config file and load static tickers located in [/freqtrade/tests/testdata](https://github.com/freqtrade/freqtrade/tree/develop/freqtrade/tests/testdata). If the 5 min and 1 min ticker for the crypto-currencies to test is not -already in the `testdata` folder, backtesting will download them +already in the `testdata` directory, backtesting will download them automatically. Testdata files will not be updated until you specify it. The result of backtesting will confirm you if your bot has better odds of making a profit than a loss. @@ -65,7 +65,7 @@ Where `-s TestStrategy` refers to the class name within the strategy file `test_ python3 freqtrade backtesting --export trades ``` -The exported trades can be used for [further analysis](#further-backtest-result-analysis), or can be used by the plotting script `plot_dataframe.py` in the scripts folder. +The exported trades can be used for [further analysis](#further-backtest-result-analysis), or can be used by the plotting script `plot_dataframe.py` in the scripts directory. #### Exporting trades to file specifying a custom filename @@ -107,7 +107,7 @@ To download new set of backtesting ticker data, you can use a download script. If you are using Binance for example: -- create a folder `user_data/data/binance` and copy `pairs.json` in that folder. +- create a directory `user_data/data/binance` and copy `pairs.json` in that directory. - update the `pairs.json` to contain the currency pairs you are interested in. ```bash @@ -123,9 +123,9 @@ python scripts/download_backtest_data.py --exchange binance This will download ticker data for all the currency pairs you defined in `pairs.json`. -- To use a different folder than the exchange specific default, use `--datadir user_data/data/some_directory`. +- To use a different directory than the exchange specific default, use `--datadir user_data/data/some_directory`. - To change the exchange used to download the tickers, use `--exchange`. Default is `bittrex`. -- To use `pairs.json` from some other folder, use `--pairs-file some_other_dir/pairs.json`. +- To use `pairs.json` from some other directory, use `--pairs-file some_other_dir/pairs.json`. - To download ticker data for only 10 days, use `--days 10`. - Use `--timeframes` to specify which tickers to download. Default is `--timeframes 1m 5m` which will download 1-minute and 5-minute tickers. - To use exchange, timeframe and list of pairs as defined in your configuration file, use the `-c/--config` option. With this, the script uses the whitelist defined in the config as the list of currency pairs to download data for and does not require the pairs.json file. You can combine `-c/--config` with other options. @@ -231,7 +231,7 @@ To backtest multiple strategies, a list of Strategies can be provided. This is limited to 1 ticker-interval per run, however, data is only loaded once from disk so if you have multiple strategies you'd like to compare, this should give a nice runtime boost. -All listed Strategies need to be in the same folder. +All listed Strategies need to be in the same directory. ``` bash freqtrade backtesting --timerange 20180401-20180410 --ticker-interval 5m --strategy-list Strategy001 Strategy002 --export trades diff --git a/docs/bot-usage.md b/docs/bot-usage.md index b215d7b7c..0e01ac0e5 100644 --- a/docs/bot-usage.md +++ b/docs/bot-usage.md @@ -109,14 +109,14 @@ Learn more about strategy file in ### How to use **--strategy-path**? This parameter allows you to add an additional strategy lookup path, which gets -checked before the default locations (The passed path must be a folder!): +checked before the default locations (The passed path must be a directory!): ```bash -python3 freqtrade --strategy AwesomeStrategy --strategy-path /some/folder +python3 freqtrade --strategy AwesomeStrategy --strategy-path /some/directory ``` #### How to install a strategy? -This is very simple. Copy paste your strategy file into the folder +This is very simple. Copy paste your strategy file into the directory `user_data/strategies` or use `--strategy-path`. And voila, the bot is ready to use it. ### How to use **--dynamic-whitelist**? diff --git a/docs/configuration.md b/docs/configuration.md index 9c3b20338..f46ff14a7 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -67,7 +67,7 @@ Mandatory Parameters are marked as **Required**. | `initial_state` | running | Defines the initial application state. More information below. | `forcebuy_enable` | false | Enables the RPC Commands to force a buy. More information below. | `strategy` | DefaultStrategy | Defines Strategy class to use. -| `strategy_path` | null | Adds an additional strategy lookup path (must be a folder). +| `strategy_path` | null | Adds an additional strategy lookup path (must be a directory). | `internals.process_throttle_secs` | 5 | **Required.** Set the process throttle. Value in second. | `internals.sd_notify` | false | Enables use of the sd_notify protocol to tell systemd service manager about changes in the bot state and issue keep-alive pings. See [here](installation.md#7-optional-configure-freqtrade-as-a-systemd-service) for more details. | `logfile` | | Specify Logfile. Uses a rolling strategy of 10 files, with 1Mb per file. diff --git a/docs/docker.md b/docs/docker.md index 939ab3f7d..615d31796 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -140,7 +140,7 @@ To run a restartable instance in the background (feel free to place your configu #### Move your config file and database -The following will assume that you place your configuration / database files to `~/.freqtrade`, which is a hidden folder in your home directory. Feel free to use a different folder and replace the folder in the upcomming commands. +The following will assume that you place your configuration / database files to `~/.freqtrade`, which is a hidden directory in your home directory. Feel free to use a different directory and replace the directory in the upcomming commands. ```bash mkdir ~/.freqtrade diff --git a/docs/hyperopt.md b/docs/hyperopt.md index 15b02b56f..a15fd575a 100644 --- a/docs/hyperopt.md +++ b/docs/hyperopt.md @@ -34,7 +34,7 @@ Depending on the space you want to optimize, only some of the below are required ### 1. Install a Custom Hyperopt File -Put your hyperopt file into the folder`user_data/hyperopts`. +Put your hyperopt file into the directory `user_data/hyperopts`. Let assume you want a hyperopt file `awesome_hyperopt.py`: Copy the file `user_data/hyperopts/sample_hyperopt.py` into `user_data/hyperopts/awesome_hyperopt.py` diff --git a/docs/strategy-customization.md b/docs/strategy-customization.md index 57c646aed..800012a0f 100644 --- a/docs/strategy-customization.md +++ b/docs/strategy-customization.md @@ -5,8 +5,7 @@ indicators. ## Install a custom strategy file -This is very simple. Copy paste your strategy file into the folder -`user_data/strategies`. +This is very simple. Copy paste your strategy file into the directory `user_data/strategies`. Let assume you have a class called `AwesomeStrategy` in the file `awesome-strategy.py`: @@ -22,7 +21,7 @@ python3 freqtrade --strategy AwesomeStrategy The bot includes a default strategy file. However, we recommend you to use your own file to not have to lose your parameters every time the default strategy file will be updated on Github. Put your custom strategy file -into the folder `user_data/strategies`. +into the directory `user_data/strategies`. Best copy the test-strategy and modify this copy to avoid having bot-updates override your changes. `cp user_data/strategies/test_strategy.py user_data/strategies/awesome-strategy.py` @@ -398,10 +397,10 @@ The default buy strategy is located in the file ### Specify custom strategy location -If you want to use a strategy from a different folder you can pass `--strategy-path` +If you want to use a strategy from a different directory you can pass `--strategy-path` ```bash -python3 freqtrade --strategy AwesomeStrategy --strategy-path /some/folder +python3 freqtrade --strategy AwesomeStrategy --strategy-path /some/directory ``` ### Further strategy ideas diff --git a/freqtrade/tests/test_arguments.py b/freqtrade/tests/test_arguments.py index c9d2a2261..8f0dec226 100644 --- a/freqtrade/tests/test_arguments.py +++ b/freqtrade/tests/test_arguments.py @@ -174,7 +174,7 @@ def test_parse_args_hyperopt_custom() -> None: def test_download_data_options() -> None: args = [ '--pairs-file', 'file_with_pairs', - '--datadir', 'datadir/folder', + '--datadir', 'datadir/directory', '--days', '30', '--exchange', 'binance' ] @@ -183,7 +183,7 @@ def test_download_data_options() -> None: args = arguments.parse_args() assert args.pairs_file == 'file_with_pairs' - assert args.datadir == 'datadir/folder' + assert args.datadir == 'datadir/directory' assert args.days == 30 assert args.exchange == 'binance'