[arvados] created: 2.7.0-6482-g8a795bf668
git repository hosting
git at public.arvados.org
Wed Apr 24 20:19:17 UTC 2024
at 8a795bf668174147e9f254fa3af9b0be4a14a973 (commit)
commit 8a795bf668174147e9f254fa3af9b0be4a14a973
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 16:15:12 2024 -0400
21721: Remove sdk/cwl version pins
Both of these were set to work around limitations in the old pip
resolver. We have since standardized on the new one in our build
process, so they are no longer needed.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 7780174fc2..829dbf0544 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -33,8 +33,6 @@ setup(name='arvados-cwl-runner',
'cwltool==3.1.20230601100705',
'schema-salad==8.4.20230601112322',
'ciso8601 >= 2.0.0',
- 'networkx < 2.6',
- 'importlib-metadata<5',
'setuptools>=40.3.0',
],
data_files=[
commit 0d46f526ae182d831a899b07cc373f41e0679204
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 16:13:47 2024 -0400
21721: Remove msgpack version pin
This was pinned to avoid an install bug in version 1.0.4. Newer releases
seem fine. See e2267bd9920.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index ea2c4c0ef0..7780174fc2 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -34,7 +34,6 @@ setup(name='arvados-cwl-runner',
'schema-salad==8.4.20230601112322',
'ciso8601 >= 2.0.0',
'networkx < 2.6',
- 'msgpack==1.0.3',
'importlib-metadata<5',
'setuptools>=40.3.0',
],
commit 964083b35ae64c6d9206c18eea6783f90a184154
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 16:03:47 2024 -0400
21721: Remove pycurl version pin
This was originally pinned because of library conflicts on Debian 10,
which we no longer support. See commit
d655e2addaba4168f76fb7c4e2e9f6d649917bcc.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 8486c78654..a2ec703556 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -115,7 +115,7 @@ setup(name='arvados-python-client',
'google-api-python-client >=2.1.0',
'google-auth',
'httplib2 >=0.9.2',
- 'pycurl >=7.19.5.1, <7.45.0',
+ 'pycurl >=7.19.5.1',
'setuptools >=40.3.0',
'websockets >=11.0',
],
commit f560aa12166357b3cd10194024f1556631f27587
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 15:55:06 2024 -0400
21721: Remove ruamel.yaml dependency
We import it a few times but never actually use it.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 7f5245db86..51251737cf 100755
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -47,7 +47,6 @@ import arvados.util
import arvados.commands._util as arv_cmd
import arvados.commands.keepdocker
import arvados.http_to_keep
-import ruamel.yaml as yaml
from arvados._version import __version__
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 0d33afd44b..8486c78654 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -116,7 +116,6 @@ setup(name='arvados-python-client',
'google-auth',
'httplib2 >=0.9.2',
'pycurl >=7.19.5.1, <7.45.0',
- 'ruamel.yaml >=0.15.54, <0.17.22',
'setuptools >=40.3.0',
'websockets >=11.0',
],
diff --git a/sdk/python/tests/test_http.py b/sdk/python/tests/test_http.py
index fb424743d9..de63719453 100644
--- a/sdk/python/tests/test_http.py
+++ b/sdk/python/tests/test_http.py
@@ -24,8 +24,6 @@ import pycurl
from arvados.http_to_keep import http_to_keep
-import ruamel.yaml as yaml
-
# Turns out there was already "FakeCurl" that serves the same purpose, but
# I wrote this before I knew that. Whoops.
class CurlMock:
commit 1d55eb8597807b8dbe66b605fd34882341372720
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 15:29:54 2024 -0400
21721: Remove httplib2 and associated version pins
This whole stack was pinned to stay on an older version of
google-python-api-client, which has since been relaxed, and then keep
things working under the old pip resolver, which we've standardized off
of. Refs #18336.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index ef49485bb1..0d33afd44b 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -114,10 +114,8 @@ setup(name='arvados-python-client',
'future',
'google-api-python-client >=2.1.0',
'google-auth',
- 'httplib2 >=0.9.2, <0.20.2',
- 'protobuf <4.0.0dev',
+ 'httplib2 >=0.9.2',
'pycurl >=7.19.5.1, <7.45.0',
- 'pyparsing <3',
'ruamel.yaml >=0.15.54, <0.17.22',
'setuptools >=40.3.0',
'websockets >=11.0',
commit 7a2406a1fbcbf5a476d403f109630c252b5fba60
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 15:08:22 2024 -0400
21721: Remove google-auth version pin
Refs #18001. The original motivation for this pin is not
well-documented. My best guess is it was to retain Python 2.7 support,
which is no longer a concern.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 97c3e0a2bc..ef49485bb1 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -112,9 +112,8 @@ setup(name='arvados-python-client',
*arvados_version.iter_dependencies(version),
'ciso8601 >=2.0.0',
'future',
- 'google-api-core <2.11.0', # 2.11.0rc1 is incompatible with google-auth<2
'google-api-python-client >=2.1.0',
- 'google-auth <2',
+ 'google-auth',
'httplib2 >=0.9.2, <0.20.2',
'protobuf <4.0.0dev',
'pycurl >=7.19.5.1, <7.45.0',
commit bef00883acf5a11705e0c2f597a4af67a9ba71ce
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 14:46:44 2024 -0400
21721: Remove tests_require=mock
unittest.mock in the stdlib is good enough for us.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 551bd964b1..ea2c4c0ef0 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -46,8 +46,5 @@ setup(name='arvados-cwl-runner',
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=[
- 'mock>=1.0,<4',
- ],
zip_safe=True,
)
diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index b95b8eb67b..af8c0b014d 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -12,7 +12,6 @@ import arvados_cwl.util
import copy
import arvados.config
import logging
-import mock
import unittest
import os
import functools
@@ -25,6 +24,8 @@ from schema_salad.ref_resolver import Loader
from schema_salad.sourceline import cmap
import io
+from unittest import mock
+
from .matcher import JsonDiffMatcher, StripYAMLComments
from .mock_discovery import get_rootDesc
diff --git a/sdk/cwl/tests/test_fsaccess.py b/sdk/cwl/tests/test_fsaccess.py
index f83612a8b0..c086f0e832 100644
--- a/sdk/cwl/tests/test_fsaccess.py
+++ b/sdk/cwl/tests/test_fsaccess.py
@@ -3,13 +3,14 @@
# SPDX-License-Identifier: Apache-2.0
import functools
-import mock
import sys
import unittest
import json
import logging
import os
+from unittest import mock
+
import arvados
import arvados.keep
import arvados.collection
diff --git a/sdk/cwl/tests/test_make_output.py b/sdk/cwl/tests/test_make_output.py
index dd1da0b524..0a4fbdc60f 100644
--- a/sdk/cwl/tests/test_make_output.py
+++ b/sdk/cwl/tests/test_make_output.py
@@ -8,11 +8,12 @@ standard_library.install_aliases()
import functools
import json
import logging
-import mock
import os
import io
import unittest
+from unittest import mock
+
import arvados
import arvados_cwl
import arvados_cwl.executor
diff --git a/sdk/cwl/tests/test_pathmapper.py b/sdk/cwl/tests/test_pathmapper.py
index 194092db7a..1a13fc7079 100644
--- a/sdk/cwl/tests/test_pathmapper.py
+++ b/sdk/cwl/tests/test_pathmapper.py
@@ -3,13 +3,14 @@
# SPDX-License-Identifier: Apache-2.0
import functools
-import mock
import sys
import unittest
import json
import logging
import os
+from unittest import mock
+
import arvados
import arvados.keep
import arvados.collection
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index c956beda6a..a137325a44 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -12,7 +12,6 @@ import functools
import hashlib
import json
import logging
-import mock
import sys
import unittest
import cwltool.process
@@ -20,6 +19,7 @@ import re
import os
from io import BytesIO, StringIO
+from unittest import mock
import arvados
import arvados.collection
diff --git a/sdk/cwl/tests/test_tq.py b/sdk/cwl/tests/test_tq.py
index 05e5116d72..bf53f8912e 100644
--- a/sdk/cwl/tests/test_tq.py
+++ b/sdk/cwl/tests/test_tq.py
@@ -3,7 +3,6 @@
# SPDX-License-Identifier: Apache-2.0
import functools
-import mock
import sys
import unittest
import json
@@ -11,6 +10,8 @@ import logging
import os
import threading
+from unittest import mock
+
from cwltool.task_queue import TaskQueue
def success_task():
diff --git a/sdk/cwl/tests/test_urljoin.py b/sdk/cwl/tests/test_urljoin.py
index 86a053ea48..08bca55e3d 100644
--- a/sdk/cwl/tests/test_urljoin.py
+++ b/sdk/cwl/tests/test_urljoin.py
@@ -3,13 +3,14 @@
# SPDX-License-Identifier: Apache-2.0
import functools
-import mock
import sys
import unittest
import json
import logging
import os
+from unittest import mock
+
import arvados
import arvados.keep
import arvados.collection
diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index bf3d6fe0ef..e7159f4102 100644
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -5,10 +5,11 @@
from builtins import bytes
import unittest
-import mock
import datetime
import httplib2
+from unittest import mock
+
from arvados_cwl.util import *
from arvados.errors import ApiError
from arvados_cwl.util import common_prefix
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index c9a8516d07..97c3e0a2bc 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -128,6 +128,6 @@ setup(name='arvados-python-client',
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=['mock>=1.0,<4', 'PyYAML', 'parameterized'],
+ tests_require=['PyYAML', 'parameterized'],
zip_safe=False
)
diff --git a/sdk/python/tests/arvados_testutil.py b/sdk/python/tests/arvados_testutil.py
index 1cf1116b3f..6d58b23360 100644
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@ -11,7 +11,6 @@ import hashlib
import http.client
import httplib2
import io
-import mock
import os
import pycurl
import queue
@@ -21,6 +20,7 @@ import tempfile
import unittest
from io import StringIO, BytesIO
+from unittest import mock
# Use this hostname when you want to make sure the traffic will be
# instantly refused. 100::/64 is a dedicated black hole.
diff --git a/sdk/python/tests/test_api.py b/sdk/python/tests/test_api.py
index 0f85e5520c..2768d2e7cf 100644
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -20,7 +20,7 @@ import sys
import unittest
import urllib.parse as urlparse
-import mock
+from unittest import mock
from . import run_test_server
from apiclient import errors as apiclient_errors
diff --git a/sdk/python/tests/test_arv_get.py b/sdk/python/tests/test_arv_get.py
index d12739f6f6..b66039dfe3 100644
--- a/sdk/python/tests/test_arv_get.py
+++ b/sdk/python/tests/test_arv_get.py
@@ -6,12 +6,13 @@ from __future__ import absolute_import
from future.utils import listitems
import io
import logging
-import mock
import os
import re
import shutil
import tempfile
+from unittest import mock
+
import arvados
import arvados.collection as collection
import arvados.commands.get as arv_get
diff --git a/sdk/python/tests/test_arv_keepdocker.py b/sdk/python/tests/test_arv_keepdocker.py
index 9aebc03504..5d23dfb378 100644
--- a/sdk/python/tests/test_arv_keepdocker.py
+++ b/sdk/python/tests/test_arv_keepdocker.py
@@ -8,13 +8,14 @@ import collections.abc
import copy
import hashlib
import logging
-import mock
import os
import subprocess
import sys
import tempfile
import unittest
+
from pathlib import Path
+from unittest import mock
import parameterized
diff --git a/sdk/python/tests/test_arv_ls.py b/sdk/python/tests/test_arv_ls.py
index 635c6254ad..d48b94ffac 100644
--- a/sdk/python/tests/test_arv_ls.py
+++ b/sdk/python/tests/test_arv_ls.py
@@ -8,9 +8,10 @@ from builtins import range
import os
import random
import sys
-import mock
import tempfile
+from unittest import mock
+
import arvados.errors as arv_error
import arvados.commands.ls as arv_ls
from . import run_test_server
diff --git a/sdk/python/tests/test_arv_put.py b/sdk/python/tests/test_arv_put.py
index afdf2238a7..772a4f6b3e 100644
--- a/sdk/python/tests/test_arv_put.py
+++ b/sdk/python/tests/test_arv_put.py
@@ -16,7 +16,6 @@ import ciso8601
import datetime
import json
import logging
-import mock
import multiprocessing
import os
import pwd
@@ -32,6 +31,8 @@ import time
import unittest
import uuid
+from unittest import mock
+
import arvados
import arvados.commands.put as arv_put
from . import arvados_testutil as tutil
diff --git a/sdk/python/tests/test_arvfile.py b/sdk/python/tests/test_arvfile.py
index 600f17baad..b98e1e97d4 100644
--- a/sdk/python/tests/test_arvfile.py
+++ b/sdk/python/tests/test_arvfile.py
@@ -8,11 +8,12 @@ from builtins import str
from builtins import range
from builtins import object
import datetime
-import mock
import os
import unittest
import time
+from unittest import mock
+
import arvados
from arvados._ranges import Range
from arvados.keep import KeepLocator
diff --git a/sdk/python/tests/test_cache.py b/sdk/python/tests/test_cache.py
index 259acd0a30..d86c7337e1 100644
--- a/sdk/python/tests/test_cache.py
+++ b/sdk/python/tests/test_cache.py
@@ -8,7 +8,6 @@ from __future__ import absolute_import
from builtins import str
from builtins import range
import hashlib
-import mock
import os
import random
import shutil
@@ -17,11 +16,12 @@ import tempfile
import threading
import unittest
+from unittest import mock
+
import arvados
import arvados.cache
from . import run_test_server
-
def _random(n):
return bytearray(random.getrandbits(8) for _ in range(n))
diff --git a/sdk/python/tests/test_collections.py b/sdk/python/tests/test_collections.py
index 9e753506b3..65b89056bb 100644
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@ -7,7 +7,6 @@ from __future__ import absolute_import
from builtins import object
import arvados
import copy
-import mock
import os
import random
import re
@@ -18,6 +17,8 @@ import time
import unittest
import parameterized
+from unittest import mock
+
from . import run_test_server
from arvados._ranges import Range, LocatorAndRange
from arvados.collection import Collection, CollectionReader
diff --git a/sdk/python/tests/test_events.py b/sdk/python/tests/test_events.py
index b4e6a0b1cd..a3a3267be7 100644
--- a/sdk/python/tests/test_events.py
+++ b/sdk/python/tests/test_events.py
@@ -4,13 +4,14 @@
import json
import logging
-import mock
import queue
import sys
import threading
import time
import unittest
+from unittest import mock
+
import websockets.exceptions as ws_exc
import arvados
diff --git a/sdk/python/tests/test_http.py b/sdk/python/tests/test_http.py
index bce57eda61..fb424743d9 100644
--- a/sdk/python/tests/test_http.py
+++ b/sdk/python/tests/test_http.py
@@ -11,11 +11,12 @@ import functools
import hashlib
import json
import logging
-import mock
import sys
import unittest
import datetime
+from unittest import mock
+
import arvados
import arvados.collection
import arvados.keep
diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index 8c0f096b61..5a065b2ee1 100644
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -10,8 +10,6 @@ from builtins import str
from builtins import range
from builtins import object
import hashlib
-import mock
-from mock import patch
import os
import errno
import pycurl
@@ -27,6 +25,9 @@ import unittest
import urllib.parse
import mmap
+from unittest import mock
+from unittest.mock import patch
+
import parameterized
import arvados
diff --git a/sdk/python/tests/test_retry.py b/sdk/python/tests/test_retry.py
index bcf784d130..3f0064f96f 100644
--- a/sdk/python/tests/test_retry.py
+++ b/sdk/python/tests/test_retry.py
@@ -8,9 +8,10 @@ from builtins import object
import itertools
import unittest
+from unittest import mock
+
import arvados.errors as arv_error
import arvados.retry as arv_retry
-import mock
class RetryLoopTestMixin(object):
@staticmethod
diff --git a/sdk/python/tests/test_retry_job_helpers.py b/sdk/python/tests/test_retry_job_helpers.py
index 9389b25c88..f4e80e61fe 100644
--- a/sdk/python/tests/test_retry_job_helpers.py
+++ b/sdk/python/tests/test_retry_job_helpers.py
@@ -4,7 +4,6 @@
from __future__ import absolute_import
from builtins import object
-import mock
import os
import unittest
import hashlib
@@ -14,6 +13,7 @@ import arvados
from . import arvados_testutil as tutil
from apiclient import http as apiclient_http
+from unittest import mock
@tutil.skip_sleep
class ApiClientRetryTestMixin(object):
diff --git a/sdk/python/tests/test_sdk.py b/sdk/python/tests/test_sdk.py
index 41add57c0e..4ef81c53d8 100644
--- a/sdk/python/tests/test_sdk.py
+++ b/sdk/python/tests/test_sdk.py
@@ -2,10 +2,11 @@
#
# SPDX-License-Identifier: Apache-2.0
-import mock
import os
import unittest
+from unittest import mock
+
import arvados
import arvados.collection
diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py
index 12a3340eab..374800c55b 100644
--- a/sdk/python/tests/test_stream.py
+++ b/sdk/python/tests/test_stream.py
@@ -7,11 +7,12 @@ from builtins import object
import bz2
import gzip
import io
-import mock
import os
import unittest
import hashlib
+from unittest import mock
+
import arvados
from arvados import StreamReader, StreamFileReader
from arvados._ranges import Range
diff --git a/sdk/python/tests/test_vocabulary.py b/sdk/python/tests/test_vocabulary.py
index aa2e739e20..2f5db3b9d9 100644
--- a/sdk/python/tests/test_vocabulary.py
+++ b/sdk/python/tests/test_vocabulary.py
@@ -4,7 +4,8 @@
import arvados
import unittest
-import mock
+
+from unittest import mock
from arvados import api, vocabulary
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 4519503c69..5a77174c62 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -45,6 +45,6 @@ setup(name='arvados_fuse',
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=['mock>=1.0', 'PyYAML', 'parameterized',],
+ tests_require=['PyYAML', 'parameterized',],
zip_safe=False
)
diff --git a/services/fuse/tests/test_command_args.py b/services/fuse/tests/test_command_args.py
index b08ab19335..90153d22d1 100644
--- a/services/fuse/tests/test_command_args.py
+++ b/services/fuse/tests/test_command_args.py
@@ -14,7 +14,6 @@ import io
import json
import llfuse
import logging
-import mock
import os
from . import run_test_server
import sys
@@ -22,6 +21,8 @@ import tempfile
import unittest
import resource
+from unittest import mock
+
def noexit(func):
"""If argparse or arvados_fuse tries to exit, fail the test instead"""
class SystemExitCaught(Exception):
diff --git a/services/fuse/tests/test_inodes.py b/services/fuse/tests/test_inodes.py
index c5c92a9b3f..cc22f521e0 100644
--- a/services/fuse/tests/test_inodes.py
+++ b/services/fuse/tests/test_inodes.py
@@ -3,11 +3,12 @@
# SPDX-License-Identifier: AGPL-3.0
import arvados_fuse
-import mock
import unittest
import llfuse
import logging
+from unittest import mock
+
class InodeTests(unittest.TestCase):
# The following tests call next(inodes._counter) because inode 1
diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index b3bec39cc5..2d775c0608 100644
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -12,7 +12,6 @@ import errno
import json
import llfuse
import logging
-import mock
import os
import subprocess
import time
@@ -20,6 +19,8 @@ import unittest
import tempfile
import parameterized
+from unittest import mock
+
import arvados
import arvados_fuse as fuse
from arvados_fuse import fusedir
diff --git a/services/fuse/tests/test_retry.py b/services/fuse/tests/test_retry.py
index 44ab5cce91..92081de0a0 100644
--- a/services/fuse/tests/test_retry.py
+++ b/services/fuse/tests/test_retry.py
@@ -8,7 +8,6 @@ standard_library.install_aliases()
import arvados
import arvados_fuse.command
import json
-import mock
import os
import pycurl
import queue
@@ -16,8 +15,9 @@ from . import run_test_server
import tempfile
import unittest
-from .integration_test import IntegrationTest
+from unittest import mock
+from .integration_test import IntegrationTest
class KeepClientRetry(unittest.TestCase):
origKeepClient = arvados.keep.KeepClient
diff --git a/services/fuse/tests/test_token_expiry.py b/services/fuse/tests/test_token_expiry.py
index 040db2e096..ca2228c561 100644
--- a/services/fuse/tests/test_token_expiry.py
+++ b/services/fuse/tests/test_token_expiry.py
@@ -7,7 +7,6 @@ import apiclient
import arvados
import arvados_fuse
import logging
-import mock
import multiprocessing
import os
import re
@@ -15,6 +14,8 @@ import sys
import time
import unittest
+from unittest import mock
+
from .integration_test import IntegrationTest
logger = logging.getLogger('arvados.arv-mount')
diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index e1a07e204d..53af6455fb 100755
--- a/tools/crunchstat-summary/setup.py
+++ b/tools/crunchstat-summary/setup.py
@@ -36,6 +36,5 @@ setup(name='crunchstat_summary',
],
python_requires="~=3.8",
test_suite='tests',
- tests_require=['mock>=1.0'],
zip_safe=False,
)
diff --git a/tools/crunchstat-summary/tests/test_examples.py b/tools/crunchstat-summary/tests/test_examples.py
index 5a20d3283f..7d97fd3edc 100644
--- a/tools/crunchstat-summary/tests/test_examples.py
+++ b/tools/crunchstat-summary/tests/test_examples.py
@@ -10,11 +10,12 @@ import glob
import gzip
import io
import logging
-import mock
import os
import sys
import unittest
+from unittest import mock
+
from crunchstat_summary.command import UTF8Decode
from crunchstat_summary import logger, reader
commit 8cc4d00917134d3257b1a59d4823532f9e235f00
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 14:15:55 2024 -0400
21721: Clean various test imports for Python 3
This is not everything but cleans up files where I happened to notice
explicit version checks.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index c8bf127951..c956beda6a 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -4,9 +4,6 @@
from future import standard_library
standard_library.install_aliases()
-from builtins import object
-from builtins import str
-from future.utils import viewvalues
import copy
import io
@@ -22,16 +19,7 @@ import cwltool.process
import re
import os
-from io import BytesIO
-
-# StringIO.StringIO and io.StringIO have different behavior write() is
-# called with both python2 (byte) strings and unicode strings
-# (specifically there's some logging in cwltool that causes trouble).
-# This isn't a problem on python3 because all string are unicode.
-if sys.version_info[0] < 3:
- from StringIO import StringIO
-else:
- from io import StringIO
+from io import BytesIO, StringIO
import arvados
import arvados.collection
@@ -142,7 +130,7 @@ def stubs(wfdetails=('submit_wf.cwl', None)):
return CollectionExecute(created_collections[uuid])
def collection_getstub(created_collections, uuid):
- for v in viewvalues(created_collections):
+ for v in created_collections.values():
if uuid in (v["uuid"], v["portable_data_hash"]):
return CollectionExecute(v)
diff --git a/sdk/python/tests/arvados_testutil.py b/sdk/python/tests/arvados_testutil.py
index 35e85d1195..1cf1116b3f 100644
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@ -4,9 +4,6 @@
from future import standard_library
standard_library.install_aliases()
-from builtins import str
-from builtins import range
-from builtins import object
import arvados
import contextlib
import errno
@@ -23,11 +20,7 @@ import sys
import tempfile
import unittest
-if sys.version_info >= (3, 0):
- from io import StringIO, BytesIO
-else:
- from cStringIO import StringIO
- BytesIO = StringIO
+from io import StringIO, BytesIO
# Use this hostname when you want to make sure the traffic will be
# instantly refused. 100::/64 is a dedicated black hole.
commit ffb2409fc6c7c37d86b490fa8a1465da6ceaa354
Author: Brett Smith <brett.smith at curii.com>
Date: Wed Apr 24 14:07:09 2024 -0400
21721: Remove tests_require=pbr
This module is a setuptools plugin that requires activation to
use. We're currently not doing that, so it's completely unused and safe
to remove.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index e13e51609a..c9a8516d07 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -128,6 +128,6 @@ setup(name='arvados-python-client',
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=['pbr<1.7.0', 'mock>=1.0,<4', 'PyYAML', 'parameterized'],
+ tests_require=['mock>=1.0,<4', 'PyYAML', 'parameterized'],
zip_safe=False
)
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 77dbd036d0..4519503c69 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -45,6 +45,6 @@ setup(name='arvados_fuse',
'Programming Language :: Python :: 3',
],
test_suite='tests',
- tests_require=['pbr<1.7.0', 'mock>=1.0', 'PyYAML', 'parameterized',],
+ tests_require=['mock>=1.0', 'PyYAML', 'parameterized',],
zip_safe=False
)
diff --git a/tools/crunchstat-summary/setup.py b/tools/crunchstat-summary/setup.py
index 24a6bf5e4f..e1a07e204d 100755
--- a/tools/crunchstat-summary/setup.py
+++ b/tools/crunchstat-summary/setup.py
@@ -36,6 +36,6 @@ setup(name='crunchstat_summary',
],
python_requires="~=3.8",
test_suite='tests',
- tests_require=['pbr<1.7.0', 'mock>=1.0'],
+ tests_require=['mock>=1.0'],
zip_safe=False,
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list