diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8925c0b3..29b00b4e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -499,7 +499,7 @@ jobs: - name: Test Essentials # ensure that Python package loads and converter scripts work 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 test -f h2o2-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 run: | 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 test -f h2o2-test.yaml cti2yaml test/data/ch4_ion.cti ch4_ion-test.yaml diff --git a/README.rst b/README.rst index 8de8170cc..f3e9ffff0 100644 --- a/README.rst +++ b/README.rst @@ -94,7 +94,7 @@ possible. 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 `_, the `issue tracker `_ for bugs and enhancement requests, `downloads of Cantera releases and binary installers diff --git a/SConstruct b/SConstruct index f7d77a273..f7da6b9c9 100644 --- a/SConstruct +++ b/SConstruct @@ -950,7 +950,7 @@ for arg in ARGUMENTS: logger.error(f"Encountered unexpected command line option: {arg!r}") 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) 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/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 1003f3c1e..82b783c4a 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 = 3.0.0 +PROJECT_NUMBER = 3.1.0a1 # 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/doc/sphinx/_static/doc-versions.json b/doc/sphinx/_static/doc-versions.json index 9323e9499..6161c9919 100644 --- a/doc/sphinx/_static/doc-versions.json +++ b/doc/sphinx/_static/doc-versions.json @@ -1,11 +1,16 @@ [ { - "name": "3.0 (dev)", - "version": "3.0", + "name": "3.1 (dev)", + "version": "3.1", "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/" }, { diff --git a/interfaces/cython/cantera/ck2yaml.py b/interfaces/cython/cantera/ck2yaml.py index 61e498eec..579f1ddca 100644 --- a/interfaces/cython/cantera/ck2yaml.py +++ b/interfaces/cython/cantera/ck2yaml.py @@ -1946,7 +1946,7 @@ class Parser: metadata = BlockMap([ ("generator", "ck2yaml"), ("input-files", FlowList(files)), - ("cantera-version", "3.0.0"), + ("cantera-version", "3.1.0a1"), ("date", formatdate(localtime=True)), ]) if desc.strip(): diff --git a/interfaces/cython/cantera/cti2yaml.py b/interfaces/cython/cantera/cti2yaml.py index d8d5a282e..1c1d722aa 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", "3.0.0"), + ("cantera-version", "3.1.0a1"), ("date", formatdate(localtime=True)), ]) if filename != "": diff --git a/interfaces/cython/cantera/ctml2yaml.py b/interfaces/cython/cantera/ctml2yaml.py index 80c2f4fd0..f0a6b4004 100644 --- a/interfaces/cython/cantera/ctml2yaml.py +++ b/interfaces/cython/cantera/ctml2yaml.py @@ -2637,7 +2637,7 @@ def convert( metadata = BlockMap( { "generator": "ctml2yaml", - "cantera-version": "3.0.0", + "cantera-version": "3.1.0a1", "date": formatdate(localtime=True), } )