From 0e789e05d5e7bee542136978a4b4655c13240b56 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Tue, 15 Dec 2020 21:15:54 +0100
Subject: [PATCH] Release v3.26

---
 CMakeLists.txt           |  4 ++--
 ChangeLog                | 14 +++++++++-----
 NEWS                     |  4 +++-
 docs/source/conf.py      |  2 +-
 setup.py                 |  2 +-
 sonar-project.properties |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92465ca2fc..d5843c05f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Build the version number
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "25")
-set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_MINOR "26")
+set(SIMGRID_VERSION_PATCH "0") # 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 d50b2dcb02..296f935be9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,18 @@
 ----------------------------------------------------------------------------
 
-SimGrid (3.25.1) UNRELEASED (target: March 20 2020 or v3.26 on 3/26/20)
+SimGrid (3.26) December 15. 2020
+
+The Release release (the French lockdown was eased today).
 
 Important user-visible changes:
  - SimGrid now requires a compiler with C++14 support.
    Sibling projects should upgrade their FindSimgrid.cmake
  - Surf precision default value is now 1e-9, instead of 1e-5. This was changed as
-   several users had difficult to understand issues when using high bandwidth or
+   several users had difficulties to understand issues when using high bandwidth or
    small latency events. The new value was already the default for SMPI and
    should not cause too much performance hit. It can change some simulation
    timings if simulation was skipping a lot of small events (which was actually
-   an issue of said simulation). The value can still be changed back using
-   --cfg=surf/precision:1e-5.
+   an issue per see). The old value can be restored with --cfg=surf/precision:1e-5.
  - On some network models (L07, CM02, LV08), an implicit loopback link is created
    for local communication. Default bandwidth was 500MBps and latency was 15µs,
    which was rather bad. Default values have been changed to 10GBps and 0 latency.
@@ -56,7 +57,10 @@ SMPI:
  - most temporary files should now be created in /tmp dir (or equivalent). 
    If this one does not allow execution of code (noexec flag), this may cause issues.
    Please use another tmp directory (using TMPDIR or equivalent system variable) 
-   in this case
+   in this case.
+
+Model-Checker:
+ - A large refactoring is ongoing, but this should be transparent for users so far.
 
 XBT:
  - Drop xbt_str_split().
diff --git a/NEWS b/NEWS
index ffca23ce6f..325d1d016d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,9 @@ __   _____ _ __ ___(_) ___  _ __   |___ / |___ \ / /_
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | '_ \
  \ V /  __/ |  \__ \ | (_) | | | |  ___) | / __/| (_) |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|\___/
-               (unreleased)
+               December 15. 2020
+
+The Release release (the French lockdown was eased).
 
  * SMPI: improved support of the proxy apps (including those using petsc)
  * WiFi: easier description in XML; energy plugin; more examples.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f3907e498b..dbb73b9137 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -36,7 +36,7 @@ copyright = u'2002-2020, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version
-version = u'3.25.1'
+version = u'3.26'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/setup.py b/setup.py
index 6a7975c194..04ddf032f3 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ class CMakeBuild(build_ext):
 
 setup(
     name='simgrid',
-    version='3.25.1',
+    version='3.26',
     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 2f51f36407..271ba67ef6 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.25.1
+sonar.projectVersion=3.26
 
 sonar.links.homepage=https://simgrid.org
 sonar.links.issue=https://framagit.org/simgrid/simgrid/issues
-- 
2.20.1