Merge pull request #48 from jotaylor/bug_fixes

Bug fixes

README.rst

@@ -111,7 +111,7 @@ And here are some orbital parameters for our planetary system using `batman <htt
 
    # Simulate star with transiting exoplanet by including transmission spectrum and orbital params
    import batman
-   tso_transit = TSO(ngrps=3, nints=5, star=STAR_DATA, run=False)
+   tso_transit = TSO(ngrps=3, nints=5, star=STAR_DATA)
    params = batman.TransitParams()
    params.t0 = 0. # time of inferior conjunction
    params.per = 5.7214742 # orbital period (days)

awesimsoss/awesim.py

@@ -781,7 +781,7 @@ def plot_lightcurve(self, column, time_unit='s', resolution_mult=20, draw=True):
             color = next(utils.COLORS)
 
             # If it is an index
-            if isinstance(col, int):
+            if isinstance(col, (int, np.integer)):
                 lightcurve = flux_cols[:, col]
                 label = 'Column {}'.format(col)
 
@@ -1372,4 +1372,4 @@ def __init__(self, ngrps=2, nints=2, teff=1800, filter='CLEAR', subarray='SUBSTR
 
         # Run the simulation
         if run:
-            self.simulate()
+            self.simulate()

environment.yml

@@ -1,5 +1,4 @@
 channels:
-  - http://ssb.stsci.edu/astroconda-dev
   - conda-forge
   - http://ssb.stsci.edu/astroconda
   - defaults
@@ -204,7 +203,6 @@ dependencies:
   - stsci.tools=3.4.13=py36_1
   - verhawk=0.0.2=py36_1
   - webbpsf-data=0.8.0=0
-  - namedlist=1.7=py36_1
   - pip:
     - asteval==0.9.14
     - bibtexparser==1.1.0
@@ -215,12 +213,12 @@ dependencies:
     - future==0.17.1
     - itsdangerous==1.1.0
     - jdcal==1.4
-    - jwst==0.13.8a0.dev37+g1f2237de
     - jwst-backgrounds==1.1.1
     - jwxml==0.3.0
     - llvmlite==0.29.0
     - lmfit==0.9.13
     - msgpack==0.6.1
+    - namedlist==1.7
     - numba==0.44.1
     - numpydoc==0.8.0
     - openpyxl==2.5.8
@@ -231,4 +229,4 @@ dependencies:
     - uncertainties==3.1.1
     - webbpsf==0.7.0
     - werkzeug==0.15.4
-
+    - git+https://github.com/spacetelescope/jwst@1f2237de#egg=jwst