diff --git a/requirements-dev.txt b/requirements-dev.txt index 32265c8b9..84b33d865 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,6 @@ autopep8 coverage flake8 flexmock -mock pygit2 == 1.10.1 # https://github.com/libgit2/pygit2/issues/1176 pylint pytest diff --git a/tests/cli/test_gen_payload.py b/tests/cli/test_gen_payload.py index 7d0f688e1..0ffc4ecfe 100644 --- a/tests/cli/test_gen_payload.py +++ b/tests/cli/test_gen_payload.py @@ -5,7 +5,7 @@ from flexmock import flexmock import io -from mock import AsyncMock +from unittest.mock import AsyncMock import yaml import openshift as oc diff --git a/tests/cli/test_rpms_build.py b/tests/cli/test_rpms_build.py index ac2fe277b..afb8ac6f0 100644 --- a/tests/cli/test_rpms_build.py +++ b/tests/cli/test_rpms_build.py @@ -2,7 +2,7 @@ import io import asynctest -from mock import AsyncMock, MagicMock, Mock, patch +from unittest.mock import AsyncMock, MagicMock, Mock, patch from doozerlib import gitdata, rpmcfg from doozerlib.cli.rpms_build import _rpms_rebase_and_build diff --git a/tests/test_brew_inspector.py b/tests/test_brew_inspector.py index d29a97868..34304410a 100644 --- a/tests/test_brew_inspector.py +++ b/tests/test_brew_inspector.py @@ -7,7 +7,7 @@ import logging import unittest -from mock import MagicMock, Mock, patch +from unittest.mock import MagicMock, Mock, patch from doozerlib.image import BrewBuildImageInspector diff --git a/tests/test_dblib.py b/tests/test_dblib.py index d4837cacf..10cfdc688 100644 --- a/tests/test_dblib.py +++ b/tests/test_dblib.py @@ -6,7 +6,6 @@ import pathlib import traceback import sys -import mock class FakeMetaData(object): diff --git a/tests/test_distgit/test_generic_distgit.py b/tests/test_distgit/test_generic_distgit.py index 53b11ca2c..46d4e840d 100644 --- a/tests/test_distgit/test_generic_distgit.py +++ b/tests/test_distgit/test_generic_distgit.py @@ -4,7 +4,7 @@ import unittest from flexmock import flexmock -import mock +from unittest import mock from doozerlib import distgit, model from doozerlib.assembly import AssemblyTypes diff --git a/tests/test_distgit/test_image_distgit/test_image_distgit.py b/tests/test_distgit/test_image_distgit/test_image_distgit.py index cb9bddcaa..00e1f520b 100644 --- a/tests/test_distgit/test_image_distgit/test_image_distgit.py +++ b/tests/test_distgit/test_image_distgit/test_image_distgit.py @@ -8,7 +8,7 @@ from unittest.mock import Mock, patch from flexmock import flexmock -from mock import MagicMock +from unittest.mock import MagicMock from doozerlib import distgit, model from doozerlib.assembly import AssemblyTypes diff --git a/tests/test_distgit/test_rpm_distgit.py b/tests/test_distgit/test_rpm_distgit.py index 484edb552..0d1fa4604 100644 --- a/tests/test_distgit/test_rpm_distgit.py +++ b/tests/test_distgit/test_rpm_distgit.py @@ -1,7 +1,7 @@ import unittest from pathlib import Path -from mock import Mock, patch +from unittest.mock import Mock, patch from doozerlib import distgit, model diff --git a/tests/test_exectools.py b/tests/test_exectools.py index 778daaac7..8fcab4b51 100644 --- a/tests/test_exectools.py +++ b/tests/test_exectools.py @@ -8,7 +8,7 @@ import unittest import asynctest -import mock +from unittest import mock try: from importlib import reload diff --git a/tests/test_image.py b/tests/test_image.py index 02d4593d5..487552e20 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -7,7 +7,7 @@ import logging import tempfile import shutil -import mock +from unittest import mock from flexmock import flexmock try: from importlib import reload diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 2a6d279d5..2ca37e217 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -3,7 +3,7 @@ import re import datetime -from mock import MagicMock, Mock, patch +from unittest.mock import MagicMock, Mock, patch from doozerlib.metadata import Metadata, CgitAtomFeedEntry, RebuildHintCode from doozerlib.brew import BuildStates diff --git a/tests/test_olm_bundle.py b/tests/test_olm_bundle.py index 468161df1..7b10eabdf 100644 --- a/tests/test_olm_bundle.py +++ b/tests/test_olm_bundle.py @@ -1,7 +1,7 @@ import unittest from flexmock import flexmock -from mock import MagicMock +from unittest.mock import MagicMock from doozerlib.olm.bundle import OLMBundle diff --git a/tests/test_plashet.py b/tests/test_plashet.py index fa3661092..11f6096cb 100644 --- a/tests/test_plashet.py +++ b/tests/test_plashet.py @@ -1,7 +1,6 @@ from unittest import TestCase -from mock import MagicMock, Mock -from mock.mock import patch +from unittest.mock import MagicMock, Mock, patch from doozerlib.model import Model from doozerlib.plashet import PlashetBuilder diff --git a/tests/test_rpm_builder.py b/tests/test_rpm_builder.py index 6e6cb549d..73ee174f8 100644 --- a/tests/test_rpm_builder.py +++ b/tests/test_rpm_builder.py @@ -3,7 +3,7 @@ from pathlib import Path import asynctest -import mock +from unittest import mock from doozerlib import distgit, gitdata, rpmcfg from doozerlib.exectools import RetryException diff --git a/tests/test_source_modifications.py b/tests/test_source_modifications.py index 3f1a17809..015d9aa89 100644 --- a/tests/test_source_modifications.py +++ b/tests/test_source_modifications.py @@ -5,7 +5,7 @@ import tempfile import unittest -import mock +from unittest import mock import yaml.scanner from doozerlib.source_modifications import (AddModifier, RemoveModifier,