Skip to content

Commit 6ce695d

Browse files
spethspeth
committed
Bump version to 2.5.0
Update 'cantera-version' in all YAML files to correspond to the stable release.
1 parent 94f6415 commit 6ce695d

31 files changed

+31
-31
lines changed

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Development Site
9191
================
9292

9393
The current development version is 2.5.0rc1. The current stable version is
94-
2.4.0. The `latest Cantera source code <https://github.com/Cantera/cantera>`_,
94+
2.5.0. The `latest Cantera source code <https://github.com/Cantera/cantera>`_,
9595
the `issue tracker <https://github.com/Cantera/cantera/issues>`_ for bugs and
9696
enhancement requests, `downloads of Cantera releases and binary installers
9797
<https://github.com/Cantera/cantera/releases>`_ , and the `Cantera wiki

‎SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ for arg in ARGUMENTS:
719719
print('Encountered unexpected command line argument: %r' % arg)
720720
sys.exit(1)
721721

722-
env['cantera_version'] = "2.5.0rc1"
722+
env['cantera_version'] = "2.5.0"
723723
# For use where pre-release tags are not permitted (MSI, sonames)
724724
env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0)
725725
env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)

‎data/KOH.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: |-
33
charged species in addition to neutral species.
44
55
generator: cti2yaml
6-
cantera-version: 2.5.0a3
6+
cantera-version: 2.5.0
77
date: Wed, 11 Dec 2019 16:59:04 -0500
88
input-files: [KOH.cti]
99

‎data/air.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |-
44
55
generator: ck2yaml
66
input-files: [air.inp, gri30_tran.dat]
7-
cantera-version: 2.5.0a3
7+
cantera-version: 2.5.0
88
date: Wed, 11 Dec 2019 16:59:03 -0500
99

1010
units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}

‎data/airNASA9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: |-
55
66
generator: ck2yaml
77
input-files: [airNASA9.inp, airDataNASA9.dat]
8-
cantera-version: 2.5.0a3
8+
cantera-version: 2.5.0
99
date: Wed, 11 Dec 2019 16:59:03 -0500
1010

1111
units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}

‎data/argon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: >-
33
from GRI-Mech 3.0.
44
55
generator: cti2yaml
6-
cantera-version: 2.5.0a3
6+
cantera-version: 2.5.0
77
date: Wed, 11 Dec 2019 16:59:05 -0500
88
input-files: [argon.cti]
99

‎data/graphite.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
Report TM-4513, October 1993.
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:05 -0500
1818
input-files: [graphite.cti]
1919

‎data/gri30.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description: |-
99
1010
generator: ck2yaml
1111
input-files: [gri30.inp, gri30_thermo.dat, gri30_tran.dat]
12-
cantera-version: 2.5.0a3
12+
cantera-version: 2.5.0
1313
date: Wed, 11 Dec 2019 16:59:02 -0500
1414

1515
units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}

‎data/gri30_highT.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description: |-
1212
https://ntrs.nasa.gov/search.jsp?R=19940013151
1313
1414
generator: cti2yaml
15-
cantera-version: 2.5.0a3
15+
cantera-version: 2.5.0
1616
date: Wed, 11 Dec 2019 16:59:05 -0500
1717
input-files: [gri30_highT.cti]
1818

‎data/gri30_ion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: |-
66
DOI: 10.1080/13647830.2015.1090018
77
88
generator: cti2yaml
9-
cantera-version: 2.5.0a3
9+
cantera-version: 2.5.0
1010
date: Wed, 11 Dec 2019 16:59:06 -0500
1111
input-files: [gri30_ion.cti]
1212

‎data/h2o2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |-
44
55
generator: ck2yaml
66
input-files: [h2o2.inp, gri30_tran.dat]
7-
cantera-version: 2.5.0a3
7+
cantera-version: 2.5.0
88
date: Wed, 11 Dec 2019 16:59:04 -0500
99

1010
units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}

‎data/liquidvapor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description: |-
1212
compute properties.
1313
1414
generator: cti2yaml
15-
cantera-version: 2.5.0a3
15+
cantera-version: 2.5.0
1616
date: Wed, 11 Dec 2019 16:59:06 -0500
1717
input-files: [liquidvapor.cti]
1818

‎data/lithium_ion_battery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ description: |-
4848
adsorbed species)
4949
5050
generator: cti2yaml
51-
cantera-version: 2.5.0a3
51+
cantera-version: 2.5.0
5252
date: Wed, 11 Dec 2019 16:59:07 -0500
5353
input-files: [lithium_ion_battery.cti]
5454

‎data/methane_pox_on_pt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ description: |-
2626
-----------------------------------------------------------------------
2727
2828
generator: cti2yaml
29-
cantera-version: 2.5.0a3
29+
cantera-version: 2.5.0
3030
date: Wed, 11 Dec 2019 16:59:07 -0500
3131
input-files: [methane_pox_on_pt.cti]
3232

‎data/nDodecane_Reitz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
233-243
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:08 -0500
1818
input-files: [nDodecane_Reitz.cti]
1919

‎data/nasa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description: |-
1212
Report TM-4513, October 1993.
1313
1414
generator: cti2yaml
15-
cantera-version: 2.5.0a3
15+
cantera-version: 2.5.0
1616
date: Wed, 11 Dec 2019 16:59:09 -0500
1717
input-files: [nasa.cti]
1818

‎data/nasa_condensed.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
Report TM-4513, October 1993.
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:11 -0500
1818
input-files: [nasa_condensed.cti]
1919

‎data/nasa_gas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
Report TM-4513, October 1993.
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:12 -0500
1818
input-files: [nasa_gas.cti]
1919

‎data/ohn.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description: This definition extracts the O/H/N submechanism from GRI-Mech 3.0
22

33
generator: cti2yaml
4-
cantera-version: 2.5.0a3
4+
cantera-version: 2.5.0
55
date: Wed, 11 Dec 2019 16:59:14 -0500
66
input-files: [ohn.cti]
77

‎data/ptcombust.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ description: |-
2323
-----------------------------------------------------------------------
2424
2525
generator: cti2yaml
26-
cantera-version: 2.5.0a3
26+
cantera-version: 2.5.0
2727
date: Wed, 11 Dec 2019 16:59:14 -0500
2828
input-files: [ptcombust.cti]
2929

‎data/sample-data/LiC6_electrodebulk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
generator: ctml2yaml
2-
cantera-version: 2.5.0a3
2+
cantera-version: 2.5.0
33
date: Fri, 13 Dec 2019 20:48:20 -0500
44
input-files: [LiC6_electrodebulk.xml]
55

‎data/silane.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |-
44
55
generator: ck2yaml
66
input-files: [silane.inp]
7-
cantera-version: 2.5.0a3
7+
cantera-version: 2.5.0
88
date: Wed, 11 Dec 2019 16:59:04 -0500
99

1010
units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol}

‎data/silicon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
Report TM-4513, October 1993.
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:14 -0500
1818
input-files: [silicon.cti]
1919

‎data/silicon_carbide.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description: |-
1313
Report TM-4513, October 1993.
1414
1515
generator: cti2yaml
16-
cantera-version: 2.5.0a3
16+
cantera-version: 2.5.0
1717
date: Wed, 11 Dec 2019 16:59:14 -0500
1818
input-files: [silicon_carbide.cti]
1919

‎data/sofc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ description: |-
8181
reactions involve TPB species, this parameter is unused.
8282
8383
generator: cti2yaml
84-
cantera-version: 2.5.0a3
84+
cantera-version: 2.5.0
8585
date: Wed, 11 Dec 2019 16:59:15 -0500
8686
input-files: [sofc.cti]
8787

‎data/water.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: |-
77
mixture, while this one can.
88
99
generator: cti2yaml
10-
cantera-version: 2.5.0a3
10+
cantera-version: 2.5.0
1111
date: Wed, 11 Dec 2019 16:59:15 -0500
1212
input-files: [water.cti]
1313

‎doc/doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PROJECT_NAME = Cantera
3434
# This could be handy for archiving the generated documentation or
3535
# if some version control system is used.
3636

37-
PROJECT_NUMBER = 2.5.0rc1
37+
PROJECT_NUMBER = 2.5.0
3838

3939
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
4040
# base path where the generated documentation will be put.

‎interfaces/cython/cantera/ck2yaml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ def write_yaml(self, name='gas', out_name='mech.yaml'):
18981898
metadata = BlockMap([
18991899
('generator', 'ck2yaml'),
19001900
('input-files', FlowList(files)),
1901-
('cantera-version', '2.5.0rc1'),
1901+
('cantera-version', '2.5.0'),
19021902
('date', formatdate(localtime=True)),
19031903
])
19041904
if desc.strip():

‎interfaces/cython/cantera/cti2yaml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ def convert(filename=None, output_name=None, text=None):
16401640
# information regarding conversion
16411641
metadata = BlockMap([
16421642
('generator', 'cti2yaml'),
1643-
('cantera-version', '2.5.0rc1'),
1643+
('cantera-version', '2.5.0'),
16441644
('date', formatdate(localtime=True)),
16451645
])
16461646
if filename is not None:

‎interfaces/cython/cantera/ctml2yaml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2620,7 +2620,7 @@ def convert(
26202620
metadata = BlockMap(
26212621
{
26222622
"generator": "ctml2yaml",
2623-
"cantera-version": "2.5.0rc1",
2623+
"cantera-version": "2.5.0",
26242624
"date": formatdate(localtime=True),
26252625
}
26262626
)

‎test/data/ch4_ion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
generator: cti2yaml
2-
cantera-version: 2.5.0a4
2+
cantera-version: 2.5.0
33
date: Mon, 10 Aug 2020 12:55:00 +0000
44
input-files: [ch4_ion.cti]
55

0 commit comments

Comments
 (0)