From 626dd00680e9da024e9be0834ae7c46480f01ab9 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 25 Oct 2023 23:51:41 +0200
Subject: [PATCH] MAINT: update version in docs
---
RELEASE_GUIDELINES.md | 12 +++++++-----
doc/conf.py | 4 ++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index 584227a..f7d8225 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -22,12 +22,14 @@ guidelines of the CaosDB Project
3. Assure that the latest patch actually updates the CaosDBVersion() procedure
and that the version matches the version you are about to release.
-4. Merge the release branch into the main branch.
+4. Update version in `doc/conf.py`.
-5. Wait for the main branch pipeline to pass.
+5. Merge the release branch into the main branch.
-6. Tag the latest commit of the main branch with `v<VERSION>`.
+6. Wait for the main branch pipeline to pass.
-7. Delete the release branch.
+7. Tag the latest commit of the main branch with `v<VERSION>`.
-8. Merge the main branch back into the dev branch.
+8. Delete the release branch.
+
+9. Merge the main branch back into the dev branch.
diff --git a/doc/conf.py b/doc/conf.py
index b4e7e4b..173694c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -26,9 +26,9 @@ copyright = '2021, IndiScale GmbH'
author = 'Daniel Hornung'
# The short X.Y version
-version = '6.0'
+version = '7.0'
# The full version, including alpha/beta/rc tags
-release = '6.0.1'
+release = '7.0.0'
# -- General configuration ---------------------------------------------------
--
GitLab