Commit d7ca8f8a authored by Joel Collins's avatar Joel Collins
Browse files

Set up eV submodule

parent db9a0581

.gitmodules

0 → 100644
+4 −0
Original line number Diff line number Diff line 
[submodule "openflexure_microscope/api/static"]

	path = openflexure_microscope/api/static

	url = https://gitlab.com/openflexure/openflexure-microscope-jsclient.git

	branch = frame

openflexure_microscope/api/app.py

+1 −1
Original line number Diff line number Diff line
@@ -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

pyproject.toml

+3 −1
Original line number Diff line number Diff line
@@ -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"