ACID-code-v2 0.2.2a5__tar.gz → 0.2.3a2__tar.gz

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.2.2a5
+Version: 0.2.3a2
 Summary: Returns line profiles from input spectra by fitting the stellar continuum and performing LSD
 Author: Lucy Dolan
 Author-email: Benjamin Cadell <bcadell01@qub.ac.uk>

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/docs/installation.rst

@@ -25,16 +25,16 @@ Once the environment has been activated ACID can be installed using pip_:
 
 .. _source:
 
-Installing from the source
+Cloning the repository
 ===========================
 In order to use the example data (for the tutorials) or the test suite ACID will need to be installed from the source (i.e. directly from the GitHub repository).
-This can be done by cloning the source repository and installing from there.
+This can be done by cloning the source repository. All examples and tests attempt first to import from your pip installation.
+If this fails they will attempt to import from the local source directory instead.
 
 .. code-block:: bash
 
-    git clone https://github.com/ldolan05/ACID.git
-    cd ACID
-    python -m pip install -e .
+    git clone https://github.com/Benjamin-Cadell/ACID_v2.git
+    cd ACID_v2
 
 .. _test:
 
@@ -47,6 +47,6 @@ Test your installation by running our test file in the test directory using pyte
 
 .. code-block:: bash
     
-    pytest tests.py
+    pytest tests/tests.py
 
 

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/example/tutorial_code.py

@@ -5,13 +5,13 @@ import multiprocessing as mp
 import numpy as np
 import matplotlib.pyplot as plt
 try:
-    raise Exception("Force except block")
     import ACID_code_v2 as acid
 except:
     os.chdir(os.path.dirname(__file__))
     os.chdir("../src") # ensures we are in the main directory
     import ACID_code_v2 as acid
     os.chdir("../example") # change back to example directory
+    print("pip module failed to import, imported from local instead")
 importlib.reload(acid)
 
 spec_file = fits.open('sample_spec_1.fits')

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/src/ACID_code_v2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.2.2a5
+Version: 0.2.3a2
 Summary: Returns line profiles from input spectra by fitting the stellar continuum and performing LSD
 Author: Lucy Dolan
 Author-email: Benjamin Cadell <bcadell01@qub.ac.uk>

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/tests/tests.py

@@ -1,11 +1,17 @@
 #%%
 from astropy.io import fits
 import os, glob, importlib
-os.chdir(os.path.dirname(__file__))
-os.chdir("..") # ensures we are in the main directory
-import ACID_code_v2 as acid
 import numpy as np
 import matplotlib.pyplot as plt
+os.chdir(os.path.dirname(__file__))
+os.chdir("..") # ensures we are in the main directory
+try:
+    import ACID_code_v2 as acid
+except:
+    os.chdir("src")
+    import ACID_code_v2 as acid
+    os.chdir("..")
+    print("pip module failed to import, imported from local instead")
 importlib.reload(acid)
 
 def test_run_e2ds():

{acid_code_v2-0.2.2a5 → acid_code_v2-0.2.3a2}/tests/tutorial_test.py

@@ -1,8 +1,15 @@
 from astropy.io import fits
-import ACID_code_v2.ACID as acid
 import numpy as np
 import matplotlib.pyplot as plt
-import glob
+import glob, os
+os.chdir(os.path.dirname(__file__))
+try:
+    import ACID_code_v2 as acid
+except:
+    os.chdir("../src")
+    import ACID_code_v2 as acid
+    os.chdir(os.path.dirname(__file__))
+    print("pip module failed to import, imported from local instead")
 
 def quickstart():
     spec_file = fits.open('../example/sample_spec_1.fits')