From 9573e6b1e1097dca3bf86da37726333ab62663bb Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 30 Apr 2022 19:11:17 -0400 Subject: [PATCH] Bump version to 2.6.0 Update link to new DOI on Zenodo Remove alpha/beta tags from YAML input files so they correspond to this release version. --- README.rst | 8 ++++---- SConstruct | 2 +- data/critical-properties.yaml | 2 +- data/nasa_condensed.yaml | 2 +- data/nasa_gas.yaml | 2 +- doc/doxygen/Doxyfile | 2 +- interfaces/cython/cantera/ck2yaml.py | 2 +- interfaces/cython/cantera/cti2yaml.py | 2 +- interfaces/cython/cantera/ctml2yaml.py | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 9f5e9ca796..7c0327d614 100644 --- a/README.rst +++ b/README.rst @@ -94,8 +94,8 @@ possible. Development Site ================ -The current development version is 2.6.0b2. The current stable version is -2.5.1. The `latest Cantera source code `_, +The current development version is 2.6.0. The current stable version is +2.6.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 @@ -134,8 +134,8 @@ development of Cantera through NumFOCUS. .. |ci| image:: https://github.com/Cantera/cantera/workflows/CI/badge.svg :target: https://github.com/Cantera/cantera/actions?query=workflow%3ACI+event%3Apush -.. |doi| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.170284.svg - :target: https://doi.org/10.5281/zenodo.1174508 +.. |doi| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.6387882.svg + :target: https://doi.org/10.5281/zenodo.6387882 .. |codecov| image:: https://img.shields.io/codecov/c/github/Cantera/cantera/main.svg :target: https://codecov.io/gh/Cantera/cantera?branch=main diff --git a/SConstruct b/SConstruct index f4ea66c9f9..c21b2fc14b 100644 --- a/SConstruct +++ b/SConstruct @@ -874,7 +874,7 @@ for arg in ARGUMENTS: logger.error(f"Encountered unexpected command line option: '{arg}'") sys.exit(1) -env["cantera_version"] = "2.6.0b2" +env["cantera_version"] = "2.6.0" # For use where pre-release tags are not permitted (MSI, sonames) env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0) env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0) diff --git a/data/critical-properties.yaml b/data/critical-properties.yaml index d3b4118f60..525dfd6af6 100644 --- a/data/critical-properties.yaml +++ b/data/critical-properties.yaml @@ -25,7 +25,7 @@ source: |- ISBN 978-0-07-135854-5. input-files: critProperties.xml -cantera-version: 2.6.0a3 +cantera-version: 2.6.0 date: Sat, 20 Nov 2021 22:47:06 -0500 species: diff --git a/data/nasa_condensed.yaml b/data/nasa_condensed.yaml index 829f752135..058b6d82e6 100644 --- a/data/nasa_condensed.yaml +++ b/data/nasa_condensed.yaml @@ -14,7 +14,7 @@ description: |- generator: ck2yaml input-files: [nasa_condensed.dat] -cantera-version: 2.6.0b2 +cantera-version: 2.6.0 date: Wed, 20 Apr 2022 13:43:45 -0400 species: diff --git a/data/nasa_gas.yaml b/data/nasa_gas.yaml index 6e253015e6..336dc4bdd2 100644 --- a/data/nasa_gas.yaml +++ b/data/nasa_gas.yaml @@ -14,7 +14,7 @@ description: |- generator: ck2yaml input-files: [nasa_gas.dat] -cantera-version: 2.6.0b2 +cantera-version: 2.6.0 date: Wed, 20 Apr 2022 22:21:10 -0400 units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol} diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 1628911b97..1556e44c9e 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Cantera # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.6.0b2 +PROJECT_NUMBER = 2.6.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/interfaces/cython/cantera/ck2yaml.py b/interfaces/cython/cantera/ck2yaml.py index 61bee73dc8..d023696c0d 100644 --- a/interfaces/cython/cantera/ck2yaml.py +++ b/interfaces/cython/cantera/ck2yaml.py @@ -1934,7 +1934,7 @@ def write_yaml(self, name='gas', out_name='mech.yaml'): metadata = BlockMap([ ("generator", "ck2yaml"), ("input-files", FlowList(files)), - ("cantera-version", "2.6.0b2"), + ("cantera-version", "2.6.0"), ("date", formatdate(localtime=True)), ]) if desc.strip(): diff --git a/interfaces/cython/cantera/cti2yaml.py b/interfaces/cython/cantera/cti2yaml.py index db2f3f22dc..a0f84d4747 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", "2.6.0b2"), + ("cantera-version", "2.6.0"), ("date", formatdate(localtime=True)), ]) if filename != "": diff --git a/interfaces/cython/cantera/ctml2yaml.py b/interfaces/cython/cantera/ctml2yaml.py index a99965f98e..5ba166cea1 100644 --- a/interfaces/cython/cantera/ctml2yaml.py +++ b/interfaces/cython/cantera/ctml2yaml.py @@ -2641,7 +2641,7 @@ def convert( metadata = BlockMap( { "generator": "ctml2yaml", - "cantera-version": "2.6.0b2", + "cantera-version": "2.6.0", "date": formatdate(localtime=True), } )