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

Change formulation (remove "section"), change import link to upload link #54

Merged
merged 2 commits into from
Dec 4, 2020

Conversation

pwalczysko
Copy link
Member

See #47 for motivation.

Suggesting here to point in "General concepts" to the whole upload chapter, instead of pointing directly to "import" sub-chapter, which was bypassing the metadata upload walkthrough.

@pwalczysko pwalczysko mentioned this pull request Dec 3, 2020
@@ -1,11 +1,11 @@
General concepts
================

In this section we introduce general concepts about OMERO: data import, management, annotation, search, etc..
Here we introduce general concepts about OMERO: data import, management, annotation, search, etc..
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc. (extra dot)

@joshmoore
Copy link
Member

Screen Shot 2020-12-04 at 13 23 10

Top-level now points to top-level of upload 👍

As a side note, I have several warnings building locally:

/opt/own-guides/omero-guides/example.rst:54: WARNING: Problem with "end-before" option of "include" directive:
Text not found.
upload/docs/import-cli.rst:45: WARNING: download file not readable: /opt/own-guides/scripts/bulk.yml
/opt/own-guides/omero-guides/iviewer/docs/iviewer_rois.rst:133: WARNING: image file not readable: iviewer/docs/images/Iviewer16.png
/opt/own-guides/omero-guides/iviewer/docs/iviewer_rois.rst:136: WARNING: image file not readable: iviewer/docs/images/Iviewer17.png
/opt/own-guides/omero-guides/upload/docs/import-cli.rst:24: WARNING: duplicate label resources, other instance in /opt/own-guides/omero-guides/example_facility_manager.rst
looking for now-outdated files... none found
pickling environment... done
checking consistency... done
preparing documents... done
writing output... [100%] write_guide
generating indices... genindex done
writing additional pages... search done
copying images... [100%] upload/docs/images/metadata9.png
WARNING: cannot copy downloadable file '/opt/own-guides/omero-guides/figure/docs/../scripts/': [Errno 21] Is a directory: '/opt/own-guides/omero-guides/figure/docs/../scripts/'
copying downloadable files... [100%] upload/scripts/four-images.csv

but I don't see any relationship to this PR. Happy to see this merged. (Eventually I could imagine having some icons or maybe a workflow graphic at the top of the page.)

@pwalczysko
Copy link
Member Author

pwalczysko commented Dec 4, 2020

#55 created for the icons.

The warnings are indeed always there - they somehow come from the submodules, and in the reasult on readthedocs there are no errors detectable corresponding to those warnings.

Thank you @joshmoore

@pwalczysko pwalczysko merged commit 30992d7 into ome:master Dec 4, 2020
@pwalczysko pwalczysko deleted the visualize-upload branch December 4, 2020 13:06
@joshmoore
Copy link
Member

joshmoore commented Dec 4, 2020

I don't think the warnings are just a matter of the submodules, or perhaps they are but they should be fixed anyway. Migrated to #56

@joshmoore joshmoore mentioned this pull request Dec 4, 2020
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