Skip to content

Commit

Permalink
Merge branch 'master' into py3_1
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmoore authored Sep 11, 2019
2 parents a5abec8 + e696de1 commit 0ce6166
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ services:
- docker

before_install:
- sudo apt-get install -y openssl
- pip install "zeroc-ice>3.6.4,<3.7" future
- pip install -U pip future
- pip install https://github.com/ome/zeroc-ice-py-manylinux/releases/download/0.0.10/zeroc_ice-3.6.4-cp27-cp27mu-manylinux2010_x86_64.whl
- python -c "import Ice; print Ice.stringVersion()"

script:
Expand Down
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ def get_blitz_location():
copy(fromfile, tofile)


packages = find_packages(where="target")+[""]
packageless = glob.glob("target/*.py")
packageless = [x[7:-3] for x in packageless]
packages = find_packages(where="target")

url = 'https://docs.openmicroscopy.org/latest/omero/developers'

sys.path.append("target")
Expand Down Expand Up @@ -119,6 +122,7 @@ def read(fname):
package_data={
'omero.gateway': ['pilfonts/*'],
'omero.gateway.scripts': ['imgs/*']},
py_modules=packageless,
scripts=glob.glob(os.path.sep.join(["bin", "*"])),
install_requires=[
'zeroc-ice>=3.6.4,<3.7',
Expand Down

0 comments on commit 0ce6166

Please sign in to comment.