From 265db5af7be70be60c7ffb3ea3c2f2ee3bbd766d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 25 Jun 2019 15:22:37 +0200 Subject: [PATCH] start the dev of 3.23.1 --- ChangeLog | 4 ++++ NEWS | 7 +++++++ doc/doxygen/inside_release.doc | 7 +++---- docs/source/conf.py | 2 +- setup.py | 2 +- sonar-project.properties | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53e15fbec4..d8c7bf79e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ ---------------------------------------------------------------------------- +SimGrid (3.23.1) NOT RELEASED YET (v3.24 expected September 23. 7:50 UTC) + +---------------------------------------------------------------------------- + SimGrid (3.23) June 25. 2019 The Exotic Solstice Release. diff --git a/NEWS b/NEWS index 134cc02303..7985521c21 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + _ _____ ____ _ _ +__ _____ _ __ ___(_) ___ _ __ |___ / |___ \| || | +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | || |_ + \ V / __/ | \__ \ | (_) | | | | ___) | / __/|__ _| + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____| |_| + (not released yet) + _ _____ ____ _____ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \|___ / \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) | |_ \ diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index 97144238ca..bbe7d4552e 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -101,7 +101,7 @@ the settings icon of the release you want to change. - Tag the git repository (don't forget to push the tags to the main repo) - Push the archive files (tar.gz and jar) on gforge -- Post a news on gforge (before updating the website) +- #Post a news on gforge (before updating the website) - Document the tag on https://github.com/simgrid/simgrid/releases and on https://framagit.org/simgrid/simgrid/tags - Upload the files SimGrid-3.XX.tar.gz, simgrid-3_XX.jar and @@ -109,8 +109,7 @@ the settings icon of the release you want to change. - Update the .gitlab-ci.yml on the website - Download the simgrid-doc from framagit and unpack it in position - Only keep 2 versions so that people don't find older ones in google -- Rebuild and resynchronize the website so that the file gets visible - from our download page.@n +- Rebuild and resynchronize the website so that the file gets visible from our download page. - Edit org/org-templates/level-0.org to change the release version, the tgz link and the jar link. - emacs org/site/index.org and C-c C-c the first source block to refresh the news; fake the date in the result. - emacs org/site/download.org and C-c C-c the first source block to refresh the download. @@ -138,7 +137,7 @@ the settings icon of the release you want to change. - Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo - Create the template for the next release in ChangeLog and NEWS files Release Target date: https://en.wikipedia.org/wiki/Equinox -- Change the release number to 3.X.90 in CMakeLists.txt and sonar-project.properties docs/source/conf.py +- Bump elease number to 3.X.1 in CMakeLists.txt sonar-project.properties docs/source/conf.py setup.py - Deal with deprecations: - Introduce the XBT_ATTRIB_DEPRECATED_v??? macro for the next release. - Kill the one for the current release and remove all code that were diff --git a/docs/source/conf.py b/docs/source/conf.py index 44e9bcf82a..45042f22a6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -35,7 +35,7 @@ copyright = u'2002-2019, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.23' +version = u'3.23.1' # The full version, including alpha/beta/rc tags #release = u'3.23 alpha' diff --git a/setup.py b/setup.py index fc71720008..2027fe6036 100755 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.23', + version='3.23.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 b57fa5d81b..f597462cab 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.23 +sonar.projectVersion=3.23.1 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues -- 2.20.1