Merge remote-tracking branch 'upstream/develop' into log-stderr

config.json.example

@@ -44,7 +44,7 @@
             "ZEC/BTC",
             "XLM/BTC",
             "NXT/BTC",
-            "POWR/BTC",
+            "TRX/BTC",
             "ADA/BTC",
             "XMR/BTC"
         ],

config_full.json.example

@@ -78,7 +78,7 @@
             "ZEC/BTC",
             "XLM/BTC",
             "NXT/BTC",
-            "POWR/BTC",
+            "TRX/BTC",
             "ADA/BTC",
             "XMR/BTC"
         ],

docs/developer.md

@@ -204,14 +204,15 @@ This part of the documentation is aimed at maintainers, and shows how to create
 
 ### Create release branch
 
-``` bash
+First, pick a commit that's about one week old (to not include latest additions to releases).
-# make sure you're in develop branch
-git checkout develop
 
+``` bash
 # create new branch
-git checkout -b new_release
+git checkout -b new_release <commitid>
 ```
 
+Determine if crucial bugfixes have been made between this commit and the current state, and eventually cherry-pick these.
+
 * Edit `freqtrade/__init__.py` and add the version matching the current date (for example `2019.7` for July 2019). Minor versions can be `2019.7-1` should we need to do a second release that month.
 * Commit this part
 * push that branch to the remote and create a PR against the master branch
@@ -219,23 +220,18 @@ git checkout -b new_release
 ### Create changelog from git commits
 
 !!! Note
-    Make sure that both master and develop are up-todate!.
+    Make sure that the master branch is uptodate!
 
 ``` bash
 # Needs to be done before merging / pulling that branch.
-git log --oneline --no-decorate --no-merges master..develop
+git log --oneline --no-decorate --no-merges master..new_release
 ```
 
 ### Create github release / tag
 
 Once the PR against master is merged (best right after merging):
 
-* Use the button "Draft a new release" in the Github UI (subsection releases)
+* Use the button "Draft a new release" in the Github UI (subsection releases).
 * Use the version-number specified as tag.
 * Use "master" as reference (this step comes after the above PR is merged).
-* Use the above changelog as release comment (as codeblock)
+* Use the above changelog as release comment (as codeblock).
-
-### After-release
-
-* Update version in develop by postfixing that with `-dev` (`2019.6 -> 2019.6-dev`).
-* Create a PR against develop to update that branch.

tests/config_test_comments.json

@@ -78,7 +78,7 @@
             "ZEC/BTC",
             "XLM/BTC",
             "NXT/BTC",
-            "POWR/BTC",
+            "TRX/BTC",
             "ADA/BTC",
             "XMR/BTC"
         ],

tests/data/test_btanalysis.py

@@ -125,11 +125,11 @@ def test_create_cum_profit(testdatadir):
     bt_data = load_backtest_data(filename)
     timerange = TimeRange.parse_timerange("20180110-20180112")
 
-    df = load_pair_history(pair="POWR/BTC", ticker_interval='5m',
+    df = load_pair_history(pair="TRX/BTC", ticker_interval='5m',
                            datadir=testdatadir, timerange=timerange)
 
     cum_profits = create_cum_profit(df.set_index('date'),
-                                    bt_data[bt_data["pair"] == 'POWR/BTC'],
+                                    bt_data[bt_data["pair"] == 'TRX/BTC'],
                                     "cum_profits", timeframe="5m")
     assert "cum_profits" in cum_profits.columns
     assert cum_profits.iloc[0]['cum_profits'] == 0
@@ -143,11 +143,11 @@ def test_create_cum_profit1(testdatadir):
     bt_data.loc[:, 'close_time'] = bt_data.loc[:, 'close_time'] + DateOffset(seconds=20)
     timerange = TimeRange.parse_timerange("20180110-20180112")
 
-    df = load_pair_history(pair="POWR/BTC", ticker_interval='5m',
+    df = load_pair_history(pair="TRX/BTC", ticker_interval='5m',
                            datadir=testdatadir, timerange=timerange)
 
     cum_profits = create_cum_profit(df.set_index('date'),
-                                    bt_data[bt_data["pair"] == 'POWR/BTC'],
+                                    bt_data[bt_data["pair"] == 'TRX/BTC'],
                                     "cum_profits", timeframe="5m")
     assert "cum_profits" in cum_profits.columns
     assert cum_profits.iloc[0]['cum_profits'] == 0

tests/optimize/test_hyperopt.py

@@ -516,7 +516,7 @@ def test_generate_optimizer(mocker, default_conf) -> None:
     default_conf.update({'hyperopt_min_trades': 1})
 
     trades = [
-        ('POWR/BTC', 0.023117, 0.000233, 100)
+        ('TRX/BTC', 0.023117, 0.000233, 100)
     ]
     labels = ['currency', 'profit_percent', 'profit_abs', 'trade_duration']
     backtest_result = pd.DataFrame.from_records(trades, columns=labels)

tests/test_plotting.py

@@ -53,10 +53,10 @@ def test_init_plotscript(default_conf, mocker, testdatadir):
     assert "trades" in ret
     assert "pairs" in ret
 
-    default_conf['pairs'] = ["POWR/BTC", "ADA/BTC"]
+    default_conf['pairs'] = ["TRX/BTC", "ADA/BTC"]
     ret = init_plotscript(default_conf)
     assert "tickers" in ret
-    assert "POWR/BTC" in ret["tickers"]
+    assert "TRX/BTC" in ret["tickers"]
     assert "ADA/BTC" in ret["tickers"]
 
 
@@ -228,12 +228,12 @@ def test_add_profit(testdatadir):
     bt_data = load_backtest_data(filename)
     timerange = TimeRange.parse_timerange("20180110-20180112")
 
-    df = history.load_pair_history(pair="POWR/BTC", ticker_interval='5m',
+    df = history.load_pair_history(pair="TRX/BTC", ticker_interval='5m',
                                    datadir=testdatadir, timerange=timerange)
     fig = generate_empty_figure()
 
     cum_profits = create_cum_profit(df.set_index('date'),
-                                    bt_data[bt_data["pair"] == 'POWR/BTC'],
+                                    bt_data[bt_data["pair"] == 'TRX/BTC'],
                                     "cum_profits", timeframe="5m")
 
     fig1 = add_profit(fig, row=2, data=cum_profits, column='cum_profits', name='Profits')
@@ -247,7 +247,7 @@ def test_generate_profit_graph(testdatadir):
     filename = testdatadir / "backtest-result_test.json"
     trades = load_backtest_data(filename)
     timerange = TimeRange.parse_timerange("20180110-20180112")
-    pairs = ["POWR/BTC", "ADA/BTC"]
+    pairs = ["TRX/BTC", "ADA/BTC"]
 
     tickers = history.load_data(datadir=testdatadir,
                                 pairs=pairs,

tests/testdata/pairs.json

@@ -9,7 +9,7 @@
     "LTC/BTC",
     "NEO/BTC",
     "NXT/BTC",
-    "POWR/BTC",
+    "TRX/BTC",
     "STORJ/BTC",
     "QTUM/BTC",
     "WAVES/BTC",