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.

Sign up for GitHub

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

Jump to bottom

Rename tools/test_setup.py to OmeroPy/src/omero_setup.py #5585

Merged
merged 2 commits into from
Nov 28, 2017
Merged

Rename tools/test_setup.py to OmeroPy/src/omero_setup.py #5585

merged 2 commits into from
Nov 28, 2017

Conversation

joshmoore
Copy link
Member

So that downstream repositories can make use of the PyTest
class defined here, the module will need to be packaged as
part of lib/python.

What this PR does

Adds omero_setup to the release package. Note: this module was not put under an omero subdirectory since that requires Ice to be available.

Testing this PR

  1. All builds should continue functioning as normally
  2. Additionally, from omero_setup import PyTest should work when OMERO_DIST/lib/python is on the PYTHONPATH

Related reading

@joshmoore
Rename tools/test_setup.py to OmeroPy/src/omero_setup.py
d3871a5 
So that downstream repositories can make use of the PyTest
class defined here, the module will need to be packaged as
part of lib/python.
@joshmoore joshmoore mentioned this pull request Nov 27, 2017
Merged
@joshmoore joshmoore changed the base branch from develop to clisplit November 27, 2017 16:12
@joshmoore
omero_setup: Add src to end of PYTHONPATH
a1018e7 
By adding src to the classpath at the beginning,
modules that were not present under src/, having
been added later under target/, were being shadowed.
@mtbc
Copy link
Member

mtbc commented Nov 28, 2017

merge ... into openmicroscopy:clisplit

All builds should continue functioning as normally

... at which builds ought I be looking? Is there now a devspace?

mtbc
mtbc approved these changes Nov 28, 2017
View reviewed changes
Copy link
Member

@mtbc mtbc left a comment

Choose a reason for hiding this comment

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

based on my local testing

@joshmoore joshmoore merged commit 8b8be4e into ome:clisplit Nov 28, 2017
@joshmoore joshmoore deleted the test_omero_setup branch November 28, 2017 14:56
@joshmoore joshmoore mentioned this pull request Dec 1, 2017
Open
6 tasks
@joshmoore joshmoore added this to the 5.4.2 milestone Jan 16, 2018
@joshmoore joshmoore mentioned this pull request Jan 16, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtbc mtbc mtbc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.4.2
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@joshmoore @mtbc