From 429c59135e3594c22f728a2830aedd77d94f02d6 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 13 Dec 2024 17:01:39 -0500 Subject: [PATCH] Bump version to Cantera 3.1.0 --- README.rst | 4 ++-- SConstruct | 2 +- doc/doxygen/Doxyfile | 2 +- doc/sphinx/reference/releasenotes/v3.1.md | 4 ++-- interfaces/cython/cantera/ck2yaml.py | 2 +- interfaces/cython/cantera/cti2yaml.py | 2 +- interfaces/cython/cantera/ctml2yaml.py | 2 +- test/data/nasa9-embedded.yaml | 2 +- test/data/nonreactant-order.yaml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 438073384a..86d4f4fc5d 100644 --- a/README.rst +++ b/README.rst @@ -92,8 +92,8 @@ possible. Development Site ================ -The current development version is 3.1.0b1. The current stable version is -3.0.0. The `latest Cantera source code `_, +The current development version is 3.1.0. The current stable version is +3.1.0. The `latest Cantera source code `_, the `issue tracker `_ for bugs and enhancement requests, `downloads of Cantera releases and binary installers `_ , and the `Cantera wiki diff --git a/SConstruct b/SConstruct index 95ad01d6be..bb2196ac7c 100644 --- a/SConstruct +++ b/SConstruct @@ -163,7 +163,7 @@ logger.info( f"SCons {SCons.__version__} is using the following Python interpreter:\n" f" {sys.executable} (Python {python_version})", print_level=False) -cantera_version = "3.1.0b1" +cantera_version = "3.1.0" # For use where pre-release tags are not permitted (MSI, sonames) cantera_pure_version = re.match(r'(\d+\.\d+\.\d+)', cantera_version).group(0) cantera_short_version = re.match(r'(\d+\.\d+)', cantera_version).group(0) diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 021086d202..7023a3eefc 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = Cantera # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.1.0b1 +PROJECT_NUMBER = 3.1.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/sphinx/reference/releasenotes/v3.1.md b/doc/sphinx/reference/releasenotes/v3.1.md index 519891de97..1004191361 100644 --- a/doc/sphinx/reference/releasenotes/v3.1.md +++ b/doc/sphinx/reference/releasenotes/v3.1.md @@ -1,6 +1,6 @@ -# Cantera 3.1.0b1 +# Cantera 3.1.0 -Published on November 10, 2024 | [Full release on GitHub](https://github.com/Cantera/cantera/releases/tag/v3.1.0b1) +Published on December 14, 2024 | [Full release on GitHub](https://github.com/Cantera/cantera/releases/tag/v3.1.0) The Cantera development team is pleased to announce the availability of Cantera 3.1.0. There have been over [800 commits](https://github.com/Cantera/cantera/wiki/Cantera-3.1.0-Changelog) to Cantera since the last version, 3.0.0, which was released in August 2023. We have closed or merged [128 pull requests](https://github.com/Cantera/cantera/pulls?q=is%3Apr+merged%3A2023-08-23..2024-11-10+is%3Aclosed) and closed [81 issues](https://github.com/Cantera/cantera/issues?q=is%3Aissue+closed%3A2023-08-23..2024-12-14+is%3Aclosed) and [24 enhancement proposals](https://github.com/Cantera/enhancements/issues?q=is:issue+closed:2023-08-23..2024-12-14+is:closed). Instructions for installing Cantera 3.1 are available on the [Cantera website](/install/index). diff --git a/interfaces/cython/cantera/ck2yaml.py b/interfaces/cython/cantera/ck2yaml.py index 0af3bb1f41..27c61d687d 100644 --- a/interfaces/cython/cantera/ck2yaml.py +++ b/interfaces/cython/cantera/ck2yaml.py @@ -2051,7 +2051,7 @@ def write_yaml(self, name='gas', out_name='mech.yaml'): metadata = BlockMap([ ("generator", "ck2yaml"), ("input-files", FlowList(self.files)), - ("cantera-version", "3.1.0b1"), + ("cantera-version", "3.1.0"), ("date", formatdate(localtime=True)), ]) if desc.strip(): diff --git a/interfaces/cython/cantera/cti2yaml.py b/interfaces/cython/cantera/cti2yaml.py index 0930191929..dc598ffb4b 100644 --- a/interfaces/cython/cantera/cti2yaml.py +++ b/interfaces/cython/cantera/cti2yaml.py @@ -1661,7 +1661,7 @@ def convert(filename=None, output_name=None, text=None, encoding="latin-1"): # information regarding conversion metadata = BlockMap([ ("generator", "cti2yaml"), - ("cantera-version", "3.1.0b1"), + ("cantera-version", "3.1.0"), ("date", formatdate(localtime=True)), ]) if filename != "": diff --git a/interfaces/cython/cantera/ctml2yaml.py b/interfaces/cython/cantera/ctml2yaml.py index bd47d8de5a..69c2e62c1b 100644 --- a/interfaces/cython/cantera/ctml2yaml.py +++ b/interfaces/cython/cantera/ctml2yaml.py @@ -2637,7 +2637,7 @@ def convert( metadata = BlockMap( { "generator": "ctml2yaml", - "cantera-version": "3.1.0b1", + "cantera-version": "3.1.0", "date": formatdate(localtime=True), } ) diff --git a/test/data/nasa9-embedded.yaml b/test/data/nasa9-embedded.yaml index a0b09e3bf9..a6e0f6e841 100644 --- a/test/data/nasa9-embedded.yaml +++ b/test/data/nasa9-embedded.yaml @@ -1,6 +1,6 @@ generator: ck2yaml input-files: [nasa9-embedded.inp] -cantera-version: 3.1.0a2 +cantera-version: 3.1.0 date: Sat, 20 Jul 2024 15:58:26 -0400 units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol} diff --git a/test/data/nonreactant-order.yaml b/test/data/nonreactant-order.yaml index 739c7819ba..7fe10e4889 100644 --- a/test/data/nonreactant-order.yaml +++ b/test/data/nonreactant-order.yaml @@ -1,6 +1,6 @@ generator: ck2yaml input-files: [err-nonreactant-order.inp, dummy-thermo.dat] -cantera-version: 3.1.0a2 +cantera-version: 3.1.0 date: Fri, 28 Jun 2024 13:10:15 -0400 units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}