diff --git a/README b/README index 26331ea41..e1844d3b2 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ CANTERA ******* -Version 2.1.1 (stable) +Version 2.1.2 (stable) License Information =================== diff --git a/SConstruct b/SConstruct index daf25e1ca..d07b09b48 100644 --- a/SConstruct +++ b/SConstruct @@ -622,7 +622,7 @@ config_options = [ name recognized by the 'dot' program. On linux systems, this should be lowercase 'helvetica'.""", 'Helvetica'), - ('cantera_version', '', '2.1.1') + ('cantera_version', '', '2.1.2') ] opts.AddVariables(*config_options) diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index d7709c957..67dbfc8ae 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.1.1 +PROJECT_NUMBER = 2.1.2 # 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 f32eeea38..1f324dcb7 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -75,7 +75,7 @@ copyright = u'2012, Cantera Developers' # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.1' +release = '2.1.2' # 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 062400b91..35e275be1 100644 --- a/doc/sphinx/faq.rst +++ b/doc/sphinx/faq.rst @@ -15,7 +15,7 @@ Installation **How do I install Cantera on Linux?** - Download the source code (e.g. ``cantera-2.1.1.tar.gz``) from `SourceForge + Download the source code (e.g. ``cantera-2.1.2.tar.gz``) from `SourceForge `_ and follow the instructions in the :ref:`sec-compiling`. @@ -55,7 +55,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, 2014. Version 2.1.1. + transport processes*. http://www.cantera.org, 2014. Version 2.1.2. The following BibTeX entry may also be used:: @@ -64,7 +64,7 @@ General title = "Cantera: An Object-oriented Software Toolkit for Chemical Kinetics, Thermodynamics, and Transport Processes", year = 2014, - note = "Version 2.1.1", + note = "Version 2.1.2", howpublished = "\url{http://www.cantera.org}" } diff --git a/doc/sphinx/install.rst b/doc/sphinx/install.rst index 0d236f7bc..6deba54cc 100644 --- a/doc/sphinx/install.rst +++ b/doc/sphinx/install.rst @@ -14,13 +14,13 @@ Windows ======= Windows installers are provided for stable versions of Cantera. These -installation instructions are for Cantera 2.1.1. +installation instructions are for Cantera 2.1.2. 1. **Choose your Python version and architecture** - - On Windows, Cantera supports Python 2.7 and Python 3.3. Python 3.3 is - recommended unless you need to use legacy code that does not work with - Python 3. You can install both Cantera Python modules simultaneously. + - On Windows, Cantera supports Python 2.7, Python 3.3, and Python 3.4. Python + 3.4 is recommended unless you need to use legacy code that does not work + with Python 3. You can install both Cantera Python modules simultaneously. - Cantera supports both 32- and 64- bit Python installations. @@ -39,7 +39,8 @@ installation instructions are for Cantera 2.1.1. - Go to `python.org `_. - *64-bit*: Download the most recent "Windows X86-64 MSI Installer" for - Python *X.Y* (i.e. prefer 3.3.5 to 3.3.4, but not 3.4.1). + Python *X.Y* (i.e. if *X.Y* is 3.4, prefer 3.4.1 to 3.4.0, but not + 3.5.0). - *32-bit*: Download the most recent "Windows x86 MSI Installer" for Python *X.Y*. @@ -61,7 +62,7 @@ installation instructions are for Cantera 2.1.1. `_. - Download the most recent release of the 1.x series for Python *X.Y* that - matches your Python architecture. The binaries for Cantera 2.1.1 require + matches your Python architecture. The binaries for Cantera 2.1.2 require Numpy 1.8.0 or newer. - Run the installer. @@ -77,12 +78,12 @@ installation instructions are for Cantera 2.1.1. 5. **Install Cantera** - Go to the `Cantera Downloads - `_ page. + `_ page. - - *64-bit*: Download **Cantera-2.1.1-x64.msi** and - **Cantera-Python-2.1.1-x64-pyX.Y.msi**. - - *32-bit*: Download **Cantera-2.1.1-x86.msi** and - **Cantera-Python-2.1.1-x86-pyX.Y.msi**. + - *64-bit*: Download **Cantera-2.1.2-x64.msi** and + **Cantera-Python-2.1.2-x64-pyX.Y.msi**. + - *32-bit*: Download **Cantera-2.1.2-x86.msi** and + **Cantera-Python-2.1.2-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/site_scons/wxsgen.py b/site_scons/wxsgen.py index 0e965fec6..852016e4b 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.1.1', + Version='2.1.2', Manufacturer='Cantera Developers')) fields = {'Platform': 'x64'} if self.x64 else {}