Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ possible.
Development Site
================

The current development version is 2.6.0a4. The current stable version is
The current development version is 2.6.0b1. The current stable version is
2.5.1. 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
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ for arg in ARGUMENTS:
logger.error(f"Encountered unexpected command line option: '{arg}'")
sys.exit(1)

env["cantera_version"] = "2.6.0a4"
env["cantera_version"] = "2.6.0b1"
# 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 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.0a4
PROJECT_NUMBER = 2.6.0b1

# 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
8 changes: 4 additions & 4 deletions interfaces/cython/cantera/ck2yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -1900,10 +1900,10 @@ def write_yaml(self, name='gas', out_name='mech.yaml'):
# Additional information regarding conversion
files = [os.path.basename(f) for f in self.files]
metadata = BlockMap([
('generator', 'ck2yaml'),
('input-files', FlowList(files)),
('cantera-version', '2.6.0a4'),
('date', formatdate(localtime=True)),
("generator", "ck2yaml"),
("input-files", FlowList(files)),
("cantera-version", "2.6.0b1"),
("date", formatdate(localtime=True)),
])
if desc.strip():
metadata.yaml_set_comment_before_after_key('generator', before='\n')
Expand Down
6 changes: 3 additions & 3 deletions interfaces/cython/cantera/cti2yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -1660,9 +1660,9 @@ def convert(filename=None, output_name=None, text=None, encoding="latin-1"):

# information regarding conversion
metadata = BlockMap([
('generator', 'cti2yaml'),
('cantera-version', '2.6.0a4'),
('date', formatdate(localtime=True)),
("generator", "cti2yaml"),
("cantera-version", "2.6.0b1"),
("date", formatdate(localtime=True)),
])
if filename != "<string>":
metadata['input-files'] = FlowList([base])
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.0a4",
"cantera-version": "2.6.0b1",
"date": formatdate(localtime=True),
}
)
Expand Down