Merge pull request #84 from jburel/py3

Py3

.omeroci/bump-version

@@ -10,25 +10,26 @@ from datetime import date
 desc_file = join(dirname(__file__), pardir, "DESCRIPTION")
 pom_file = join(dirname(__file__), pardir, "pom.xml")
 
+
 def processDesc(version, omeroversion):
     today = date.today()
     try:
         f = input(files=(desc_file), inplace=1)
         for line in f:
             if line.startswith("Date:"):
-                print "Date: %s" % today
+                print("Date: %s" % today)
             elif line.startswith("Version:") \
                     and version is not None:
-                print "Version: %s" % version
+                print("Version: %s" % version)
             elif line.startswith("OMERO_Version:") \
                     and omeroversion is not None:
-                print "OMERO_Version: %s" % omeroversion
+                print("OMERO_Version: %s" % omeroversion)
             else:
-		print line,
-
+                print(line,)
     finally:
         f.close()
 
+
 def processPom(version, omeroversion):
     inVersion = False
     inOmeroVersion = False
@@ -37,31 +38,31 @@ def processPom(version, omeroversion):
         for line in f:
             if inVersion and version is not None\
                     and "version" in line:
-                print "    <version>%s</version>" % version
+                print("    <version>%s</version>" % version)
                 inVersion = False
             elif inOmeroVersion and omeroversion is not None\
                     and "version" in line:
-                print "        <version>%s</version>" % omeroversion
+                print("        <version>%s</version>" % omeroversion)
                 inOmeroVersion = False
             elif "pom-omero-client" in line:
                 inOmeroVersion = True
-                print line,
+                print(line,)
             elif "romero-gateway" in line:
                 inVersion = True
-                print line,
+                print(line,)
             else:
-		print line,
-
+                print(line,)
     finally:
         f.close()
 
+
 if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument("-v", nargs='?')
     parser.add_argument("-o", nargs='?')
     args = parser.parse_args()
     if args.v is None and args.o is None:
         print("Usage: ./bumpversion [-v VERSION] [-o OMERO_VERSION]")
-    else: 
+    else:
         processDesc(args.v, args.o)
         processPom(args.v, args.o)

.travis.yml

@@ -1,12 +1,12 @@
 env:
-  - OMERO_SERVER_VERSION=5.5
+  - OMERO_SERVER_VERSION=5.6
 
 sudo: required
 
 language: python
 
 python:
-  - "2.7"
+  - "3.6"
 
 services:
   - docker

CHANGELOG.md

@@ -1,10 +1,21 @@
+0.4.8 (January 2020)
+--------------------
+
+- updated to OMERO 5.6
+- attachDataframe method supports setting the namespace
+- OMERO_LIBS_DOWNLOAD environment variable can be used to specify
+  a custom URL from where to download the OMERO Java libs
+- OMEROServer supports the 'sudo' functionality
+
 0.4.7 (June 2019)
 -----------------
+
 - updated to OMERO 5.5
 - preserved backward compatibility to OMERO 5.4
 
 0.4.6 (June 2019)
 -----------------
+
 - fixed bug in Image.getPixelValues() method which returned
   distorted array of pixel values for images with non-square
   dimensions (PR #66)

DESCRIPTION

@@ -1,11 +1,11 @@
 Package: romero.gateway
 Type: Package
-Version: 0.4.7
-Date: 2019-06-25
+Version: 0.4.8
+Date: 2020-01-22
 Title: OMERO R Gateway
 Description: R Wrapper around the OMERO Java Gateway, which
   enables access to an OMERO server within R.
-  Supported OMERO version: 5.5 .
+  Supported OMERO version: 5.6 .
 Maintainer: Dominik Lindner <d.lindner@dundee.ac.uk>
 Authors@R: c(person("Dominik", "Lindner", role = c("aut", "cre", "ctb"),
                  email = "d.lindner@dundee.ac.uk"),

README.md

@@ -26,8 +26,9 @@ Download the latest romero.gateway version which is compatible with your OMERO s
 
 OMERO version | romero.gateway version
 --- | --- 
+5.6, 5.5 | 0.4.8
 5.5 | 0.4.7
-5.4 | all
+5.4 | <= 0.4.7
 
 ### Windows