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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3871a5
Rename tools/test_setup.py to OmeroPy/src/omero_setup.py
joshmoore Nov 27, 2017
a1018e7
omero_setup: Add src to end of PYTHONPATH
joshmoore Nov 27, 2017
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
4 changes: 2 additions & 2 deletions components/tools/OmeroFS/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions components/tools/OmeroPy/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 components/tools/test_setup.py → components/tools/OmeroPy/src/omero_setup.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions components/tools/OmeroWeb/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down