Skip to content

Commit

Permalink
Bump version to 2.6.0
Browse files Browse the repository at this point in the history
Update link to new DOI on Zenodo

Remove alpha/beta tags from YAML input files so they correspond to this
release version.
  • Loading branch information
speth authored and bryanwweber committed May 1, 2022
1 parent 265c152 commit 9573e6b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/Cantera/cantera>`_,
The current development version is 2.6.0. The current stable version is
2.6.0. The `latest Cantera source code <https://github.com/Cantera/cantera>`_,
the `issue tracker <https://github.com/Cantera/cantera/issues>`_ for bugs and
enhancement requests, `downloads of Cantera releases and binary installers
<https://github.com/Cantera/cantera/releases>`_ , and the `Cantera wiki
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion data/critical-properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/nasa_condensed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion data/nasa_gas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/ck2yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/cti2yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "<string>":
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/cantera/ctml2yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,7 @@ def convert(
metadata = BlockMap(
{
"generator": "ctml2yaml",
"cantera-version": "2.6.0b2",
"cantera-version": "2.6.0",
"date": formatdate(localtime=True),
}
)
Expand Down

0 comments on commit 9573e6b

Please sign in to comment.