girder-worker 0.10.3.dev2__tar.gz → 0.10.4.dev4__tar.gz

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-worker
-Version: 0.10.3.dev2
+Version: 0.10.4.dev4
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.
@@ -23,7 +23,7 @@ Requires-Dist: pyyaml>=4.2b1
 Requires-Dist: Jinja2>=2.10.1
 Requires-Dist: urllib3>=1.26.8
 Requires-Dist: celery
-Requires-Dist: girder-client>=2
+Requires-Dist: girder-client>=3
 Requires-Dist: pymongo>=3
 Requires-Dist: requests[security]>=2.20.0
 Requires-Dist: setuptools_scm

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/girder_worker/docker/tasks/__init__.py

@@ -1,9 +1,11 @@
 import datetime
+import importlib.metadata
 import os
 import shutil
 import socket
 import sys
 import threading
+import time
 try:
     import docker
     from docker.errors import DockerException, APIError, InvalidVersion
@@ -34,6 +36,13 @@ from girder_worker_utils import _walk_obj
 
 BLACKLISTED_DOCKER_RUN_ARGS = ['tty', 'detach']
 
+# Work around an issue with docker and requests
+if (importlib.metadata.version('docker') == '7.0.0' and
+        not hasattr(docker.transport.basehttpadapter.BaseHTTPAdapter, '_get_connection')):
+    docker.transport.basehttpadapter.BaseHTTPAdapter._get_connection = (
+        lambda self, request, *args, proxies=None, **kwargs: self.get_connection(
+            request.url, proxies))
+
 
 def _pull_image(image):
     """
@@ -239,6 +248,8 @@ def _run_select_loop(  # noqa: C901
                     container.reload()
                     if container.status == 'exited':
                         break
+                    tries -= 1
+                    time.sleep(1)
 
                 if container.status != 'exited':
                     msg = 'Unable to stop container: %s' % container.id

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/girder_worker/docker/utils.py

@@ -1,10 +1,19 @@
+import importlib.metadata
+import os
 import select
 import uuid
-import os
+
 import docker
 from docker.errors import DockerException
+
 from girder_worker import logger
 
+if (importlib.metadata.version('docker') == '7.0.0' and
+        not hasattr(docker.transport.basehttpadapter.BaseHTTPAdapter, '_get_connection')):
+    docker.transport.basehttpadapter.BaseHTTPAdapter._get_connection = (
+        lambda self, request, *args, proxies=None, **kwargs: self.get_connection(
+            request.url, proxies))
+
 
 def select_loop(exit_condition=lambda: True, readers=None, writers=None):
     """

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/girder_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-worker
-Version: 0.10.3.dev2
+Version: 0.10.4.dev4
 Summary: Batch execution engine built on celery.
 Home-page: https://github.com/girder/girder_worker
 Author: Kitware, Inc.
@@ -23,7 +23,7 @@ Requires-Dist: pyyaml>=4.2b1
 Requires-Dist: Jinja2>=2.10.1
 Requires-Dist: urllib3>=1.26.8
 Requires-Dist: celery
-Requires-Dist: girder-client>=2
+Requires-Dist: girder-client>=3
 Requires-Dist: pymongo>=3
 Requires-Dist: requests[security]>=2.20.0
 Requires-Dist: setuptools_scm

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/girder_worker.egg-info/requires.txt

@@ -2,7 +2,7 @@ pyyaml>=4.2b1
 Jinja2>=2.10.1
 urllib3>=1.26.8
 celery
-girder-client>=2
+girder-client>=3
 pymongo>=3
 requests[security]>=2.20.0
 setuptools_scm

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/requirements.in

@@ -2,7 +2,7 @@ pyyaml>=4.2b1
 Jinja2>=2.10.1
 urllib3>=1.26.8
 celery
-girder-client>=2
+girder-client>=3
 pymongo>=3
 requests[security]>=2.20.0
 setuptools_scm

{girder-worker-0.10.3.dev2 → girder_worker-0.10.4.dev4}/requirements.txt

@@ -17,34 +17,34 @@ alabaster==0.7.13
     # via sphinx
 amqp==5.2.0
     # via kombu
-annotated-types==0.6.0
-    # via pydantic
 attrs==23.2.0
     # via
     #   jsonschema
     #   referencing
 autocommand==2.2.2
     # via jaraco-text
-babel==2.14.0
+babel==2.15.0
     # via sphinx
+backports-tarfile==1.1.1
+    # via jaraco-context
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   celery
     #   kombu
-bcrypt==4.1.2
+bcrypt==4.1.3
     # via passlib
 billiard==4.2.0
     # via celery
-boto3==1.34.50
+boto3==1.34.109
     # via girder
-botocore==1.34.50
+botocore==1.34.109
     # via
     #   boto3
     #   girder
     #   s3transfer
 cachetools==5.3.3
     # via tox
-celery==5.3.6
+celery==5.4.0
     # via -r requirements.in
 certifi==2024.2.2
     # via requests
@@ -54,7 +54,7 @@ chardet==5.2.0
     # via tox
 charset-normalizer==3.3.2
     # via requests
-cheroot==10.0.0
+cheroot==10.0.1
     # via cherrypy
 cherrypy==18.9.0
     # via girder
@@ -66,7 +66,7 @@ click==8.1.7
     #   click-repl
     #   girder
     #   girder-client
-click-didyoumean==0.3.0
+click-didyoumean==0.3.1
     # via celery
 click-plugins==1.1.1
     # via
@@ -76,14 +76,14 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via tox
-coverage[toml]==6.5.0
+coverage[toml]==7.5.1
     # via
     #   -r requirements-dev.in
     #   coveralls
     #   pytest-cov
-coveralls==3.3.1
+coveralls==4.0.1
     # via -r requirements-dev.in
-cryptography==42.0.5
+cryptography==42.0.7
     # via
     #   passlib
     #   pyopenssl
@@ -101,11 +101,11 @@ docutils==0.20.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
-dogpile-cache==1.3.2
+dogpile-cache==1.3.3
     # via girder
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via pytest
-filelock==3.13.1
+filelock==3.14.0
     # via
     #   girder
     #   tox
@@ -121,7 +121,7 @@ flake8-docstrings==1.7.0
     # via -r requirements-dev.in
 flake8-quotes==3.4.0
     # via -r requirements-dev.in
-girder-client==3.2.2
+girder-client==3.2.3
     # via
     #   -r requirements.in
     #   girder-worker-utils
@@ -129,33 +129,35 @@ girder-worker-utils==0.9.0
     # via -r requirements.in
 httmock==1.4.0
     # via -r requirements-dev.in
-idna==3.6
+idna==3.7
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
-    # via sphinx
-importlib-resources==6.1.2
+importlib-metadata==7.1.0
+    # via
+    #   sphinx
+    #   typeguard
+importlib-resources==6.4.0
     # via
     #   jaraco-text
     #   jsonschema
     #   jsonschema-specifications
-inflect==7.0.0
+inflect==7.2.1
     # via jaraco-text
 iniconfig==2.0.0
     # via pytest
-jaraco-collections==5.0.0
+jaraco-collections==5.0.1
     # via cherrypy
-jaraco-context==4.3.0
+jaraco-context==5.3.0
     # via jaraco-text
-jaraco-functools==4.0.0
+jaraco-functools==4.0.1
     # via
     #   cheroot
     #   jaraco-text
     #   tempora
 jaraco-text==3.12.0
     # via jaraco-collections
-jinja2==3.1.3
+jinja2==3.1.4
     # via
     #   -r requirements.in
     #   sphinx
@@ -163,19 +165,19 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-jsonpickle==3.0.3
+jsonpickle==3.0.4
     # via
     #   -r requirements.in
     #   girder-worker-utils
-jsonschema==4.21.1
+jsonschema==4.22.0
     # via girder
 jsonschema-specifications==2023.12.1
     # via jsonschema
-kombu==5.3.5
+kombu==5.3.7
     # via celery
-lxml==5.1.0
+lxml==5.2.2
     # via -r requirements-dev.in
-mako==1.3.2
+mako==1.3.5
     # via girder
 markupsafe==2.1.5
     # via
@@ -191,9 +193,10 @@ more-itertools==10.2.0
     # via
     #   cheroot
     #   cherrypy
+    #   inflect
     #   jaraco-functools
     #   jaraco-text
-packaging==23.2
+packaging==24.0
     # via
     #   docker
     #   mongomock
@@ -208,11 +211,11 @@ pbr==6.0.0
     # via stevedore
 pkgutil-resolve-name==1.3.10
     # via jsonschema
-platformdirs==4.2.0
+platformdirs==4.2.2
     # via
     #   tox
     #   virtualenv
-pluggy==1.4.0
+pluggy==1.5.0
     # via
     #   pytest
     #   tox
@@ -224,39 +227,35 @@ psutil==5.9.8
     # via girder
 pycodestyle==2.11.1
     # via flake8
-pycparser==2.21
+pycparser==2.22
     # via cffi
-pydantic==2.6.3
-    # via inflect
-pydantic-core==2.16.3
-    # via pydantic
 pydocstyle==6.3.0
     # via
     #   -r requirements-dev.in
     #   flake8-docstrings
 pyflakes==3.2.0
     # via flake8
-pygments==2.17.2
+pygments==2.18.0
     # via sphinx
 pymongo==3.13.0
     # via
     #   -r requirements.in
     #   girder
     #   pytest-girder
-pyopenssl==24.0.0
+pyopenssl==24.1.0
     # via girder
 pyproject-api==1.6.1
     # via tox
-pytest==8.0.2
+pytest==8.2.1
     # via
     #   -r requirements-dev.in
     #   pytest-cov
     #   pytest-girder
-pytest-cov==4.1.0
+pytest-cov==5.0.0
     # via
     #   -r requirements-dev.in
     #   pytest-girder
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via
     #   botocore
     #   celery
@@ -270,11 +269,11 @@ pyyaml==6.0.1
     # via
     #   -r requirements.in
     #   girder
-referencing==0.33.0
+referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests[security]==2.31.0
+requests[security]==2.32.1
     # via
     #   -r requirements.in
     #   coveralls
@@ -287,15 +286,15 @@ requests[security]==2.31.0
     #   sphinx
 requests-toolbelt==1.0.0
     # via girder-client
-rpds-py==0.18.0
+rpds-py==0.18.1
     # via
     #   jsonschema
     #   referencing
-s3transfer==0.10.0
+s3transfer==0.10.1
     # via boto3
 sentinels==1.0.0
     # via mongomock
-setuptools-scm==8.0.4
+setuptools-scm==8.1.0
     # via
     #   -r requirements.in
     #   girder-worker-utils
@@ -339,17 +338,17 @@ tomli==2.0.1
     #   pytest
     #   setuptools-scm
     #   tox
-tox==4.13.0
+tox==4.15.0
     # via -r requirements-dev.in
-typing-extensions==4.10.0
+typeguard==4.2.1
+    # via inflect
+typing-extensions==4.11.0
     # via
-    #   annotated-types
     #   dogpile-cache
     #   inflect
     #   kombu
-    #   pydantic
-    #   pydantic-core
     #   setuptools-scm
+    #   typeguard
 tzdata==2024.1
     # via
     #   backports-zoneinfo
@@ -366,13 +365,13 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.25.1
+virtualenv==20.26.2
     # via tox
 wcwidth==0.2.13
     # via prompt-toolkit
 zc-lockfile==3.0.post1
     # via cherrypy
-zipp==3.17.0
+zipp==3.18.2
     # via
     #   importlib-metadata
     #   importlib-resources