mirror of
https://github.com/Cantera/cantera.git
synced 2025-02-25 18:55:29 -06:00
Bump version to 3.1.0a1
This commit is contained in:
parent
806842dacc
commit
f2cee4f1cc
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@ -499,7 +499,7 @@ jobs:
|
|||||||
- name: Test Essentials
|
- name: Test Essentials
|
||||||
# ensure that Python package loads and converter scripts work
|
# ensure that Python package loads and converter scripts work
|
||||||
run: |
|
run: |
|
||||||
python -c 'import cantera as ct; import sys; sys.exit(0) if ct.__version__.startswith("3.0.0") else sys.exit(1)'
|
python -c 'import cantera as ct; import sys; sys.exit(0) if ct.__version__.startswith("3.1.0") else sys.exit(1)'
|
||||||
ck2yaml --input=test/data/h2o2.inp --output=h2o2-test.yaml
|
ck2yaml --input=test/data/h2o2.inp --output=h2o2-test.yaml
|
||||||
test -f h2o2-test.yaml
|
test -f h2o2-test.yaml
|
||||||
cti2yaml test/data/ch4_ion.cti ch4_ion-test.yaml
|
cti2yaml test/data/ch4_ion.cti ch4_ion-test.yaml
|
||||||
@ -578,7 +578,7 @@ jobs:
|
|||||||
# ensure that Python package loads and converter scripts work
|
# ensure that Python package loads and converter scripts work
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
python -c 'import cantera as ct; import sys; sys.exit(0) if ct.__version__.startswith("3.0.0") else sys.exit(1)'
|
python -c 'import cantera as ct; import sys; sys.exit(0) if ct.__version__.startswith("3.1.0") else sys.exit(1)'
|
||||||
ck2yaml --input=test/data/h2o2.inp --output=h2o2-test.yaml
|
ck2yaml --input=test/data/h2o2.inp --output=h2o2-test.yaml
|
||||||
test -f h2o2-test.yaml
|
test -f h2o2-test.yaml
|
||||||
cti2yaml test/data/ch4_ion.cti ch4_ion-test.yaml
|
cti2yaml test/data/ch4_ion.cti ch4_ion-test.yaml
|
||||||
|
@ -94,7 +94,7 @@ possible.
|
|||||||
Development Site
|
Development Site
|
||||||
================
|
================
|
||||||
|
|
||||||
The current development version is 3.0.0. The current stable version is
|
The current development version is 3.1.0a1. The current stable version is
|
||||||
3.0.0. The `latest Cantera source code <https://github.com/Cantera/cantera>`_,
|
3.0.0. The `latest Cantera source code <https://github.com/Cantera/cantera>`_,
|
||||||
the `issue tracker <https://github.com/Cantera/cantera/issues>`_ for bugs and
|
the `issue tracker <https://github.com/Cantera/cantera/issues>`_ for bugs and
|
||||||
enhancement requests, `downloads of Cantera releases and binary installers
|
enhancement requests, `downloads of Cantera releases and binary installers
|
||||||
|
@ -950,7 +950,7 @@ for arg in ARGUMENTS:
|
|||||||
logger.error(f"Encountered unexpected command line option: {arg!r}")
|
logger.error(f"Encountered unexpected command line option: {arg!r}")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
env["cantera_version"] = "3.0.0"
|
env["cantera_version"] = "3.1.0a1"
|
||||||
# For use where pre-release tags are not permitted (MSI, sonames)
|
# 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_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)
|
env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)
|
||||||
|
@ -38,7 +38,7 @@ PROJECT_NAME = Cantera
|
|||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
PROJECT_NUMBER = 3.0.0
|
PROJECT_NUMBER = 3.1.0a1
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# 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
|
# for a project that appears at the top of each page and should give viewer a
|
||||||
|
@ -1,11 +1,16 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"name": "3.0 (dev)",
|
"name": "3.1 (dev)",
|
||||||
"version": "3.0",
|
"version": "3.1",
|
||||||
"url": "/documentation/dev/sphinx/html/"
|
"url": "/documentation/dev/sphinx/html/"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "2.6.0 (stable)",
|
"name": "3.0.0 (stable)",
|
||||||
|
"version": "3.0.0",
|
||||||
|
"url": "/documentation/docs-3.0/sphinx/html/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "2.6.0",
|
||||||
"url": "/documentation/docs-2.6/sphinx/html/"
|
"url": "/documentation/docs-2.6/sphinx/html/"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1946,7 +1946,7 @@ class Parser:
|
|||||||
metadata = BlockMap([
|
metadata = BlockMap([
|
||||||
("generator", "ck2yaml"),
|
("generator", "ck2yaml"),
|
||||||
("input-files", FlowList(files)),
|
("input-files", FlowList(files)),
|
||||||
("cantera-version", "3.0.0"),
|
("cantera-version", "3.1.0a1"),
|
||||||
("date", formatdate(localtime=True)),
|
("date", formatdate(localtime=True)),
|
||||||
])
|
])
|
||||||
if desc.strip():
|
if desc.strip():
|
||||||
|
@ -1661,7 +1661,7 @@ def convert(filename=None, output_name=None, text=None, encoding="latin-1"):
|
|||||||
# information regarding conversion
|
# information regarding conversion
|
||||||
metadata = BlockMap([
|
metadata = BlockMap([
|
||||||
("generator", "cti2yaml"),
|
("generator", "cti2yaml"),
|
||||||
("cantera-version", "3.0.0"),
|
("cantera-version", "3.1.0a1"),
|
||||||
("date", formatdate(localtime=True)),
|
("date", formatdate(localtime=True)),
|
||||||
])
|
])
|
||||||
if filename != "<string>":
|
if filename != "<string>":
|
||||||
|
@ -2637,7 +2637,7 @@ def convert(
|
|||||||
metadata = BlockMap(
|
metadata = BlockMap(
|
||||||
{
|
{
|
||||||
"generator": "ctml2yaml",
|
"generator": "ctml2yaml",
|
||||||
"cantera-version": "3.0.0",
|
"cantera-version": "3.1.0a1",
|
||||||
"date": formatdate(localtime=True),
|
"date": formatdate(localtime=True),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user