Merge pull request #6 from joshmoore/5_5_1_ga

5.5.dev2 with Ice deployment

.gitignore

@@ -2,3 +2,5 @@
 *.pyc
 var
 build
+dist/
+target/

.travis.yml

@@ -5,11 +5,15 @@ language: python
 python:
   - "2.7"
 
-services:
-  - docker
+before_install:
+  - 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:
-  - docker build -t omero-py .
+  - python setup.py sdist
+  - pip install dist/omero-py*gz
+  - python -c "import omero_version; print omero_version.omero_version"
+  - omero version
 
 deploy:
   provider: pypi

README.rst

@@ -0,0 +1,55 @@
+OMERO.py
+========
+
+Introduction
+------------
+
+OMERO.py provides Python bindings to the OMERO.blitz server
+as well as a pluggable command-line interface.
+
+Dependencies
+------------
+
+Direct dependencies of OMERO.py are:
+
+- `ZeroC IcePy`_
+
+Installation
+------------
+
+See: `OMERO`_ documentation
+
+Usage
+-----
+
+See: `OMERO`_ documentation
+
+Contributing
+------------
+
+See: `OMERO`_ documentation
+
+Running tests
+-------------
+
+Unit tests are located under the `test` directory and can be run with pytest.
+
+Integration tests
+^^^^^^^^^^^^^^^^^
+
+Integration tests are stored in the main repository (ome/openmicroscopy) and depend on the
+OMERO integration testing framework. Reading about `Running and writing tests`_ in the `OMERO`_ documentation
+is essential.
+
+License
+-------
+
+OMERO.py is released under the GPL v2.
+
+Copyright
+---------
+
+2009-2019, The Open Microscopy Environment, Glencoe Software, Inc.
+
+.. _ZeroC IcePy: https://zeroc.com/
+.. _Running and writing tests: https://docs.openmicroscopy.org/latest/omero/developers/testing.html

setup.py

@@ -1,34 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-   setuptools entry point
+   Copyright 2008-2019 The Open Microscopy Environment, Glencoe Software, Inc.
+   All rights reserved.
 
-   Tests run by default using the OmeroPy/dist egg as the omero python lib but
-   you can override that by using the --test-pythonpath flag to ./setup.py
-   test.
-
-   For testing that require a running Omero server, the ice.config file must
-   exist and hold the proper configuration either at the same directory as
-   this file or in some place pointed to by the --test-ice-config flag to
-   ./setup.py test.
-
-   For example:
-
-      # this will run all tests under OmeroPy/test/
-      ./setup.py test
-       # run all tests under OmeroPy/test/gatewaytest
-      ./setup.py test -s test/gatewaytest
-      # run all tests that include TopLevelObjects in the name
-      ./setup.py test -k TopLevelObjects
-      # exit on first failure
-      ./setup.py test -x
-      # drop to the pdb debugger on failure
-      ./setup.py test --pdb
-
-
-   Copyright 2007-2016 Glencoe Software, Inc. All rights reserved.
    Use is subject to license terms supplied in LICENSE.txt
-
 """
 
 import glob
@@ -43,7 +19,7 @@
 from urllib import urlopen
 from zipfile import ZipFile
 
-blitz_zip = "https://artifacts.openmicroscopy.org/artifactory/ome.releases/org/openmicroscopy/omero-blitz/5.5.3/omero-blitz-5.5.3-python.zip"
+blitz_zip = "https://artifacts.openmicroscopy.org/artifactory/ome.releases/org/openmicroscopy/omero-blitz/5.5.3/omero-blitz-5.5.3-python.zip"  # noqa
 blitz_md5 = "cf9c0cd4b2e499fc3b4b8be8c58ab6cb"
 
 if not os.path.exists("target"):
@@ -68,23 +44,45 @@
 url = 'https://docs.openmicroscopy.org/latest/omero/developers'
 
 sys.path.append("target")
-from omero_setup import PyTest
-from omero_version import omero_version as ov
+from omero_version import omero_version as ov  # noqa
+
+
+def read(fname):
+    """
+    Utility function to read the README file.
+    :rtype : String
+    """
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
 
 setup(
     name="omero-py",
     version=ov,
     description="Python bindings to the OMERO.blitz server",
-    long_description="Python bindings to the OMERO.blitz server.",
+    long_description=read("README.rst"),
+    classifiers=[
+      'Development Status :: 5 - Production/Stable',
+      'Intended Audience :: Developers',
+      'Intended Audience :: Science/Research',
+      'Intended Audience :: System Administrators',
+      'License :: OSI Approved :: GNU General Public License v2 '
+      'or later (GPLv2+)',
+      'Natural Language :: English',
+      'Operating System :: OS Independent',
+      'Programming Language :: Python :: 2',
+      'Topic :: Software Development :: Libraries :: Python Modules',
+    ],  # Get strings from
+        # http://pypi.python.org/pypi?%3Aaction=list_classifiers
     author="The Open Microscopy Team",
     author_email="ome-devel@lists.openmicroscopy.org.uk",
     url=url,
-    download_url=url,
     package_dir={"": "target/"},
     packages=packages,
     package_data={
         'omero.gateway': ['pilfonts/*'],
         'omero.gateway.scripts': ['imgs/*']},
-    cmdclass={'test': PyTest},
     scripts=glob.glob(os.path.sep.join(["bin", "*"])),
+    install_requires=[
+        'zeroc-ice>=3.6.4,<3.7',
+    ],
     tests_require=['pytest<3'])

src/omero_version.py

@@ -1,3 +1,3 @@
-omero_version = "5.5.dev1"
+omero_version = "5.5.dev2"
 ice_compatibility = "3.6.4"
 build_year = "2019"