Merge pull request #5585 from joshmoore/test_omero_setup

Rename tools/test_setup.py to OmeroPy/src/omero_setup.py
ome · Nov 28, 2017 · 8b8be4e · 8b8be4e
2 parents 3a9deda + a1018e7
commit 8b8be4e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/components/tools/OmeroFS/setup.py b/components/tools/OmeroFS/setup.py
@@ -14,8 +14,8 @@
     if tools.find(".".join(map(str, sys.version_info[0:2]))) > 0:
         sys.path.insert(0, os.path.abspath(tools))
 
-sys.path.append("..")
-from test_setup import PyTest
+sys.path.append("../OmeroPy/src")
+from omero_setup import PyTest
 
 from ez_setup import use_setuptools
 use_setuptools(to_dir='../../../lib/repository')

diff --git a/components/tools/OmeroPy/setup.py b/components/tools/OmeroPy/setup.py
@@ -35,8 +35,8 @@
 import sys
 import os
 
-sys.path.append("..")
-from test_setup import PyTest
+sys.path.append("src")
+from omero_setup import PyTest
 
 for tools in glob.glob("../../../lib/repository/setuptools*.egg"):
     if tools.find(".".join(map(str, sys.version_info[0:2]))) > 0:

diff --git a/components/tools/test_setup.py → components/tools/OmeroPy/src/omero_setup.py b/components/tools/test_setup.py → components/tools/OmeroPy/src/omero_setup.py
diff --git a/components/tools/OmeroWeb/setup.py b/components/tools/OmeroWeb/setup.py
@@ -10,8 +10,8 @@
 import sys
 import os
 
-sys.path.append("..")
-from test_setup import PyTest
+sys.path.append("../OmeroPy/src")
+from omero_setup import PyTest
 
 for tools in glob.glob("../../../lib/repository/setuptools*.egg"):
     if tools.find(".".join(map(str, sys.version_info[0:2]))) > 0: