Skip to content

Commit 1f32c4a

Browse files
authored
Merge pull request #438 from kdere/master
updated docs for a version 0.15.1 release
2 parents e04762d + 09ead5d commit 1f32c4a

File tree

10 files changed

+34
-80
lines changed

10 files changed

+34
-80
lines changed

ChiantiPy/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
22
the current version of the ChiantiPy package
33
'''
4-
__version_info__ = ('0','15', '0')
4+
__version_info__ = ('0','15', '1')
55
__version__ = '.'.join(__version_info__)

README

Lines changed: 0 additions & 60 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ChiantiPy - Version 0.15.0
1+
# ChiantiPy - Version 0.15.1
22
[![Documentation Status](http://readthedocs.org/projects/chiantipy/badge/?version=latest)](http://chiantipy.readthedocs.io/en/latest/?badge=latest)
33
[![Coverage Status](https://coveralls.io/repos/github/chianti-atomic/ChiantiPy/badge.svg?branch=master)](https://coveralls.io/github/chianti-atomic/ChiantiPy?branch=master)
44
[![ascl:1308.017](https://img.shields.io/badge/ascl-1308.017-blue.svg?colorB=262255)](http://ascl.net/1308.017)

README.rst

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
ChiantiPy - Version 0.12.0
1+
.. _chiantipy---version-0151:
2+
3+
ChiantiPy - Version 0.15.1
24
==========================
35

46
|Documentation Status| |Coverage Status| |ascl:1308.017|
@@ -33,10 +35,12 @@ The following dependencies are required to run ChiantiPy,
3335
- `Matplotlib <http://matplotlib.org/>`__
3436
- `ipyparallel <https://github.com/ipython/ipyparallel>`__
3537

36-
The following two are extremely useful for running Python programs \*
37-
`IPython <http://ipython.org>`__ \* `Jupyter <http://jupyter.org/>`__
38+
The following two are extremely useful for running Python programs
39+
40+
- `IPython <http://ipython.org>`__
41+
- `Jupyter <http://jupyter.org/>`__
3842

39-
Optionally, if youd like to use the GUI dialogs,
43+
Optionally, if you'd like to use the GUI dialogs,
4044

4145
- `PyQt5 <https://riverbankcomputing.com/software/pyqt/intro>`__
4246

@@ -45,16 +49,18 @@ dependencies, we recommend the `Anaconda
4549
platform <https://www.continuum.io/downloads>`__. Next, download the
4650
`CHIANTI
4751
database <http://www.chiantidatabase.org/chianti_download.html>`__,
48-
version 10.0 or later. Assuming youve placed the CHIANTI tree in
52+
version 10.0 or later. Assuming you've placed the CHIANTI tree in
4953
``$HOME``, set the environment variable in your ``.bashrc`` file,
5054

51-
.. code:: shell
55+
.. code:: Shell
56+
57+
export XUVTOP=$HOME/MY_CHIANTI_DIRECTORY
5258
53-
export XUVTOP=$HOME/chianti/dbase
59+
should point to the top directory of your CHIANTI distribution
5460

5561
Finally, clone and install the source from GitHub,
5662

57-
.. code:: shell
63+
.. code:: Shell
5864
5965
$ git clone --recursive https://github.com/chianti-atomic/ChiantiPy.git
6066
$ cd ChiantiPy
@@ -66,11 +72,11 @@ The release is also available on
6672
Usage
6773
-----
6874

69-
As a quick example, well calculate the populations of the top 10 levels
75+
As a quick example, we'll calculate the populations of the top 10 levels
7076
of Fe XIV as a function of temperature at constant density and plot
7177
them:
7278

73-
.. code:: python
79+
.. code:: Python
7480
7581
>>> import ChiantiPy.core as ch
7682
>>> import numpy as np

docs/source/changelog.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog
33
===========
44

5+
Changes from 0.15.0 to 0.15.1
6+
=============================
7+
8+
The continuum.freeBound method has been corrected so that it can be used under extreme conditions and not fail.
9+
10+
The io.abundanceRead method has been updated to work with new files in the upcoming CHIANTI 10.1 release
11+
12+
513
Changes from 0.14.1 to 0.15.0
614
=============================
715

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959

6060
# General information about the project.
6161
project = 'ChiantiPy'
62-
copyright = '2022, Ken Dere'
62+
copyright = '2023, Ken Dere'
6363
author = 'Ken Dere'
6464

6565
# The version info for the project you're documenting, acts as replacement for
6666
# |version| and |release|, also used in various other places throughout the
6767
# built documents.
6868
#
6969
# The short X.Y version.
70-
version = '0.15.0'
70+
version = '0.15.1'
7171
# The full version, including alpha/beta/rc tags.
72-
release = '0.15.0'
72+
release = '0.15.1'
7373

7474
# The language for content autogenerated by Sphinx. Refer to documentation
7575
# for a list of supported languages.

docs/source/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The gzipped *data* tar ball can be downloaded from the CHIANTI website_
5656

5757
::
5858

59-
setenv XUVTOP /data1/xuv/directory.where.the.tarball.was.placed
59+
setenv XUVTOP /data1/directory.where.the.tarball.was.placed
6060

6161

6262
or on Windows: To set the environment variable, go to Control Panel -> System -> Advanced System Properties -> Environment Variables.

docs/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ ChiantiPy Documentation
88

99
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/>`_.
1010

11-
The latest version of ChiantiPy is 0.15.0 and is compatible with CHIANTI database version 10.0.X. It is not compatible with previous versions
11+
The latest version of ChiantiPy is 0.15.1 and is compatible with CHIANTI database version 10.0.X. It is not compatible with previous versions
1212

13-
ChiantiPy v0.15.0 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, ...
13+
ChiantiPy v0.15.1 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, ...
1414

1515
`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.
1616

docs/source/notes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ flux
2020

2121
abundfile
2222

23-
The name of the abundance file. Acceptable values are any of the file names in XUVTOP/abundance, such as *cosmic_1973_allen*. The default value is *sun_photospheric_2015_scott* which includes the abundances of Scott et al., 2015, A&A, 573, A25.
23+
The name of the abundance file. Acceptable values are any of the file names in XUVTOP/abundance, such as *cosmic_1973_allen*. The default value is *sun_photospheric_2015_scott* that includes the abundances of Scott et al., 2015, A&A, 573, A25.
2424

2525
ioneqfile
2626
the name of the ionization equilibrium file. Acceptable values are any of the file names in XUVTOP/ioneq such as *arnaud_raymond*, *arnaud_rothenflug*, or *chianti*. The default value is *chianti* which includes the ionization equilibrium calculations of K.P. Dere, G. Del Zanna, P.R. Young, E. Landi, R Sutherland, 2019, ApJ, 241, 2 and are considered to be based on the best ionization and recombination rates currently available.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
description = 'a Python interface to the CHIANTI atomic database for astrophysical spectroscopy',
1111
long_description = long_description,
1212
# long_description_content_type = text/rst,
13-
version = '0.15.0',
13+
version = '0.15.1',
1414
author = 'Ken Dere',
1515
author_email = '[email protected]',
1616
url = 'https://github.com/chianti-atomic/ChiantiPy',

0 commit comments

Comments
 (0)