Bug fix building of the autodocs (#7)

tomasstolker · Apr 17, 2020 · 1c5e488 · 1c5e488
1 parent c1b4cf1
commit 1c5e488
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -17,7 +17,6 @@
 
 sys.path.insert(0, os.path.abspath('../'))
 
-
 # -- Project information -----------------------------------------------------
 
 project = 'species'
@@ -30,10 +29,6 @@
         if '__version__' in line:
             version = line.split("'")[1]
 
-# The full version, including alpha/beta/rc tags
-release = version
-
-
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -176,7 +171,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     (master_doc, 'species', 'species Documentation',
-     author, 'species', 'Toolkit for spectral and photometric analysis of planetary and substellar atmospheres',
+     author, 'species', 'Toolkit for atmospheric characterization of exoplanets and brown dwarf',
      'Miscellaneous'),
 ]
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,3 @@
-nbsphinx
-pandoc
-jupyter
+nbsphinx ~= 0.6
+pandoc ~= 1.0
+jupyter ~= 1.0
diff --git a/docs/tutorials/synthetic_photometry.ipynb b/docs/tutorials/synthetic_photometry.ipynb
@@ -296,7 +296,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.0"
+   "version": "3.6.10"
   }
  },
  "nbformat": 4,

diff --git a/species/analysis/fit_model.py b/species/analysis/fit_model.py
@@ -9,9 +9,13 @@
 from multiprocessing import Pool, cpu_count
 
 import emcee
-import pymultinest
 import numpy as np
 
+try:
+    import pymultinest
+except:
+    warnings.warn('PyMultiNest could not be imported.')
+
 from species.core import constants
 from species.data import database
 from species.read import read_model, read_object

diff --git a/species/data/vlm_plx.py b/species/data/vlm_plx.py
@@ -87,6 +87,8 @@ def add_vlm_plx(input_path,
 
     database.create_dataset('photometry/vlm-plx/ra', data=phot_data['RA'])  # (deg)
     database.create_dataset('photometry/vlm-plx/dec', data=phot_data['DEC'])  # (deg)
+    database.create_dataset('photometry/vlm-plx/parallax', data=parallax)
+    database.create_dataset('photometry/vlm-plx/parallax_error', data=parallax_error)
     database.create_dataset('photometry/vlm-plx/distance', data=distance)
     database.create_dataset('photometry/vlm-plx/distance_error', data=distance_error)
     database.create_dataset('photometry/vlm-plx/MKO/NSFCam.Y', data=phot_data['YMAG'])