From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 26 Jun 2023 22:03:19 +0000 (+0200)
Subject: Start a new development cycle
X-Git-Tag: v3.35~182
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/040bec34682ac9b1f9d33c99d0a17e5f17a41f6b

Start a new development cycle
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 185ea76d37..545604e129 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "34")
-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 b990b86a56..5157b9dfd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+SimGrid (3.34.1) not released (Target: fall 2023)
+
+----------------------------------------------------------------------------
+
 SimGrid (3.34) June 26. 2023
 
   Save the planet, skip a release: 3.33 was due 6 months ago, so skip directly to 3.34.
diff --git a/NEWS b/NEWS
index dcb01b70b3..726510038d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+                    _               _____  _________
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ / ___|
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \___ \
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | ___) |__) |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/____/
+               (not released yet)
+
                     _               _____  _____ _  _
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ /| || |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \| || |_
@@ -7,13 +14,18 @@ __   _____ _ __ ___(_) ___  _ __   |___ / |___ /| || |
 
 Save the planet, skip a release: 3.33 was due 6 months ago, so skip directly to 3.34.
 
-  * MSG and Java are gone (EOL was scheduled for 2020), move to C++17 and drop 32bits support.
-  * Introduce a fluid I/O model, mixing I/O and network, to represent streaming from disk
-  * DAG/workflow loader; Introducing Tasks which are activities that can be fired several times.
-  * Several new documentation sections, and a new tutorial.
-  * Safety properties now portable to every OS, activated by default in all builds.
-  * Introduction ODPOR/SDPOR reductions and guiding strategies (better state space traversal).
-  * (+ MANY internal refactoring, bug fixes and MANY documentation improvement)
+ * Maint: MSG and Java are gone (EOL was scheduled for 2020), move to C++17,
+          and drop 32bits support.
+ * Model: Introduce a fluid I/O model, mixing I/O and network, to represent
+          streaming from disk
+ * API: DAG/workflow loader; Introducing Tasks which are activities that can
+        be fired several times.
+ * Doc: Several new documentation sections, and a new tutorial on DAGs.
+ * MC: Safety properties now portable to every OS, activated by default
+       in all builds.
+ * MC: Introduction ODPOR/SDPOR reductions and guiding strategies (better
+       state space traversal).
+ * (+ internal refactoring, bug fixes and documentation improvement)
 
                     _               _____  _________
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ /___ \
diff --git a/docs/source/Release_Notes.rst b/docs/source/Release_Notes.rst
index 7c6aa104ee..80cad3718e 100644
--- a/docs/source/Release_Notes.rst
+++ b/docs/source/Release_Notes.rst
@@ -665,6 +665,10 @@ sthread can now also check concurrent accesses to a given collection, loosely in
 <https://www.microsoft.com/en-us/research/publication/efficient-and-scalable-thread-safety-violation-detection-finding-thousands-of-concurrency-bugs-during-testing>`_.
 This feature is not very usable yet, as you have to manually annotate your code, but we hope to improve it in the near future.
 
+Version 3.35 (TBD)
+------------------
+
+
 .. |br| raw:: html
 
    <br />
diff --git a/docs/source/conf.py b/docs/source/conf.py
index cf2f3b59d0..7c553dec6c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,7 +34,7 @@ copyright = u'2002-2023, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version
-version = u'3.34'
+version = u'3.34.1'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/setup.py b/setup.py
index 50accc27b7..37aa580d9a 100755
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name='simgrid',
-    version='3.34',
+    version='3.34.1',
     author='Da SimGrid Team',
     author_email='simgrid-community@inria.fr',
     description='Toolkit for scalable simulation of distributed applications',
diff --git a/sonar-project.properties b/sonar-project.properties
index 827ea52f84..03c0472747 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.34
+sonar.projectVersion=3.34.1
 
 sonar.links.homepage=https://simgrid.org
 sonar.links.issue=https://framagit.org/simgrid/simgrid/issues