X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/96f0b43ee4bb07e87dbeef8514a51857db069351..873fcf181c037cc1e42419bfeaf5bb70c9d9e239:/sdk/cwl/tests/test_container.py diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py index b95b8eb67b..885ee165b0 100644 --- a/sdk/cwl/tests/test_container.py +++ b/sdk/cwl/tests/test_container.py @@ -2,9 +2,6 @@ # # SPDX-License-Identifier: Apache-2.0 -from builtins import str -from builtins import object - import arvados_cwl import arvados_cwl.context import arvados_cwl.util @@ -12,7 +9,6 @@ import arvados_cwl.util import copy import arvados.config import logging -import mock import unittest import os import functools @@ -25,6 +21,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