minor updates to get build working better

PALab · May 22, 2018 · e54c8cc · e54c8cc
1 parent da2b785
commit e54c8cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/elm/elm-make-all.sh b/elm/elm-make-all.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-pushd ~/place/elm
 elm-make Place.elm --output ../web/place.js
 cd plugins
 elm-make AlazarTech.elm --output ../../web/plugins/alazartech.js
@@ -20,4 +19,4 @@ elm-make TektronixMDO3014.elm --output ../../web/plugins/tektronix_mdo3014.js
 elm-make XPSControl.elm --output ../../web/plugins/xps_control.js
 elm-make ArduinoStage.elm --output ../../web/plugins/arduino_stage.js
 elm-make MokuLab.elm --output ../../web/plugins/mokulab.js
-popd
+cd ..
diff --git a/meta.yaml b/meta.yaml
@@ -6,7 +6,7 @@ source:
     path: .
 
 build:
-    number: 49
+    number: 51
 
 requirements:
     build:

diff --git a/place/plugins/alazartech/alazartech.py b/place/plugins/alazartech/alazartech.py
@@ -15,7 +15,10 @@
 import numpy as np
 
 from place.plugins.instrument import Instrument
-from . import atsapi as ats
+try:
+    from . import atsapi as ats
+except OSError:
+    from . import dummy_atsapi as ats
 setattr(ats, 'TRIG_FORCE', -1)
 
 class ATSGeneric(Instrument, ats.Board):
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ source: @@
         path: .
     build:
-        number: 49
+        number: 51
     requirements:
         build:
@@ Expand Down @@