From b1feec6086e7b5803ad8ba694c1d6546503558d1 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Mar 2022 11:17:19 +0200
Subject: [PATCH] REL: initiate next release cycle
---
CHANGELOG.md | 17 +++++++++++++++++
RELEASE_GUIDELINES.md | 6 ++++--
setup.py | 8 ++++----
src/doc/conf.py | 4 ++--
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 765b3c66..061193ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [Unreleased]
+
+### Added ###
+
+### Changed ###
+
+### Deprecated ###
+
+### Removed ###
+
+### Fixed ###
+
+### Security ###
+
+### Documentation ###
+
+
## [0.7.2] - 2022-03-25 ##
(Timm Fitschen)
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index e71234b8..b4e38d64 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -36,8 +36,10 @@ guidelines of the CaosDB Project
9. Publish the release by executing `./release.sh` with uploads the caosdb
module to the Python Package Index [pypi.org](https://pypi.org).
-10. Merge the main branch back into the dev branch.
+10. Create a gitlab release on gitlab.indiscale.com and gitlab.com
-11. After the merge of main to dev, start a new development version by
+11. Merge the main branch back into the dev branch.
+
+12. After the merge of main to dev, start a new development version by
setting `ISRELEASED` to `False` and by increasing at least the `MICRO`
version in [setup.py](./setup.py) and preparing CHANGELOG.md.
diff --git a/setup.py b/setup.py
index 2207a8d8..b9a37c7c 100755
--- a/setup.py
+++ b/setup.py
@@ -45,11 +45,11 @@ from setuptools import find_packages, setup
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
########################################################################
-ISRELEASED = True
+ISRELEASED = False
MAJOR = 0
-MINOR = 7
-MICRO = 2
-PRE = None # e.g. rc0, alpha.1, 0.beta-23
+MINOR = 8
+MICRO = 0
+PRE = "dev" # e.g. rc0, alpha.1, 0.beta-23
if PRE:
VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
diff --git a/src/doc/conf.py b/src/doc/conf.py
index bb1e8e4f..ce1cfd26 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -29,10 +29,10 @@ copyright = '2022, IndiScale GmbH'
author = 'Daniel Hornung'
# The short X.Y version
-version = '0.7.2'
+version = '0.8.0'
# The full version, including alpha/beta/rc tags
# release = '0.5.2-rc2'
-release = '0.7.2'
+release = '0.8.0-dev'
# -- General configuration ---------------------------------------------------
--
GitLab