diff --git a/setup.py b/setup.py index f73b48d..42daa33 100644 --- a/setup.py +++ b/setup.py @@ -59,9 +59,8 @@ def read(fname): install_requires=[ 'PyYAML', 'omero-py>=5.6.0', - 'future' ], - python_requires='>=3', + python_requires='>=3.8', url='%s' % url, zip_safe=False, download_url='%s/v%s.tar.gz' % (url, version), diff --git a/src/omero_cli_render.py b/src/omero_cli_render.py index 97fc493..73d79b6 100755 --- a/src/omero_cli_render.py +++ b/src/omero_cli_render.py @@ -18,11 +18,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import print_function -from past.builtins import long -from builtins import str -from builtins import range -from builtins import object import sys import time import json @@ -783,7 +778,7 @@ def test_per_image(self, client, img, force, thumb): pixid = img.getPrimaryPixels().id try: - rps.setPixelsId(long(pixid), False, fail) + rps.setPixelsId(int(pixid), False, fail) msg = "ok:" except Exception as e: error = e @@ -793,7 +788,7 @@ def test_per_image(self, client, img, force, thumb): rps.close() else: try: - rps.setPixelsId(long(pixid), False, make) + rps.setPixelsId(int(pixid), False, make) msg = "fill:" except KeyboardInterrupt: msg = "cancel:" diff --git a/test/integration/clitest/test_render.py b/test/integration/clitest/test_render.py index 987bce5..a0f0b0c 100644 --- a/test/integration/clitest/test_render.py +++ b/test/integration/clitest/test_render.py @@ -19,10 +19,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from __future__ import division -from builtins import str -from builtins import range -from past.utils import old_div import json import pytest @@ -205,7 +201,7 @@ def assert_target_rdef(self, target, rdef): assert img.getDefaultZ() == rdef.get('z') - 1 else: # If not set, default Z plane is the middle one - assert img.getDefaultZ() == (int)(old_div(img.getSizeZ(), 2)) + assert img.getDefaultZ() == (int)(img.getSizeZ() // 2) def assert_channel_rdef(self, channel, rdef, version=2): assert channel.getLabel() == rdef['label']