Commit graph

74 commits

Author SHA1 Message Date
Joel Collins
5f1bca91bf Use simpler-spec branch of labthings (temporary pre-release) 2020-06-29 13:49:54 +01:00
Joel Collins
832a9adbe3 2.2.3 2020-06-28 09:24:15 +01:00
Joel Collins
f60d85fa89 Updated dependencies 2020-06-25 16:00:26 +01:00
Joel Collins
8d04359a2f Updated LabThings to 0.6.6 2020-06-24 10:00:53 +01:00
Joel Collins
aa9f621476 Merge branch 'optimised-capture-threadpools' into 'master'
Optimised capture IO

See merge request openflexure/openflexure-microscope-server!62
2020-06-15 16:28:25 +00:00
Joel Collins
27e658ece4 Updated labthings to 0.6.5 2020-06-15 17:23:58 +01:00
Joel Collins
37b075e7f5 Upgraded sangaboard to 0.2.3 2020-06-11 16:12:33 +01:00
Joel Collins
59b1d7dba4 Updated pysangaboard 2020-06-11 15:15:34 +01:00
Joel Collins
1518689457 Updated version and dependencies 2020-06-11 15:03:46 +01:00
Joel Collins
22bb89d901 Updated dependencies 2020-06-05 10:15:30 +01:00
Joel Collins
7b401079cd Updated lockfile 2020-06-04 13:55:14 +01:00
Joel Collins
698f1a5938 Switched to Sangaboard PyPI distribution and updated version number 2020-06-04 13:48:33 +01:00
Joel Collins
31aaff1d33 Upgraded to LabThings 0.6.4 2020-05-28 12:54:25 +01:00
Joel Collins
0cbc466f8d Updated version and dependencies 2020-05-27 16:00:45 +01:00
Joel Collins
55e423c159 Merge external CSM extension 2020-05-26 15:15:32 +01:00
Joel Collins
910d452e5a Updated version and dependencies 2020-05-26 14:51:34 +01:00
Joel Collins
d9527685d6 Updated to LabThings 0.6.3 2020-05-20 17:47:16 +01:00
Joel Collins
81e8171517 Merge branch 'master' into 'frame'
# Conflicts:
#   poetry.lock
2020-05-18 14:20:40 +00:00
Joel Collins
0f912cb064 Update LabThings to 6.0.2. Closes #136 2020-05-18 15:18:12 +01:00
Joel Collins
5c8d38b0e1 Move pynpm to dev dependencies 2020-05-18 14:55:41 +01:00
Joel Collins
79259b3fc9 Revert "Remove CI file from frame branch"
This reverts commit dac3632c28
2020-05-18 09:54:18 +00:00
Joel Collins
7655b23a5a Fixed dependencies 2020-05-16 21:39:20 +01:00
Joel Collins
6d0f325165 Renamed Poetry project and fixed optional dependencies 2020-05-16 20:48:28 +01:00
Joel Collins
54ee94042d Lock picamera dependency to wheel 2020-05-15 17:14:49 +01:00
Joel Collins
3a789d2dd3 Added PyNPM dependency 2020-05-15 15:24:17 +01:00
Joel Collins
ffafd93838 Updated to LabThings 061 2020-05-15 09:37:43 +01:00
Joel Collins
f068bffec0 Pinned to LabThings 0.6.0 2020-05-12 16:01:45 +01:00
Joel Collins
ef6f428a84 Updated dependencies 2020-04-30 17:46:59 +01:00
Joel Collins
ed8057ce04 Upgrade to labthings 0.5.2 2020-04-27 13:10:34 +01:00
Joel Collins
43e35501e1 Fixed updated dependencies 2020-04-24 17:48:06 +01:00
Joel Collins
4fffa1fcba Update deps 2020-04-24 16:04:46 +01:00
Richard Bowman
70d4c7e950 Merge branch 'master' into stage-calibration 2020-04-10 15:16:25 +01:00
Joel Collins
63e19916be Updated dependencies and version 2020-03-31 11:01:13 +01:00
Richard Bowman
83bb06d58f moved to a working version of opencv 2020-03-27 16:10:14 +00:00
Richard Bowman
2847fa9ab5 Merge branch 'master-versionbump' into stage-calibration 2020-03-26 16:19:19 +00:00
Joel Collins
03969fdfb2 Updated to LabThings 0.3.0 2020-03-26 14:17:04 +00:00
Richard Bowman
8a2a2abbec Merge branch 'v2.1.0-dev' into stage-calibration 2020-03-25 16:36:41 +00:00
Joel Collins
10fa93d11c Iterated to 2.0.0 2020-03-24 10:22:49 +00:00
Joel Collins
1a27a8e4f3 Pin LabThings to 0.2.0 PyPI release 2020-03-13 15:56:38 +00:00
Richard Bowman
c240453762 Fix a working version of opencv 2020-03-12 16:02:38 +00:00
Joel Collins
7182e9d5df Updated labthings 2020-03-10 16:02:04 +00:00
Joel Collins
9f4d87dfc4 Updated lockfile 2020-03-10 15:52:24 +00:00
Joel Collins
7235445cf2 Upgraded dependencies and picamera fork 2020-03-01 17:38:31 +00:00
Joel Collins
5264b04be4 Updated and iterated to beta 5 2020-02-18 17:25:39 +00:00
Joel Collins
da0891ef89 Added psutil 2020-02-18 13:41:24 +00:00
Joel Collins
891581846b Updated LabThings 2020-02-18 11:40:50 +00:00
Joel Collins
c1705cf0e8 Updated labthings and marshmallow 2020-02-13 16:37:58 +00:00
jtc42
ede9fcbf2b Updated LabThings 2020-02-07 17:11:38 +00:00
jtc42
2d6ead5f80 Remove PyYAML 2020-02-07 17:05:18 +00:00
Joel Collins
e1e611236d Updated lockfile 2020-01-30 14:37:05 +00:00