Merge pull request #282 from kdere/master

bumped verion to v0.9.5
chianti-atomic · Feb 19, 2020 · 2850771 · 2850771
2 parents 2b817bf + fd02485
commit 2850771
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,8 @@ htmlcov
 MANIFEST
 
 # Sphinx
-docs/source/api
+# kpd commented out the api stuff
+#docs/source/api
 docs/_build
 
 # Eclipse editor project files

diff --git a/ChiantiPy/version.py b/ChiantiPy/version.py
@@ -1,5 +1,5 @@
 '''
 the current version of the ChiantiPy package
 '''
-__version_info__ = ('0','9', '4')
+__version_info__ = ('0','9', '5')
 __version__ = '.'.join(__version_info__)
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -2,6 +2,23 @@
 Changelog
 ===========
 
+
+Changes from 0.9.4 to 0.9.5
+===========================
+
+this is a bug-fix release.
+
+a bug in the inherited method base._IntensityRatio() had a problem if lines were selected from different ions
+
+
+Changes from 0.9.3 to 0.9.4
+===========================
+
+this is a bug-fix release.
+
+changes in version 0.9.2 continued to give problems with ions that included autoionization rates
+
+
 Changes from 0.9.3 to 0.9.3
 ===========================
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -67,9 +67,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.4'
+version = '0.9.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.4'
+release = '0.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -8,9 +8,9 @@ ChiantiPy Documentation
 
 Welcome to the ChiantiPy documentation. ChiantiPy is a pure Python package for performing calculations of astrophysical spectra using the `CHIANTI atomic database <http://www.chiantidatabase.org/>`_.
 
-The latest version of ChiantiPy is 0.9.4 and is compatible with CHIANTI database version 9.0. It is not compatible with previous versions
+The latest version of ChiantiPy is 0.9.5 and is compatible with CHIANTI database version 9.0. It is not compatible with previous versions
 
-ChiantiPy v0.9.4 is released under the OSI approved ISC license. From `Wikipedia <https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=664696993>`_: The ISC license is a permissive free software license written by the Internet Software Consortium (ISC). It is functionally equivalent to the simplified BSD and MIT/Expat licenses, ...
+ChiantiPy v0.9.5 is released under the OSI approved ISC license. From `Wikipedia <https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=664696993>`_: The ISC license is a permissive free software license written by the Internet Software Consortium (ISC). It is functionally equivalent to the simplified BSD and MIT/Expat licenses, ...
 
 `CHIANTI <http://www.chiantidatabase.org/>`_ consists of a database of atomic data that can be used to interpret spectral lines and continua emitted from high-temperature, optically-thin astrophysical sources.
 

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 setup(name = 'ChiantiPy',
     description = 'a Python interface to the CHIANTI atomic database for astrophysical spectroscopy',
     long_description = long_description,
-    version = '0.9.4',
+    version = '0.9.5',
     author = 'Ken Dere',
     author_email = 'kdere@gmu.edu',
     url = 'https://github.com/chianti-atomic/ChiantiPy',