diff --git a/README.rst b/README.rst index 53875a83b..188b2c3b1 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ Cantera ******* -Version 2.3.0a3 (development) +Version 2.3.0b1 (development) What is Cantera? ================ diff --git a/SConstruct b/SConstruct index 3af7e9164..97c616713 100644 --- a/SConstruct +++ b/SConstruct @@ -630,7 +630,7 @@ for arg in ARGUMENTS: sys.exit(1) # Require a StrictVersion-compatible version -env['cantera_version'] = "2.3.0a3" +env['cantera_version'] = "2.3.0b1" ctversion = StrictVersion(env['cantera_version']) # For use where pre-release tags are not permitted (MSI, sonames) env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version) diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 113e480b1..45ed092a6 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -34,7 +34,7 @@ PROJECT_NAME = Cantera # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.3.0a3 +PROJECT_NUMBER = 2.3.0b1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/sphinx/compiling.rst b/doc/sphinx/compiling.rst index 38ae8445c..490ce3fe7 100644 --- a/doc/sphinx/compiling.rst +++ b/doc/sphinx/compiling.rst @@ -138,7 +138,7 @@ Stable Release Then, check out the tag of the most recent stable version:: - git checkout tags/v2.2.0 + git checkout tags/v2.3.0 A list of all the tags can be shown by:: @@ -160,7 +160,7 @@ Beta Release * **Option 1**: Check out the tag with the most recent beta release:: - git checkout tags/v2.2.0b1 + git checkout tags/v2.3.0b1 Note that the most recent beta version might be older than the most recent stable release. A list of all the tags, including stable and beta versions can @@ -171,9 +171,9 @@ Beta Release * **Option 2**: Check out the branch with all the bug fixes leading to the next minor release of the stable version:: - git checkout 2.2 + git checkout 2.3 - This branch has all the work on the 2.2.x version of the software. + This branch has all the work on the 2.3.x version of the software. Development Version ------------------- diff --git a/doc/sphinx/faq.rst b/doc/sphinx/faq.rst index b3629f229..ee3a8bc92 100644 --- a/doc/sphinx/faq.rst +++ b/doc/sphinx/faq.rst @@ -97,7 +97,7 @@ General David G. Goodwin, Harry K. Moffat, and Raymond L. Speth. *Cantera: An object- oriented software toolkit for chemical kinetics, thermodynamics, and - transport processes*. http://www.cantera.org, 2015. Version 2.2.0. + transport processes*. http://www.cantera.org, 2016. Version 2.3.0. The following BibTeX entry may also be used:: @@ -105,8 +105,8 @@ General author = "David G. Goodwin and Harry K. Moffat and Raymond L. Speth", title = "Cantera: An Object-oriented Software Toolkit for Chemical Kinetics, Thermodynamics, and Transport Processes", - year = 2015, - note = "Version 2.2.0", + year = 2016, + note = "Version 2.3.0", howpublished = "\url{http://www.cantera.org}" } diff --git a/doc/sphinx/install.rst b/doc/sphinx/install.rst index a3c5c6c01..1e7489809 100644 --- a/doc/sphinx/install.rst +++ b/doc/sphinx/install.rst @@ -88,7 +88,7 @@ Windows ======= Windows installers are provided for stable versions of Cantera. These -installation instructions are for Cantera 2.2.0. Use these installers if you +installation instructions are for Cantera 2.3.0. Use these installers if you want to work with a copy of Python downloaded from `Python.org `_. If you are using Anaconda / Miniconda, see the directions :ref:`above `. @@ -152,7 +152,7 @@ directions :ref:`above `. - Download the most recent release (distributed as a "wheel" archive) of the 1.x series for Python *X.Y* that matches your Python architecture. The - binaries for Cantera 2.2.0 require Numpy 1.8.0 or newer, e.g. In the + binaries for Cantera 2.3.0 require Numpy 1.8.0 or newer, e.g. In the filename, the digits after "cp" indicate the Python version, e.g. ``numpy‑1.8.2+mkl‑cp35‑none‑win_amd64.whl`` is the installer for 64-bit Python 3.5. @@ -181,10 +181,10 @@ directions :ref:`above `. - Go to the `Cantera Releases `_ page. - - *64-bit*: Download **Cantera-2.2.0-x64.msi** and - **Cantera-Python-2.2.0-x64-pyX.Y.msi**. - - *32-bit*: Download **Cantera-2.2.0-x86.msi** and - **Cantera-Python-2.2.0-x86-pyX.Y.msi**. + - *64-bit*: Download **Cantera-2.3.0-x64.msi** and + **Cantera-Python-2.3.0-x64-pyX.Y.msi**. + - *32-bit*: Download **Cantera-2.3.0-x86.msi** and + **Cantera-Python-2.3.0-x86-pyX.Y.msi**. - If you are only using the Python module, you do not need to download and install the base package. diff --git a/doc/sphinx/scons-options.txt b/doc/sphinx/scons-options.txt index 76d4fbe7b..2d29d8806 100644 --- a/doc/sphinx/scons-options.txt +++ b/doc/sphinx/scons-options.txt @@ -314,5 +314,5 @@ running 'scons build'. The format of this file is: - default: 'compact' * cantera_version: [ string ] - - default: '2.2.0' + - default: '2.3.0'