From d0253af763c286fe14391d686e41a9df8550da7e Mon Sep 17 00:00:00 2001 From: David Bieber Date: Thu, 19 Sep 2024 21:25:13 -0400 Subject: [PATCH 1/2] Remove mock in favor of unittest.mock --- fire/core_test.py | 3 ++- fire/fire_import_test.py | 2 +- fire/fire_test.py | 3 +-- fire/interact_test.py | 4 ++-- fire/testutils.py | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fire/core_test.py b/fire/core_test.py index 9e1f7dba..90b7f466 100644 --- a/fire/core_test.py +++ b/fire/core_test.py @@ -14,11 +14,12 @@ """Tests for the core module.""" +from unittest import mock + from fire import core from fire import test_components as tc from fire import testutils from fire import trace -import mock class CoreTest(testutils.BaseTestCase): diff --git a/fire/fire_import_test.py b/fire/fire_import_test.py index c5975681..a6b4acc3 100644 --- a/fire/fire_import_test.py +++ b/fire/fire_import_test.py @@ -15,10 +15,10 @@ """Tests importing the fire module.""" import sys +from unittest import mock import fire from fire import testutils -import mock class FireImportTest(testutils.BaseTestCase): diff --git a/fire/fire_test.py b/fire/fire_test.py index 74f1f6e6..99b4a7c6 100644 --- a/fire/fire_test.py +++ b/fire/fire_test.py @@ -16,13 +16,12 @@ import os import sys +from unittest import mock import fire from fire import test_components as tc from fire import testutils -import mock - class FireTest(testutils.BaseTestCase): diff --git a/fire/interact_test.py b/fire/interact_test.py index 99cde285..2f286824 100644 --- a/fire/interact_test.py +++ b/fire/interact_test.py @@ -14,11 +14,11 @@ """Tests for the interact module.""" +from unittest import mock + from fire import interact from fire import testutils -import mock - try: import IPython # pylint: disable=unused-import, g-import-not-at-top diff --git a/fire/testutils.py b/fire/testutils.py index fa1ca86d..816551b5 100644 --- a/fire/testutils.py +++ b/fire/testutils.py @@ -20,12 +20,11 @@ import re import sys import unittest +from unittest import mock from fire import core from fire import trace -import mock - class BaseTestCase(unittest.TestCase): """Shared test case for Python Fire tests.""" From 89753495095440ae2bc0d7ea8dd8399875ffc1aa Mon Sep 17 00:00:00 2001 From: David Bieber Date: Thu, 19 Sep 2024 21:25:42 -0400 Subject: [PATCH 2/2] Remove mock --- .github/scripts/requirements.txt | 1 - setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/scripts/requirements.txt b/.github/scripts/requirements.txt index d0344221..ba870464 100644 --- a/.github/scripts/requirements.txt +++ b/.github/scripts/requirements.txt @@ -7,4 +7,3 @@ pytest-runner <7.0.0 termcolor <2.5.0 hypothesis <6.101.0 levenshtein <=0.25.1 -mock <6.0.0 diff --git a/setup.py b/setup.py index 6adbef46..53f3381a 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ TEST_DEPENDENCIES = [ 'hypothesis', - 'mock', 'levenshtein', ]