Merge branch 'main' of https://github.com/VirtualPlanetaryLaboratory/vspace into comprehensive-testing

Author: RoryBarnes

docs/conf.py

@@ -50,6 +50,7 @@
 # a list of builtin themes.
 #
 html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

environment.yml

@@ -14,7 +14,8 @@ dependencies:
       - pytest-dependency>=0.5.1
       - pytest-env>=0.6.2
       - pytest-cov>=2.11.1
-      - sphinx==4.2.0
+      - sphinx==7.2.6
+      - sphinx-rtd-theme==1.3.0
       - breathe>=4.30.0
       - sphinxcontrib-bibtex>=2.2.0
       - coverage>=5.5

vspace/vspace.py

@@ -196,25 +196,30 @@ def main():
             values = spl[1].split(",")
             for j in range(len(values)):
                 values[j] = values[j].strip()
-            if values[2][0] == 'p':
-                if mode != 1:
-                    raise IOError("Random mode must be used when passing predefined priors")
-                if values[0] not in prior_files:
-                    prior_files.append(values[0])
-                    if values[1] == 'npy':
-                        fprior = np.load(values[0])
-                        prior_index = np.random.choice(fprior.shape[0], size=randsize, replace=False)
-                        prior_indicies.append(prior_index)
-                        samp = fprior[prior_index]
-                        prior_samples.append(samp)
-                    elif values[1] == 'txt' or values[1] == 'dat':
-                        fprior = ascii.read(values[0])
-                        prior_index = np.random.choice(len(fprior), size=randsize, replace=False)
-                        prior_indicies.append(prior_index)
-                        samp = fprior[prior_index]
-                        prior_samples.append(samp)
-                    elif values[1] != 'npy' and values[1] != 'txt' and values[1] != 'dat':
-                        raise IOError("File type incompatible for predefined prior mode. Acceptable file types: npy, ascii formatted txt, ascii formatted dat")
+            try:
+                if values[2][0] == 'p':
+                    if mode != 1:
+                        raise IOError("Random mode must be used when passing predefined priors")
+                    if values[0] not in prior_files:
+                        prior_files.append(values[0])
+                        if values[1] == 'npy':
+                            fprior = np.load(values[0])
+                            prior_index = np.random.choice(fprior.shape[0], size=randsize, replace=False)
+                            prior_indicies.append(prior_index)
+                            samp = fprior[prior_index]
+                            prior_samples.append(samp)
+                        elif values[1] == 'txt' or values[1] == 'dat':
+                            fprior = ascii.read(values[0])
+                            prior_index = np.random.choice(len(fprior), size=randsize, replace=False)
+                            prior_indicies.append(prior_index)
+                            samp = fprior[prior_index]
+                            prior_samples.append(samp)
+                        elif values[1] != 'npy' and values[1] != 'txt' and values[1] != 'dat':
+                            raise IOError("File type incompatible for predefined prior mode. Acceptable file types: npy, ascii formatted txt, ascii formatted dat")
+            except:
+                print('ERROR: Incorrect number of arguments.')
+                print(inputf+', line '+i+': '+lines[i])
+                exit()
     # End pass 1a through input file -------------------------------
     # End Megans Addition ------------------------------------------