Revert "Remove CI file from frame branch"

This reverts commit dac3632c28

openflexure_microscope/api/app.py

@@ -65,8 +65,8 @@ app, labthing = create_app(
     title=f"OpenFlexure Microscope {api_microscope.name}",
     description="Test LabThing-based API for OpenFlexure Microscope",
     types=["org.openflexure.microscope"],
-    version=pkg_resources.get_distribution("openflexure_microscope").version,
-    flask_kwargs={"static_url_path": ""},
+    version=pkg_resources.get_distribution("openflexure-microscope-server").version,
+    flask_kwargs={"static_url_path": "", "static_folder": "static/dist"},
 )
 
 # Enable CORS for some routes outside of LabThings

openflexure_microscope/api/static

@@ -0,0 +1 @@
+Subproject commit df7169ba6833fa213f497ff71594dc4330af0792

openflexure_microscope/api/static/css/chunk-vendors.1800c649.css

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8605f70737729f74f48d3183b30b4a2f50706f4f750cd208aeb8c136253f7d01
-size 772

openflexure_microscope/api/static/css/main.24f9722e.css

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e68506e72389393d35cc47e5184459fff9a23bedea8c9ee96491f66c88e71954
-size 1375875

openflexure_microscope/api/static/favicon-16x16.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee944cc13be0a52ce48a81a09c179dac70729bd7580a516ccc8ac10b4cfa3f98
-size 1310

openflexure_microscope/api/static/favicon-32x32.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:710327f8b3d83c83019ed2c4b27de8caf8e4e923c9148f93c1c0a2662f683f26
-size 1659

openflexure_microscope/api/static/favicon.ico

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0405ef60ab42df1c2e8721bf1f500c8c7d9e1afae130307101b8f77925ffdac1
-size 1150

openflexure_microscope/api/static/fonts/MaterialIcons-Regular.012cf6a1.woff

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4a1baec300d09e03a8380b85918267ee80faae8e00c6c56b48e2e74b1d9b38d
-size 57620

openflexure_microscope/api/static/fonts/MaterialIcons-Regular.570eb838.woff2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a87d66c91b2e7dc5530aef76c03bd6a3d25ea5826110bf4803b561b811cc8726
-size 44300

openflexure_microscope/api/static/fonts/MaterialIcons-Regular.a37b0c01.ttf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b7f4a3ab562048f28dd1fa691601bc43363a61d0f876d16d8316c52e4f32d696
-size 128180

openflexure_microscope/api/static/fonts/MaterialIcons-Regular.e79bfd88.eot

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c998b4a9c0acbb9fe5dd572c206a5a33fdd5ca2b58db87fc3b893beac85068d
-size 143258

openflexure_microscope/api/static/index.html

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:463bfdbd635ddff1d00df38b1149ffd3947b492d71cfb546549dffebd311b090
-size 843

openflexure_microscope/api/static/js/chunk-vendors.3b7762c4.js

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a536bfa88fd1bf69284804285c5cf1da33cf05f164f175eb4085f7d057ff4f17
-size 378133

openflexure_microscope/api/static/js/chunk-vendors.3b7762c4.js.map

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:996b19391845b7cf1810f1181d935aad524897763da4c36847c7715f762b63fa
-size 1597950

openflexure_microscope/api/static/js/main.eaa8787b.js

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a77d7d2e5e4220883bc1491a627435cc80d0b2574d51972bcd6b12add7a4a94
-size 116850

openflexure_microscope/api/static/js/main.eaa8787b.js.map

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1404c938e8f60b1694dd48357d486d919f5b1e32c9f226ca26fc0ee399019542
-size 395811

openflexure_microscope/api/static/titleicon.svg

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:187e61d8f6171eebf611502412556c707fab1d837f8763b2b60ce3915303f0ad
-size 1734

openflexure_microscope/install.py

@@ -0,0 +1,14 @@
+from pynpm import NPMPackage
+import os 
+
+dir_path = os.path.dirname(os.path.realpath(__file__))
+pkg_path = os.path.join(dir_path, "api", "static", "package.json")
+
+pkg = NPMPackage(pkg_path)
+
+def install():
+    pkg.install()
+
+def build():
+    pkg.install()
+    pkg.run_script('build')

openflexure_microscope/microscope.py

@@ -15,7 +15,8 @@ from openflexure_microscope.stage.sanga import SangaStage
 
 try:
     from openflexure_microscope.camera.pi import PiCameraStreamer
-except ImportError:
+except Exception as e:
+    logging.error(e)
     logging.warning("Unable to import PiCameraStreamer")
 from openflexure_microscope.camera.mock import MissingCamera