Py2 #2
Merged
Py2 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Currently testing via: Edit: Please see https://github.com/ome/omero-web-docker/pull/33/files#diff-3254677a7917c6c01f55212f86c57fbf now. |
Use OMERODIR if OMERO_HOME not set
|
Re-opening to activate travis. |
|
And again... |
|
Propose to get this merged and released as |
|
Tested locally with: Web running fine, without needing to set |
|
Thanks, @will-moore. Getting this out as |
manics
added a commit
to manics-archive/omero-web
that referenced
this pull request
Nov 11, 2019
$ curl -sSL https://patch-diff.githubusercontent.com/raw/ome/openmicroscopy/pull/5994.diff | sed -e 's%/components/tools/OmeroPy/%/%g' -e 's%/components/tools/OmeroWeb/%/%g' -e 's%etc/templates/web/%omeroweb/templates/%g' -e 's%/test/unit/clitest/%/test/unit/%g' -e 's%/src/%/%g' | git apply --reject Checking patch omero/plugins/web.py... error: while searching for: import traceback from datetime import datetime from omero.cli import DiagnosticsControl from omero.cli import CLI import platform error: patch failed: omero/plugins/web.py:10 Hunk ome#2 succeeded at 276 (offset 1 line). error: while searching for: "Web template configuration requires" "wsgi or wsgi-tcp.") template_file = "%s.conf.template" % server c = file(self._get_web_templates_dir() / template_file).read() self.ctx.out(c % d) def syncmedia(self, args): self.collectstatic() error: patch failed: omero/plugins/web.py:301 Checking patch test/unit/reference_templates/nginx-development-withoptions.conf... Checking patch test/unit/reference_templates/nginx-development.conf... Checking patch test/unit/reference_templates/nginx-location-withoptions.conf... Checking patch test/unit/reference_templates/nginx-location.conf... Checking patch test/unit/reference_templates/nginx-withoptions.conf... Checking patch test/unit/reference_templates/nginx.conf... Checking patch omeroweb/templates/nginx-development.conf.template... Checking patch omeroweb/templates/nginx-location.conf.template... Checking patch omeroweb/templates/nginx.conf.j2... Checking patch omeroweb/templates/nginx.conf.template... Applying patch omero/plugins/web.py with 2 rejects... Rejected hunk ome#1. Hunk ome#2 applied cleanly. Rejected hunk ome#3. Applied patch test/unit/reference_templates/nginx-development-withoptions.conf cleanly. Applied patch test/unit/reference_templates/nginx-development.conf cleanly. Applied patch test/unit/reference_templates/nginx-location-withoptions.conf cleanly. Applied patch test/unit/reference_templates/nginx-location.conf cleanly. Applied patch test/unit/reference_templates/nginx-withoptions.conf cleanly. Applied patch test/unit/reference_templates/nginx.conf cleanly. Applied patch omeroweb/templates/nginx-development.conf.template cleanly. Applied patch omeroweb/templates/nginx-location.conf.template cleanly. Applied patch omeroweb/templates/nginx.conf.j2 cleanly. Applied patch omeroweb/templates/nginx.conf.template cleanly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following the style of ome/omero-py#1, this PR looks to make this extracted ome/openmicroscopy:components/tools/OmeroWeb directory pip-installable with Python 2.7 before work starts on upgrading to Python 3. From there, the main directory will be removed from ome/openmicroscopy and all development should occur on this repo.
An extra difficulty is the https://github.com/ome/omero-py/blob/master/src/omero/plugins/web.py script which has hard-coded assumptions about where manage.py lives.
Once OMERO.web is starting, propose to tag and release this to PyPI as 5.5.dev1.
(Replaces gh-1 due to force-push)