From 952032b29340ce0fbea9cc8aaf76a2f821990c6d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 14 Jul 2021 21:17:31 +0200 Subject: [PATCH] Start the dev of the 3.29 cycle --- CMakeLists.txt | 2 +- ChangeLog | 8 ++++++++ NEWS | 8 ++++++++ docs/source/conf.py | 2 +- setup.py | 2 +- sonar-project.properties | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6086228632..ae940899f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "28") -set(SIMGRID_VERSION_PATCH "0") # odd => git branch; even => stable release or released snapshot +set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot if(${SIMGRID_VERSION_PATCH} EQUAL "0") set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") diff --git a/ChangeLog b/ChangeLog index 97a4734578..0f79ebd67e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +---------------------------------------------------------------------------- + +SimGrid (3.28.1) NOT RELEASED YET (v3.29 expected September 22. 2021, 19:21 UTC) + + + + + ---------------------------------------------------------------------------- SimGrid (3.28) July 14. 2021 diff --git a/NEWS b/NEWS index b02ba85e82..26fdc71b44 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ + _ _____ ____ ___ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \ / _ \ +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | (_) | + \ V / __/ | \__ \ | (_) | | | | ___) | / __/ \__, | + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____| /_/ + (unreleased) + + _ _____ ____ ___ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \( _ ) \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) / _ \ diff --git a/docs/source/conf.py b/docs/source/conf.py index 0870d38e85..fed868fbd0 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -36,7 +36,7 @@ copyright = u'2002-2021, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.28' +version = u'3.28.1' # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index bd01560ab5..c9b5fdebc5 100755 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.28', + version='3.28.1', author='Da SimGrid Team', author_email='simgrid-devel@lists.gforge.inria.fr', description='Toolkit for scalable simulation of distributed applications', diff --git a/sonar-project.properties b/sonar-project.properties index 14c4f29c73..70aada3979 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,7 +4,7 @@ sonar.organization=simgrid sonar.projectKey=simgrid_simgrid sonar.projectName=SimGrid -sonar.projectVersion=3.28 +sonar.projectVersion=3.28.1 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues -- 2.20.1