rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'no-pynpm' into 'master'

Browse source 
Removed unused pynpm package

See merge request openflexure/openflexure-microscope-server!96
This commit is contained in:
Joel Collins 2020-11-25 15:25:44 +00:00
commit 8bdd3f2297
4 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -14,11 +14,13 @@ This includes installing the server in a mode better suited for active developme
* `git clone https://gitlab.com/openflexure/openflexure-microscope-server.git`
* `poetry install`
* `poetry run build_static`
* Building the static interface will require a valid Node.js installation
* To build on a Raspberry Pi:
* `curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -`
* `sudo apt install nodejs`
* `cd openflexure_microscope/api/static`
* `npm install`
* `npm run build`
## Formatting and linting

17
openflexure_microscope/install.py
View file

@ -1,17 +0,0 @@
import os
from pynpm import NPMPackage
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")

19
poetry.lock generated
View file

@ -283,7 +283,7 @@ i18n = ["Babel (>=0.8)"]
[[package]]
name = "labthings"
version = "1.1.3"
version = "1.1.4"
description = "Python implementation of LabThings, based on the Flask microframework"
category = "main"
optional = false
@ -429,7 +429,7 @@ toml = ">=0.7.1"
name = "pynpm"
version = "0.1.2"
description = "Python interface to your NPM and package.json."
category = "main"
category = "dev"
optional = false
python-versions = "*"
@ -448,12 +448,15 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
[[package]]
name = "pyserial"
version = "3.4"
version = "3.5"
description = "Python Serial Port Extension"
category = "main"
optional = false
python-versions = "*"
[package.extras]
cp2110 = ["hidapi"]
[[package]]
name = "python-dateutil"
version = "2.8.1"
@ -753,7 +756,7 @@ rpi = ["RPi.GPIO"]
[metadata]
lock-version = "1.1"
python-versions = "^3.6.1"
content-hash = "e0aad912d5cb388d3ff395dc8a517f701ba2cbe4c2169771080a889906e91b41"
content-hash = "60f1064b6af35d65d45ec835b4e3032316732e4859a5c81a3fab8e06091f2892"
[metadata.files]
alabaster = [
@ -855,8 +858,8 @@ jinja2 = [
{file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"},
]
labthings = [
{file = "labthings-1.1.3-py3-none-any.whl", hash = "sha256:51f0bc897fcbacbcbb911658d3daafd41a35373bca4ef2156423cdb728fa3d78"},
{file = "labthings-1.1.3.tar.gz", hash = "sha256:3d68c638866f1c525a8b5285570c2d4599005d227b928e78088c0a29e6544007"},
{file = "labthings-1.1.4-py3-none-any.whl", hash = "sha256:18febba20cb552af9e5c0f8f47b06acd9649dce7de7205734b9e1fd3334e2d79"},
{file = "labthings-1.1.4.tar.gz", hash = "sha256:69ca83d28720597327296d3e145bf57e68af17d245c0051c274db928e0a13e76"},
]
lazy-object-proxy = [
{file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"},
@ -1033,8 +1036,8 @@ pyparsing = [
{file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
]
pyserial = [
{file = "pyserial-3.4-py2.py3-none-any.whl", hash = "sha256:e0770fadba80c31013896c7e6ef703f72e7834965954a78e71a3049488d4d7d8"},
{file = "pyserial-3.4.tar.gz", hash = "sha256:6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627"},
{file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
{file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
]
python-dateutil = [
{file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"},

4
pyproject.toml
View file

@ -38,19 +38,17 @@ scipy = "1.5.3" # Exact version so we can guarantee a wheel
python-dateutil = "^2.8"
psutil = "^5.6.7" # Autostorage extension
opencv-python-headless = "4.4.0.44"
pynpm = "^0.1.2"
sangaboard = "^0.2"
expiringdict = "^1.2.1"
camera-stage-mapping = "0.1.4"
picamerax = ">=20.9.1"
pyyaml = "^5.3.1"
labthings = "^1.1.3"
labthings = "^1.1.4"
[tool.poetry.extras]
rpi = ["RPi.GPIO"]
[tool.poetry.scripts]
build_static = 'openflexure_microscope.install:build'
rescue = 'openflexure_microscope.rescue.auto:main'
[tool.poetry.dev-dependencies]