From 620d7165136b1778b3f1813730c1b2da0eccf21a Mon Sep 17 00:00:00 2001 From: Keith Bussell Date: Tue, 4 Jan 2022 00:34:39 -0800 Subject: [PATCH] Update README to include updates to release strategy (#221) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: François Magimel --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7cd2bf8..3943cb6 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,5 @@ Releases 1. Make sure all tests on `master` are green. 2. Create a new branch `vX.Y.Z` from master for that specific release. 3. Bump versions in `setup.py` and `docs/source/conf.py` (docs have 2 places where the versions need to be changed!) -4. Pull request `vX.Y.Z` -> `stable`. Merging policy is very strict. This triggers a new release. -5. Pull request `stable` -> `master`. Now everything is back in sync. - -Opening a pull request from `master` directly to `stable` is discouraged as `master` may be updated while the PR is open, thus changing the contents of the release. +4. Pull request `vX.Y.Z` -> `master`. +5. Pull request `master` -> `stable`. This merge triggers the deploy to pypi. \ No newline at end of file