From 3833172dd90dea664ab6daef3b599d1f3f472058 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 4 Dec 2024 10:34:31 -0500 Subject: [PATCH] Improve release instructions for the new backporting workflow --- RELEASE.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index c2aab89f..b6acedae 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,10 +6,10 @@ To release a new version of spyder-kernels on PyPI: * git fetch upstream && get merge upstream/3.x -* git clean -xfdi - * Update CHANGELOG.md with `loghub spyder-ide/spyder-kernels -m vX.X.X` +* git clean -xfdi + * Update `_version.py` (set release version, remove 'dev0') * git add . && git commit -m 'Release X.X.X' @@ -24,16 +24,10 @@ To release a new version of spyder-kernels on PyPI: * git tag -a vX.X.X -m 'Release X.X.X' -* Update `_version.py` (add 'dev0' and increment minor) +* Update `_version.py` (add 'dev0' and increment patch) * git add . && git commit -m 'Back to work' -* git checkout master - -* git merge 3.x - -* git push upstream master - * git push upstream 3.x * git push upstream --tags