Update the dockerfile to use newer versions

Update minimum python version to 3.8.

Author: manthey

.circleci/config.yml

@@ -71,10 +71,10 @@ jobs:
     working_directory: /home/circleci/project
     steps:
       - run:
-          name: Set up Python 3.6
+          name: Set up Python 3.8
           command: |
-             pyenv install 3.6.3 || true
-             pyenv global 3.6.3
+             pyenv install 3.8 || true
+             pyenv global 3.8
 
       - *ssh-keys
       - checkout
@@ -87,33 +87,33 @@ jobs:
 
   unit_tests:
     docker:
-      - image: cimg/python:3.6
+      - image: cimg/python:3.8
     steps:
       - checkout
       - *virtual-env
       - *update-pip
       - *ci-deps
       - run:
           name: Run unit tests
-          command: tox -e py36
+          command: tox -e py38
       - *upload-coverage
 
-  unit_tests_310:
+  unit_tests_311:
     docker:
-      - image: cimg/python:3.10
+      - image: cimg/python:3.11
     steps:
       - checkout
       - *virtual-env
       - *update-pip
       - *ci-deps
       - run:
           name: Run unit tests
-          command: tox -e py310
+          command: tox -e py311
       - *upload-coverage
 
   lint:
     docker:
-      - image: cimg/python:3.6
+      - image: cimg/python:3.8
     steps:
       - checkout
       - *virtual-env
@@ -125,7 +125,7 @@ jobs:
 
   release:
     docker:
-      - image: cimg/python:3.6
+      - image: cimg/python:3.8
     steps:
       - checkout
       - *virtual-env
@@ -163,7 +163,7 @@ workflows:
           filters:
             tags:
               only: /^v.*/
-      - unit_tests_310:
+      - unit_tests_311:
           filters:
             tags:
               only: /^v.*/

CMakeLists.txt

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic as base
+FROM ubuntu:22.04 as base
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qy tzdata && \
   apt-get install -qy software-properties-common python3-software-properties && \
@@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qy tzdata
   libpython3-dev && \
   apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN wget https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3 get-pip.py
+RUN wget https://bootstrap.pypa.io/pip/get-pip.py && python3 get-pip.py
 
 
 FROM base as build
@@ -35,7 +35,7 @@ RUN pip3 install /*.tar.gz
 
 RUN useradd -D --shell=/bin/bash && useradd -m worker
 
-RUN chown -R worker:worker /usr/local/lib/python3.6/dist-packages/girder_worker/
+RUN chown -R worker:worker /usr/local/lib/python3.10/dist-packages/girder_worker/
 
 USER worker
 

Dockerfile

@@ -31,7 +31,7 @@
 logger = log_utils.setupLogger(config)
 
 
-class GirderWorkerPluginABC(object):
+class GirderWorkerPluginABC:
     """
     Abstract base class for Girder Worker plugins. Plugins must descend from this
     class; see the :ref:`plugins` section for more information.

cmake/travis_continuous.cmake

@@ -36,8 +36,6 @@
 import jsonpickle
 from kombu.serialization import register
 
-import six
-
 
 @before_task_publish.connect  # noqa: C901
 def girder_before_task_publish(sender=None, body=None, exchange=None,
@@ -202,7 +200,7 @@ def gw_task_postrun(task=None, sender=None, task_id=None,
         # Release stdout/stderr
         if hasattr(task, 'job_manager') and \
            hasattr(task.job_manager, 'cleanup') and \
-           six.callable(task.job_manager.cleanup):
+           callable(task.job_manager.cleanup):
             task.job_manager.cleanup()
 
 

girder_worker/__init__.py

@@ -1,5 +1,5 @@
 import os
-from six.moves import configparser
+import configparser
 import girder_worker
 
 accept_content = ['json', 'pickle', 'yaml', 'girder_io']

girder_worker/app.py

@@ -63,10 +63,10 @@ def create_task_job(job_defaults, sender=None, body=None,
                 headers['jobInfoSpec'] = response.json().get('jobInfoSpec')
                 return response.json()
         except requests.exceptions.RequestException as e:
-            logger.warn('Failed to post job: {}'.format(e))
+            logger.warn(f'Failed to post job: {e}')
 
     except MissingJobArguments as e:
-        logger.warn('Girder job not created: {}'.format(str(e)))
+        logger.warn(f'Girder job not created: {str(e)}')
 
 
 def attach_girder_api_url(sender=None, body=None, exchange=None,
@@ -83,7 +83,7 @@ def attach_girder_api_url(sender=None, body=None, exchange=None,
                 "Parent task's request does not contain girder_api_url")
         headers['girder_api_url'] = parent_task.request.girder_api_url
     except MissingJobArguments as e:
-        logger.warn('Could not get girder_api_url from parent task: {}'.format(str(e)))
+        logger.warn(f'Could not get girder_api_url from parent task: {str(e)}')
 
 
 def attach_girder_client_token(sender=None, body=None, exchange=None,
@@ -101,7 +101,7 @@ def attach_girder_client_token(sender=None, body=None, exchange=None,
 
         headers['girder_client_token'] = parent_task.request.girder_client_token
     except MissingJobArguments as e:
-        logger.warn('Could not get token from parent task: {}'.format(str(e)))
+        logger.warn(f'Could not get token from parent task: {str(e)}')
 
 
 def get_async_result_job_property(async_result):

girder_worker/celeryconfig.py

@@ -2,14 +2,13 @@
 import errno
 import stat
 import abc
+import urllib
 import ssl
 import sys
-import six
-from six.moves import http_client as httplib, urllib
+from http import client as httplib
 
 
-@six.add_metaclass(abc.ABCMeta)
-class FDStreamConnector(object):
+class FDStreamConnector(metaclass=abc.ABCMeta):
     """
     FDStreamConnector is an abstract base class used to connect a read(input) and write(output)
     stream.
@@ -149,8 +148,7 @@ def close(self):
         self.output.close()
 
 
-@six.add_metaclass(abc.ABCMeta)
-class StreamReader(object):
+class StreamReader(metaclass=abc.ABCMeta):
     """
     This represents the interface that must be implemented by a stream reader.
     """
@@ -171,8 +169,7 @@ def close(self):
         pass
 
 
-@six.add_metaclass(abc.ABCMeta)
-class StreamWriter(object):
+class StreamWriter(metaclass=abc.ABCMeta):
     """
     This represents the interface that must be implemented by a stream writer.
     """
@@ -239,7 +236,7 @@ def close(self):
         self._stream.flush()
 
 
-class NamedPipe(object):
+class NamedPipe:
     """
     A named pipe.
     """
@@ -271,7 +268,7 @@ class NamedPipeReader(FileDescriptorReader):
     Reader to read from a named pipe.
     """
     def __init__(self, pipe, container_path=None):
-        super(NamedPipeReader, self).__init__(None)
+        super().__init__(None)
         self._pipe = pipe
         self._container_path = container_path
 
@@ -294,7 +291,7 @@ class NamedPipeWriter(FileDescriptorWriter):
     Write to write to a named pipe.
     """
     def __init__(self, pipe, container_path=None):
-        super(NamedPipeWriter, self).__init__(None)
+        super().__init__(None)
         self._pipe = pipe
         self._container_path = container_path
 

girder_worker/context/nongirder_context.py

@@ -1,5 +1,3 @@
-import six
-
 from . import StreamReader
 
 
@@ -12,7 +10,7 @@ def __init__(self, client, file_id):
         :param client: The GirderClient instance to use.
         :type client: girder_client.GirderClient
         """
-        super(GirderFileStreamReader, self).__init__()
+        super().__init__()
         self._client = client
         self._file_id = file_id
         self._iter = None
@@ -28,6 +26,6 @@ def read(self, buf_len):
             self._iter = self._client.downloadFileAsIterator(self._file_id, buf_len)
 
         try:
-            return six.next(self._iter)
+            return next(self._iter)
         except StopIteration:
             return b''

girder_worker/docker/io/__init__.py

@@ -2,7 +2,7 @@
 import json
 
 
-class StreamPushAdapter(object):
+class StreamPushAdapter:
     """
     This represents the interface that must be implemented by push adapters for
     IO modes that want to implement streaming output.
@@ -31,7 +31,7 @@ class JobProgressAdapter(StreamPushAdapter):
     """
 
     def __init__(self, job_manager):
-        super(JobProgressAdapter, self).__init__()
+        super().__init__()
 
         self.job_manager = job_manager
         self._buf = b''

girder_worker/docker/io/girder.py

@@ -288,7 +288,7 @@ def _maybe_path(arg):
 
 class _RequestDefaultTemporaryVolume(_TemporaryVolumeBase):
     def __init__(self):
-        super(_RequestDefaultTemporaryVolume, self).__init__(None, None)
+        super().__init__(None, None)
         self._make_paths()
 
     def transform(self, **kwargs):
@@ -298,11 +298,11 @@ def transform(self, **kwargs):
 class DockerTask(Task):
 
     def _maybe_transform_argument(self, arg):
-        return super(DockerTask, self)._maybe_transform_argument(
+        return super()._maybe_transform_argument(
             arg, task=self, _default_temp_volume=self.request._default_temp_volume)
 
     def _maybe_transform_result(self, idx, result):
-        return super(DockerTask, self)._maybe_transform_result(
+        return super()._maybe_transform_result(
             idx, result, _default_temp_volume=self.request._default_temp_volume)
 
     def __call__(self, *args, **kwargs):
@@ -336,7 +336,7 @@ def _json(volume):
 
         volumes.update(default_temp_volume._repr_json_())
 
-        super(DockerTask, self).__call__(*args, **kwargs)
+        super().__call__(*args, **kwargs)
         threading.Thread(
             target=self._cleanup_temp_volumes,
             args=(temp_volumes, default_temp_volume),