Skip to content

py3 (and other) fixes for pymeacquire web ui#799

Merged
David-Baddeley merged 13 commits into
python-microscopy:masterfrom
David-Baddeley:webui_py3
Mar 25, 2021
Merged

py3 (and other) fixes for pymeacquire web ui#799
David-Baddeley merged 13 commits into
python-microscopy:masterfrom
David-Baddeley:webui_py3

Conversation

@David-Baddeley
Copy link
Copy Markdown
Contributor

Bring PYMEAcquire webui up to date with Py3 and more recent jupyter, various other fixes/improvements to webui.

@David-Baddeley
Copy link
Copy Markdown
Contributor Author

Note these changes are not strictly backwards compatible, but as the webui is strictly alpha, that probably doesn't matter.

@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 24, 2021

Codecov Report

Merging #799 (96016c0) into master (b0e1830) will decrease coverage by 0.00%.
The diff coverage is 1.43%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #799      +/-   ##
==========================================
- Coverage   11.29%   11.28%   -0.01%     
==========================================
  Files         626      626              
  Lines       72083    72180      +97     
==========================================
+ Hits         8142     8147       +5     
- Misses      63941    64033      +92     
Impacted Files Coverage Δ
PYME/Acquire/SpoolController.py 0.00% <0.00%> (ø)
PYME/Acquire/acquire_server.py 0.00% <0.00%> (ø)
PYME/Acquire/actions.py 67.16% <0.00%> (ø)
PYME/Acquire/protocol.py 41.37% <0.00%> (-0.29%) ⬇️
PYME/Acquire/stackSettings.py 0.00% <0.00%> (ø)
PYME/Acquire/ui/HDFSpoolFrame.py 0.00% <0.00%> (ø)
PYME/Acquire/ui/actionUI.py 0.00% <0.00%> (ø)
PYME/Acquire/ui/preflight.py 0.00% <0.00%> (ø)
PYME/Acquire/webui/__init__.py 0.00% <ø> (ø)
PYME/Acquire/webui/ipy.py 0.00% <0.00%> (ø)
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b0e1830...96016c0. Read the comment docs.

@David-Baddeley
Copy link
Copy Markdown
Contributor Author

@barentine - this is ready to merge, and should address #902 as well. The one caveat is that it will likely require a change to recipes which queue acquisitions (due to the new parameterisation of SpoolControler.start_spooling() and, as a consequence actions.SpoolSeries). Holding off until you've given it a glance.

Main change is that start_spooling() and SpoolSeries now take all the series settings in a settings dict rather than as individual parameters. Rationale behind this is to permit them to be passed in the body of a REST request, and as a consequence support non-string typed parameters. Changing recipes should be pretty simple.

@barentine
Copy link
Copy Markdown
Member

Cool, thanks for pushing on this @David-Baddeley and for flagging me to change my recipes. I'd say go ahead and merge - I'll keep you posted if I run into anything.

I notice you dropped the subdirectory and extra_metadata docstrings. Not sure if this was intentional - I know you aren't a big fan of either of them, but I think it's generally more helpful if you write that you don't like it but leave the doc, otherwise we just end up with more undocumented functionality to break or duplicate later

@David-Baddeley
Copy link
Copy Markdown
Contributor Author

The doc changes were not intentional - likely a result of having initially not included them in the unifiedsettings parameter.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants