-
Notifications
You must be signed in to change notification settings - Fork 32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ometa with history #192
ometa with history #192
Conversation
Figure scripts tiff 10000
Split view merged 10109
Fix headers of scripts to match coding standard.
OME-TIFF Big Images 10761
Group thumbs by tag (only show each thumb once)
Fix some minor typos.
Zooming figures export
math.ceil retuns a float and so canvasHeight is a float which causes an error in PIL.
Trying to minimize the information in these files so as to reduce the amount of "drift" that can occur between this repo and possible forks.
Fix Movie_Figure script
…, add except: pass.
Remove MPI EvolBio specific blah and move link to tutorial to bottom.
Bugfixes and py3 updates
Those are gone in #193
No. Only one of #191, #192 (this), or #193 should be merged. If any changes are pushed to one, the others can/should be updated. |
Great, #193 looks nice. #191 is broken (see my comments) but I've fixed those issues in mpievolbio-scicomp#1 which I can then open against this repo. |
just merged mpievolbio-scicomp#1, anything else I can do?
|
@will-moore : shall we close #191 and #192 then? Just let me know if you want me to rebase mpievolbio-scicomp#1 there. |
Closing in favor of #193 |
This is another attempt at #191 but preserving the history. Steps taken:
git filter-repo --to-subdirectory-filter omero/annotation_scripts
git merge --allow-unrelated-histories --no-ff ometa/pre-rename
since applying the individual patches withformat-patch
/am
doesn't work with merge commits sadly.Note: this is likely something that we should make easier in the future.
cc: @will-moore @CFGrote @sbesson