Merge branch 'master' into fit_calib

tomasstolker · Jul 15, 2021 · b3d0b54 · b3d0b54
2 parents 670ae12 + 7e3c43f
commit b3d0b54
Show file tree

Hide file tree

Showing 22 changed files with 804 additions and 206 deletions.
diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@
    :target: https://pypi.python.org/pypi/species
 
 .. image:: https://img.shields.io/travis/tomasstolker/species
-   :target: https://travis-ci.org/tomasstolker/species
+   :target: https://travis-ci.com/tomasstolker/species
 
 .. image:: https://img.shields.io/readthedocs/species
    :target: http://species.readthedocs.io

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -20,8 +20,14 @@ Or, to update to the most recent version:
 
    $ pip install --upgrade species
 
+Please check for any errors and warnings during the installation to make sure that all dependencies are correctly installed.
+
 .. important::
-   Currently it is recommended to install *species* from Github (see below) in order to benefit from the most recent implementations. The available package on PyPI is also stable but it usually trails behind the version on Github.
+   Before installing ``species``, it is required (for ``UltraNest``) to separately install ``cython``:
+
+   .. code-block:: console
+
+       $ pip install cython
 
 Installation from Github
 ------------------------

diff --git a/docs/species.data.rst b/docs/species.data.rst
@@ -4,6 +4,14 @@ species.data package
 Submodules
 ----------
 
+species.data.allers2013 module
+------------------------------
+
+.. automodule:: species.data.allers2013
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 species.data.ames\_cond module
 ------------------------------
 
@@ -36,6 +44,14 @@ species.data.blackbody module
    :undoc-members:
    :show-inheritance:
 
+species.data.bonnefoy2014 module
+--------------------------------
+
+.. automodule:: species.data.bonnefoy2014
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 species.data.btcond module
 --------------------------
 

diff --git a/docs/tutorials/color_magnitude_narrowband.ipynb b/docs/tutorials/color_magnitude_narrowband.ipynb
@@ -902,7 +902,7 @@
     }
    ],
    "source": [
-    "database.add_spectrum('spex')"
+    "database.add_spectra('spex')"
    ]
   },
   {

diff --git a/docs/tutorials/spectral_library.ipynb b/docs/tutorials/spectral_library.ipynb
@@ -119,7 +119,7 @@
     }
    ],
    "source": [
-    "database.add_spectrum(spec_library='irtf', sptypes=['L', 'T'])"
+    "database.add_spectra(spec_library='irtf', sptypes=['L', 'T'])"
    ]
   },
   {

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 astropy ~= 4.1.0
 astroquery ~= 0.4.0
 corner ~= 2.1.0
-cython ~= 0.29.0
 emcee ~= 3.0.0
 h5py ~= 2.10.0
 matplotlib ~= 3.3.0