Merge pull request #385 from sbesson/python311

Add support for Python 3.11

.github/workflows/workflow.yml

@@ -17,8 +17,9 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
         os:
-          - ubuntu-20.04
+          - ubuntu-22.04
         include:
           - python-version: '3.8'
             os: macos-latest

docs/conf.py

@@ -58,7 +58,7 @@
 autodoc_mock_imports = ["omero", "omero_ext", "past", "future", 
                         "Ice", "IceImport", "Glacier2", "pytest",
                         "appdirs", "IcePy", "omero_version",
-                        "mox3", "IceGrid", "mx", "matplotlib",
+                        "IceGrid", "mx", "matplotlib",
                         "omero_model_FileAnnotationI", 
                         "omero_model_TimestampAnnotationI",
                         "omero_model_BooleanAnnotationI", 

setup.py

@@ -233,7 +233,7 @@ def read(fname):
     ],
     tests_require=[
         'pytest',
-        'mox3',
+        'pytest-mock',
     ],
     cmdclass={
         'devtarget': DevTargetCommand,

src/omero/testlib/cli.py

@@ -29,7 +29,8 @@
 from omero.rtypes import rstring
 
 from omero.testlib import ITest
-from mox3 import mox
+
+import warnings
 
 class AbstractCLITest(ITest):
 
@@ -40,9 +41,16 @@ def setup_class(cls):
         cls.cli.register("sessions", SessionsControl, "TEST")
 
     def setup_mock(self):
+        from mox3 import mox
+        warnings.warn(
+            "The usage of mox3 is deprecated as of OMERO.py 5.17.0",
+            DeprecationWarning)
         self.mox = mox.Mox()
 
     def teardown_mock(self):
+        warnings.warn(
+            "The usage of mox3 is deprecated as of OMERO.py 5.17.0",
+            DeprecationWarning)
         self.mox.UnsetStubs()
         self.mox.VerifyAll()
 

src/omero_ext/path.py

@@ -810,7 +810,7 @@ def text(self, encoding=None, errors='strict'):
         """
         if encoding is None:
             # 8-bit
-            with self.open('U') as f:
+            with self.open('r') as f:
                 return f.read()
         else:
             # Unicode
@@ -934,7 +934,7 @@ def lines(self, encoding=None, errors='strict', retain=True):
         .. seealso:: :meth:`text`
         """
         if encoding is None and retain:
-            with self.open('U') as f:
+            with self.open('r') as f:
                 return f.readlines()
         else:
             return self.text(encoding, errors).splitlines(retain)