From a2b04d23491f846c1e218b6074ad5c14f1bd2e13 Mon Sep 17 00:00:00 2001 From: Fabien Maussion Date: Sun, 25 Aug 2024 13:53:03 +0200 Subject: [PATCH] Revert to dev version --- HOWTO_RELEASE | 2 ++ docs/index.rst | 3 ++- docs/whats-new.rst | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE index 260f42239..7b573c7c4 100644 --- a/HOWTO_RELEASE +++ b/HOWTO_RELEASE @@ -20,6 +20,7 @@ How to issue an OGGM release. twine upload dist/oggm-1.X.Y* You will need to be listed as a package owner at https://pypi.python.org/pypi/oggm for this to work. + You'll need a token for this - it is in your password manager. 8. Push your changes to master: git push origin master git push origin --tags @@ -32,6 +33,7 @@ How to issue an OGGM release. We also update the stable branch with `git cherrypick` for documentation only fixes that apply the current released version. 10. Add a section for the next release (v.X.(Y+1)) to doc/whats-new.rst. + Add the section to index that it is not yet released. 11. Commit your changes and push to master again: git commit -a -m 'Revert to dev version' git push origin master diff --git a/docs/index.rst b/docs/index.rst index c9fc9927d..c8e43811b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -14,9 +14,10 @@ OGGM is above all a modular platform that supports novel modelling workflows, Our framework is designed to be flexible and adaptable, making it an ideal tool for a wide range of applications in glaciology and related fields. -**This webpage is for the software documentation for version 1.6.2**: +**This webpage is for the software documentation for version 1.6.x (unreleased)**: - check-out :doc:`whats-new` to read about the updates in this version +- check-out `docs.oggm.org/en/stable `_ for the stable version - visit `oggm.org `_ for general news - visit `tutorials.oggm.org `_ for the interactive tutorials - visit `edu.oggm.org `_ for the educational platform diff --git a/docs/whats-new.rst b/docs/whats-new.rst index dbdad061a..cc3ae07f2 100644 --- a/docs/whats-new.rst +++ b/docs/whats-new.rst @@ -3,6 +3,18 @@ Version history =============== +v1.6.x (not released) +--------------------- + +Enhancements +~~~~~~~~~~~~ + + +Bug fixes +~~~~~~~~~ + + + v1.6.2 (August 25, 2024) ------------------------