Skip to content
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

Windows import fix #326

Merged
merged 4 commits into from
May 24, 2022
Merged

Windows import fix #326

merged 4 commits into from
May 24, 2022

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented May 19, 2022

See https://forum.image.sc/t/omero-cli-on-windows-for-image-import/67248 for a description of the issue

As suggested by @manics, zipfile.Zipfile uses / as the path separator agnosticly of the underlying platform.
1d99f7e updates the code accordingly and should fix the JAR fetching and hence the import on Windows systems.

Incidentally, this fix seems to be sufficient to re-enable all CLI import tests on Windows with an extra commit sanitizing the stderr output for the assert comparisons.

Proposed tag: 5.11.2

@imagesc-bot
Copy link

This pull request has been mentioned on Image.sc Forum. There might be relevant details there:

https://forum.image.sc/t/omero-cli-on-windows-for-image-import/67248/3

@joshmoore
Copy link
Member

Assuming the daily integrations builds are green, "Hurrah!" 🎉

@sbesson
Copy link
Member Author

sbesson commented May 21, 2022

Recent runs of the OMERO integration test suite remained green with this included -see https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-test-integration/1109/.
@CamachoDejay's comment in https://forum.image.sc/t/omero-cli-on-windows-for-image-import/67248/4 suggests this change suffices to make omero import functional again on Windows. Capacity allowing, it might be useful if someone from the @ome/dundee team could confirm this on a working Windows environment.

@dominikl
Copy link
Member

I'll give it a try. Would be great if that works!

@sbesson sbesson requested a review from dominikl May 23, 2022 07:50
@dominikl
Copy link
Member

Works 👍

(base) C:\Users\User\Downloads>omero version
OMERO.py version:
5.11.2.dev0

(base) C:\Users\User\Downloads>omero import -T Dataset:83197 cat.jpg
Using OMERO.java-5.6.4-ice36-b232
...
2022-05-23 05:22:56,202 12446      [l.Client-1] INFO   ormats.importer.cli.LoggingImportMonitor - IMPORT_DONE Imported file: C:\Users\User\Downloads\cat.jpg
Image:4519355
Other imported objects:
Fileset:446551

==> Summary
1 file uploaded, 1 fileset created, 1 image imported, 0 errors in 0:00:07.623

@sbesson sbesson merged commit 563841c into ome:master May 24, 2022
@sbesson sbesson deleted the win_import branch May 24, 2022 08:15
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.

4 participants