girder-worker 5.0.19.dev26__tar.gz → 5.0.19.dev55__tar.gz

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-worker
-Version: 5.0.19.dev26
+Version: 5.0.19.dev55
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.
@@ -21,6 +21,7 @@ Requires-Dist: requests[security]>=2.20.0
 Requires-Dist: setuptools_scm
 Requires-Dist: stevedore
 Requires-Dist: jsonpickle
+Requires-Dist: packaging
 Requires-Dist: docker>=2.6.0
 Dynamic: author
 Dynamic: author-email

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/girder_worker/app.py

@@ -1,7 +1,6 @@
 import os
 import sys
 import traceback as tb
-from distutils.version import LooseVersion
 
 import jsonpickle
 from celery import Celery, __version__
@@ -17,6 +16,7 @@ from girder_worker.utils import (JobSpecNotFound, JobStatus, StateTransitionExce
                                  is_builtin_celery_task, is_revoked)
 from girder_worker.utils.transform import ResultTransform
 from kombu.serialization import register
+from packaging.version import Version
 
 CeleryAppInfo = {'threads_pool': False}
 
@@ -101,7 +101,7 @@ def _capture_celery_pool(sender, **kwargs):
 
 @worker_ready.connect
 def check_celery_version(*args, **kwargs):
-    if LooseVersion(__version__) < LooseVersion('4.0.0'):
+    if Version(__version__) < Version('4.0.0'):
         sys.exit("""You are running Celery {}.
 
 girder-worker requires celery>=4.0.0""".format(__version__))
@@ -221,7 +221,18 @@ def gw_task_revoked(sender=None, request=None, **rest):
             "No jobInfoSpec. Unable to move \'%s\' into CANCELED state.")
 
 
-register('girder_io', jsonpickle.encode, jsonpickle.decode,
+def _girder_io_encode(data):
+    # jsonpickle defaults `keys` to False but plans to default it to True in
+    # jsonpickle 5.0.0.  Pass it explicitly so behavior is stable and no
+    # deprecation warning is emitted.
+    return jsonpickle.encode(data, keys=True)
+
+
+def _girder_io_decode(data):
+    return jsonpickle.decode(data, keys=True)
+
+
+register('girder_io', _girder_io_encode, _girder_io_decode,
          content_type='application/json',
          content_encoding='utf-8')
 

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/girder_worker/docker/tasks/__init__.py

@@ -369,20 +369,25 @@ class DockerTask(Task):
                 daemon=True).start()
 
     def _cleanup_temp_volumes(self, temp_volumes, default_temp_volume):
-        # Set the permission to allow cleanup of temp directories
-        temp_volumes = [v for v in temp_volumes if os.path.exists(v.host_path)]
-        to_chmod = temp_volumes[:]
-        # If our default_temp_volume instance has been transformed then we
-        # know it has been used and we have to clean it up.
-        if default_temp_volume._transformed:
-            to_chmod.append(default_temp_volume)
-            temp_volumes.append(default_temp_volume)
-
-        if len(to_chmod) > 0:
-            utils.chmod_writable([v.host_path for v in to_chmod])
-
-        for v in temp_volumes:
-            shutil.rmtree(v.host_path)
+        # This runs in a daemon thread, so it must never raise; an unhandled
+        # exception here would be reported as an unhandled thread exception.
+        try:
+            # Set the permission to allow cleanup of temp directories
+            temp_volumes = [v for v in temp_volumes if os.path.exists(v.host_path)]
+            to_chmod = temp_volumes[:]
+            # If our default_temp_volume instance has been transformed then we
+            # know it has been used and we have to clean it up.
+            if default_temp_volume._transformed:
+                to_chmod.append(default_temp_volume)
+                temp_volumes.append(default_temp_volume)
+
+            if len(to_chmod) > 0:
+                utils.chmod_writable([v.host_path for v in to_chmod])
+
+            for v in temp_volumes:
+                shutil.rmtree(v.host_path)
+        except Exception:
+            logger.exception('Failed to clean up temporary docker volumes')
 
 
 def _add_environment_kargs(run_kwargs):

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/girder_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-worker
-Version: 5.0.19.dev26
+Version: 5.0.19.dev55
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.
@@ -21,6 +21,7 @@ Requires-Dist: requests[security]>=2.20.0
 Requires-Dist: setuptools_scm
 Requires-Dist: stevedore
 Requires-Dist: jsonpickle
+Requires-Dist: packaging
 Requires-Dist: docker>=2.6.0
 Dynamic: author
 Dynamic: author-email

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/girder_worker.egg-info/requires.txt

@@ -8,4 +8,5 @@ requests[security]>=2.20.0
 setuptools_scm
 stevedore
 jsonpickle
+packaging
 docker>=2.6.0

girder_worker-5.0.19.dev55/girder_worker.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.18",
+  "distance": 55,
+  "node": "gd8dc249db5e9f7a334928dbab54598d3613063c1",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-10-07"
+}

{girder_worker-5.0.19.dev26 → girder_worker-5.0.19.dev55}/requirements.in

@@ -8,4 +8,5 @@ requests[security]>=2.20.0
 setuptools_scm
 stevedore
 jsonpickle
+packaging
 docker>=2.6.0

girder_worker-5.0.19.dev26/girder_worker.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.0.18",
-  "distance": 26,
-  "node": "g0394c0b3df2aec1e0fc0c2b9d3ba34964715a9ef",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-10-02"
-}