Commit graph

202 commits

Author SHA1 Message Date
Joel Collins
b71df382b0 2.2.2 2020-06-25 18:42:37 +01:00
Joel Collins
3a5f23ee4a Updated LabThings to 0.6.7 2020-06-25 16:00:20 +01:00
Joel Collins
1e3d62ea26 Iterated to 2.2.1 2020-06-24 16:16:20 +00:00
Joel Collins
176367cd7d Iterated version to 2.2.0 2020-06-24 11:41:48 +01:00
Joel Collins
8d04359a2f Updated LabThings to 0.6.6 2020-06-24 10:00:53 +01: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
698f1a5938 Switched to Sangaboard PyPI distribution and updated version number 2020-06-04 13:48:33 +01:00
Joel Collins
fc7eee4a8d Updated version number 2020-05-28 13:13:20 +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
db50e42380 Updated version to 2.1.0 stable 2020-05-26 14:55:30 +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
ebdc463f49 Updated version 2020-05-18 10:49:53 +01:00
Joel Collins
7655b23a5a Fixed dependencies 2020-05-16 21:39:20 +01:00
Joel Collins
58e456a33b Added explicit packages 2020-05-16 20:52:32 +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
d7ca8f8ae1 Set up eV submodule 2020-05-15 14:57:03 +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
6d9314e0c9 Merge branch 'master' into 'capture-manager'
# Conflicts:
#   poetry.lock
#   pyproject.toml
2020-05-04 09:30:03 +00:00
Joel Collins
ef6f428a84 Updated dependencies 2020-04-30 17:46:59 +01:00
Joel Collins
9ff24e8e37 Added updated opencv-python-headless for Py38 installations 2020-04-28 13:36:53 +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
6f4791ec57 Merge branch 'master' into 'hotfix-2.0.x'
# Conflicts:
#   openflexure_microscope/api/app.py
#   poetry.lock
#   pyproject.toml
2020-03-31 10:10:33 +00:00
Joel Collins
63e19916be Updated dependencies and version 2020-03-31 11:01:13 +01:00
Richard Bowman
2c9e443d5d moved to a working version of opencv 2020-03-27 16:10:35 +00:00
Richard Bowman
2847fa9ab5 Merge branch 'master-versionbump' into stage-calibration 2020-03-26 16:19:19 +00:00
Richard Bowman
543a6ff9b3 version bump 2020-03-26 16:16:25 +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
2b33c7fd86 Iterated to beta 6 2020-03-03 16:51:25 +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