From c106534663915bb04038dd83aff836c351cb31f3 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 24 Jun 2019 20:13:40 +0200 Subject: [PATCH 1/3] Improve developer-document to include a note to keep both branches uptodate while creating a changelog. Cost me ~5 minutes doing the 2019.6 release... --- docs/developer.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/developer.md b/docs/developer.md index cf6b5d2cd..a5cf837e4 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -130,7 +130,7 @@ If the day shows the same day, then the last candle can be assumed as incomplete This part of the documentation is aimed at maintainers, and shows how to create a release. -### create release branch +### Create release branch ``` bash # make sure you're in develop branch @@ -144,7 +144,10 @@ git checkout -b new_release * Commit this part * push that branch to the remote and create a PR against the master branch -### create changelog from git commits +### Create changelog from git commits + +!!! Note + Make sure that both master and develop are up-todate!. ``` bash # Needs to be done before merging / pulling that branch. From 8e92fc62a39ba4fb60d018b980ab54bcf6774db2 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 24 Jun 2019 20:16:31 +0200 Subject: [PATCH 2/3] Use correct new versioning now --- docs/developer.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer.md b/docs/developer.md index a5cf837e4..716148788 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -140,7 +140,7 @@ git checkout develop git checkout -b new_release ``` -* Edit `freqtrade/__init__.py` and add the desired version (for example `0.18.0`) +* Edit `freqtrade/__init__.py` and add the version matching the current date (for example `2019.7` for June 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 @@ -163,5 +163,5 @@ git log --oneline --no-decorate --no-merges master..develop ### After-release -* Update version in develop to next valid version and postfix that with `-dev` (`0.18.0 -> 0.18.1-dev`). +* Update version in develop by postfixing that with `-dev` (`2019.6 -> 2019.6-dev`). * Create a PR against develop to update that branch. From 353437bbd1f95fae76f489471f1058c2f5869ab8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 24 Jun 2019 21:08:40 +0200 Subject: [PATCH 3/3] 07 is July!! --- docs/developer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer.md b/docs/developer.md index 716148788..f58e0597d 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -140,7 +140,7 @@ git checkout develop git checkout -b new_release ``` -* Edit `freqtrade/__init__.py` and add the version matching the current date (for example `2019.7` for June 2019). Minor versions can be `2019.7-1` should we need to do a second release that month. +* 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