From d35f6ab6f27ed9eb496164060d5bbfa9a1d21ce8 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 26 Jan 2016 14:09:51 -0500 Subject: [PATCH] Bump version to 2.2.1 --- README.rst | 2 +- SConstruct | 2 +- doc/doxygen/Doxyfile | 2 +- doc/sphinx/conf.py | 2 +- doc/sphinx/faq.rst | 6 +++--- doc/sphinx/install.rst | 14 +++++++------- doc/sphinx/scons-options.txt | 2 +- site_scons/wxsgen.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index 2884927df..d278e2d1d 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ CANTERA ******* -Version 2.2.1b1 (stable) +Version 2.2.1 (stable) License Information =================== diff --git a/SConstruct b/SConstruct index 6b9043e17..6972213d2 100644 --- a/SConstruct +++ b/SConstruct @@ -590,7 +590,7 @@ config_options = [ with a prefix like '/opt/cantera'. 'debian' installs to the stage directory in a layout used for generating Debian packages.""", defaults.fsLayout, ('standard','compact','debian')), - ('cantera_version', '', '2.2.1b1') + ('cantera_version', '', '2.2.1') ] opts.AddVariables(*config_options) diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 29a9eef14..8c099dd9e 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.2.0 +PROJECT_NUMBER = 2.2.1 # 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/conf.py b/doc/sphinx/conf.py index c3819264f..3bcf554f3 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -86,7 +86,7 @@ copyright = u'2012, Cantera Developers' # The short X.Y version. version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.2.0' +release = '2.2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/sphinx/faq.rst b/doc/sphinx/faq.rst index d5baa63b6..802978e47 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.2.1. 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.2.1", howpublished = "\url{http://www.cantera.org}" } diff --git a/doc/sphinx/install.rst b/doc/sphinx/install.rst index 9cd47e692..1b654a0b8 100644 --- a/doc/sphinx/install.rst +++ b/doc/sphinx/install.rst @@ -14,7 +14,7 @@ Windows ======= Windows installers are provided for stable versions of Cantera. These -installation instructions are for Cantera 2.2.0. +installation instructions are for Cantera 2.2.1. 1. **Choose your Python version and architecture** @@ -75,7 +75,7 @@ installation instructions are for Cantera 2.2.0. - 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.2.1 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‑cp34‑none‑win_amd64.whl`` is the installer for 64-bit Python 3.4. @@ -104,10 +104,10 @@ installation instructions are for Cantera 2.2.0. - 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.2.1-x64.msi** and + **Cantera-Python-2.2.1-x64-pyX.Y.msi**. + - *32-bit*: Download **Cantera-2.2.1-x86.msi** and + **Cantera-Python-2.2.1-x86-pyX.Y.msi**. - If you are only using the Python module, you do not need to download and install the base package. @@ -337,7 +337,7 @@ Ubuntu ====== Ubuntu packages are provided for recent versions of Ubuntu using a Personal -Package Archive (PPA). As of Cantera 2.2.0, packages are available for Ubuntu +Package Archive (PPA). As of Cantera 2.2.1, packages are available for Ubuntu Ubuntu 14.04 LTS (Trusty Tahr), Ubuntu 14.10 (Utopic Unicorn), and Ubuntu 15.04 (Vivid Vervet). To see which Ubuntu releases and Cantera versions are currently available, visit https://launchpad.net/~speth/+archive/ubuntu/cantera diff --git a/doc/sphinx/scons-options.txt b/doc/sphinx/scons-options.txt index 9c3454f25..94965abc3 100644 --- a/doc/sphinx/scons-options.txt +++ b/doc/sphinx/scons-options.txt @@ -368,5 +368,5 @@ running 'scons build'. The format of this file is: - default: 'compact' * cantera_version: [ string ] - - default: '2.2.0' + - default: '2.2.1' diff --git a/site_scons/wxsgen.py b/site_scons/wxsgen.py index 48caf8e5d..ecf2ebaa1 100644 --- a/site_scons/wxsgen.py +++ b/site_scons/wxsgen.py @@ -76,7 +76,7 @@ class WxsGenerator(object): UpgradeCode='2340BEE1-279D-11E1-A4AA-001FBC085391', Language='1033', Codepage='1252', - Version='2.2.0', + Version='2.2.1', Manufacturer='Cantera Developers')) fields = {'Platform': 'x64'} if self.x64 else {}