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

Try omero_ext.path first #6180

Merged
merged 1 commit into from
Nov 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion components/tools/OmeroFS/test/drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
import omero.all
import omero.grid.monitors as monitors

from path import path
try:
from omero_ext.path import path
except ImportError:
# Python 2
from path import path
from omero.util import ServerContext
from mox3 import mox
from functools import wraps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
from omero.testlib.cli import RootCLITest
import omero.plugins.admin
from omero.cli import NonZeroReturnCode
from path import path
try:
from omero_ext.path import path
except ImportError:
# Python 2
from path import path
from omero.util.upgrade_check import UpgradeCheck

OMERODIR = os.getenv('OMERODIR', None)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
from future.utils import native_str
from builtins import str
from builtins import range
import path
try:
from omero_ext.path import path
except ImportError:
# Python 2
from path import path
import omero
import omero.tables
from omero.testlib import ITest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
import omero
import omero.gateway

from path import path
try:
from omero_ext.path import path
except ImportError:
# Python 2
from path import path
from omero.testlib import AbstractRepoTest


Expand Down