diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..57b6d2dd --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "openflexure_microscope/api/static"] + path = openflexure_microscope/api/static + url = https://gitlab.com/openflexure/openflexure-microscope-jsclient.git + branch = frame diff --git a/openflexure_microscope/api/app.py b/openflexure_microscope/api/app.py index af862b2b..195c5c06 100644 --- a/openflexure_microscope/api/app.py +++ b/openflexure_microscope/api/app.py @@ -66,7 +66,7 @@ app, labthing = create_app( 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": ""}, + flask_kwargs={"static_url_path": "", "static_folder": "static/dist"}, ) # Enable CORS for some routes outside of LabThings diff --git a/pyproject.toml b/pyproject.toml index 6b665705..b33108c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "openflexure_microscope" -version = "2.1.0-dev" +version = "2.2.0-alpha" description = "Python module, and Flask-based web API, to run the OpenFlexure Microscope." authors = [ @@ -22,6 +22,8 @@ keywords = ['raspberry pi', 'arduino', 'microscope'] license = "GPL-3.0" +exclude = ["**/node_modules/"] + [tool.poetry.dependencies] python = "^3.6" Flask = "^1.0"