diff --git a/pyproject.toml b/pyproject.toml index 743597a2..ecc25696 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,7 +71,6 @@ doc = [ dev = [ "genie_python[plot,doc]", - "mock", "parameterized", "pyhamcrest", "pytest", diff --git a/src/genie_python/genie_dae.py b/src/genie_python/genie_dae.py index 474b79c5..1c98c864 100644 --- a/src/genie_python/genie_dae.py +++ b/src/genie_python/genie_dae.py @@ -458,9 +458,7 @@ def end_run( prepost: run pre and post commands [optional] """ if self.get_run_state() == "ENDING" and not immediate: - print( - "Please specify the 'immediate=True' flag to end a run " "while in the ENDING state" - ) + print("Please specify the 'immediate=True' flag to end a run while in the ENDING state") return run_number = self.get_run_number() @@ -601,8 +599,7 @@ def pause_run(self, immediate: bool = False, prepost: bool = True) -> None: """ if self.get_run_state() == "PAUSING" and not immediate: print( - "Please specify the 'immediate=True' flag " - "to pause a run while in the PAUSING state" + "Please specify the 'immediate=True' flag to pause a run while in the PAUSING state" ) return diff --git a/tests/py3_test_genie_experimental_data.py b/tests/py3_test_genie_experimental_data.py index cad9505a..a3878fee 100644 --- a/tests/py3_test_genie_experimental_data.py +++ b/tests/py3_test_genie_experimental_data.py @@ -17,9 +17,9 @@ import datetime import unittest +from unittest.mock import call, patch from hamcrest import assert_that, calling, raises -from mock import call, patch from parameterized import parameterized from genie_python.genie_experimental_data import ( diff --git a/tests/test_block_names.py b/tests/test_block_names.py index a5554bc4..16c64acc 100644 --- a/tests/test_block_names.py +++ b/tests/test_block_names.py @@ -21,9 +21,9 @@ import json import unittest from time import sleep +from unittest.mock import Mock, patch from hamcrest import assert_that, has_key, has_length, is_, only_contains -from mock import Mock, patch from genie_python.block_names import BlockNames, BlockNamesManager from genie_python.channel_access_exceptions import UnableToConnectToPVException @@ -218,7 +218,7 @@ def test_GIVEN_request_invalid_block_WHEN_inspect_block_THEN_attribute_error_thr block_names, _ = create_block_names(get_pv_value_mock, []) try: - result = block_names._blocks_cant_start_with_hash + block_names._blocks_cant_start_with_hash self.fail("No exception thrown") except AttributeError: pass diff --git a/tests/test_genie.py b/tests/test_genie.py index 5b273406..517dafce 100644 --- a/tests/test_genie.py +++ b/tests/test_genie.py @@ -19,9 +19,9 @@ import unittest from datetime import datetime, timedelta from io import StringIO +from unittest.mock import MagicMock, call, patch from hamcrest import assert_that, contains_exactly, has_length, is_ -from mock import MagicMock, call, patch import genie_python.genie_api_setup from genie_python import genie diff --git a/tests/test_genie_alerts.py b/tests/test_genie_alerts.py index 23e7c382..643b804e 100644 --- a/tests/test_genie_alerts.py +++ b/tests/test_genie_alerts.py @@ -16,8 +16,7 @@ from __future__ import absolute_import, print_function import unittest - -from mock import patch +from unittest.mock import patch import genie_python.genie_alerts import genie_python.genie_api_setup diff --git a/tests/test_genie_api_setup.py b/tests/test_genie_api_setup.py index 283ed64e..3b11db95 100644 --- a/tests/test_genie_api_setup.py +++ b/tests/test_genie_api_setup.py @@ -20,9 +20,9 @@ import os import unittest +from unittest.mock import patch from hamcrest import assert_that, is_ -from mock import patch from parameterized import parameterized import genie_python.genie_api_setup diff --git a/tests/test_genie_blockserver_tests.py b/tests/test_genie_blockserver_tests.py index c45b5eec..9511502a 100644 --- a/tests/test_genie_blockserver_tests.py +++ b/tests/test_genie_blockserver_tests.py @@ -17,8 +17,7 @@ from __future__ import absolute_import import unittest - -from mock import MagicMock, Mock +from unittest.mock import MagicMock, Mock from genie_python.genie_blockserver import BlockServer from genie_python.utilities import compress_and_hex diff --git a/tests/test_genie_dae.py b/tests/test_genie_dae.py index 2a670ff5..f6ba3a4e 100644 --- a/tests/test_genie_dae.py +++ b/tests/test_genie_dae.py @@ -17,10 +17,10 @@ from __future__ import absolute_import import unittest +from unittest.mock import MagicMock, patch import numpy as np from hamcrest import assert_that, calling, close_to, is_, raises -from mock import MagicMock, patch from parameterized import parameterized_class from genie_python.genie_change_cache import ChangeCache @@ -295,8 +295,7 @@ def test_GIVEN_in_transition_WHEN_change_finish_called_THEN_value_error_with_cor self.assertRaisesRegexp( ValueError, - "Another DAE change operation is currently in progress - values will be " - "inconsistent", + "Another DAE change operation is currently in progress - values will be inconsistent", self.dae.change_finish, ) diff --git a/tests/test_genie_epics_api.py b/tests/test_genie_epics_api.py index 1016598b..cd1a0d2f 100644 --- a/tests/test_genie_epics_api.py +++ b/tests/test_genie_epics_api.py @@ -17,9 +17,9 @@ from __future__ import absolute_import import unittest +from unittest.mock import MagicMock, patch from hamcrest import assert_that, calling, is_, raises -from mock import MagicMock, patch from parameterized import parameterized from genie_python.channel_access_exceptions import UnableToConnectToPVException diff --git a/tests/test_matplotlib_backend.py b/tests/test_matplotlib_backend.py index 465099b3..5e2a9f9a 100644 --- a/tests/test_matplotlib_backend.py +++ b/tests/test_matplotlib_backend.py @@ -1,7 +1,6 @@ import time import unittest - -import mock +from unittest.mock import MagicMock from genie_python.matplotlib_backend import ibex_websocket_backend @@ -22,7 +21,7 @@ class TestMatplotlibBackend(unittest.TestCase): def test_WHEN_plotting_thread_fails_to_start_THEN_script_does_not_hang(self): ibex_websocket_backend.WebAggApplication = ErroringWebAggApplication ibex_websocket_backend.ibex_open_plot_window = lambda *a, **k: None - ibex_websocket_backend.Gcf = mock.MagicMock() + ibex_websocket_backend.Gcf = MagicMock() start = time.time() ibex_websocket_backend._BackendIbexWebAgg.show() diff --git a/tests/test_mysql_abstraction_layer.py b/tests/test_mysql_abstraction_layer.py index e27681c2..6a5cb8c0 100644 --- a/tests/test_mysql_abstraction_layer.py +++ b/tests/test_mysql_abstraction_layer.py @@ -16,10 +16,9 @@ import unittest from typing import List -from unittest.mock import patch +from unittest.mock import Mock, patch from hamcrest import assert_that, equal_to -from mock import Mock from mysql.connector.connection import MySQLConnection from mysql.connector.cursor import MySQLCursor from mysql.connector.errors import InternalError diff --git a/tests/test_script_checker.py b/tests/test_script_checker.py index 3b1b86bd..97ba99f5 100644 --- a/tests/test_script_checker.py +++ b/tests/test_script_checker.py @@ -54,7 +54,7 @@ def assertSymbolsDefined(self, script_lines, expected_symbols): def test_GIVEN_end_without_brackets_WHEN_check_THEN_error_message(self): script_lines = [ - "from genie_python import genie as g\n" "def test():\n", + "from genie_python import genie as g\ndef test():\n", " g.begin()\n", " g.end\n", ] @@ -65,14 +65,14 @@ def test_GIVEN_end_without_brackets_WHEN_check_THEN_error_message(self): ) def test_GIVEN_end_as_start_of_another_word_WHEN_check_THEN_no_error_message(self): - script_lines = ["from genie_python import genie as g\n" "def test():\n", " endAngle = 1"] + script_lines = ["from genie_python import genie as g\ndef test():\n", " endAngle = 1"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual(errors, []) def test_GIVEN_end_as_end_of_another_word_WHEN_check_THEN_no_error_message(self): script_lines = [ - "from genie_python import genie as g\n" "def test():\n", + "from genie_python import genie as g\ndef test():\n", " angle_end = 1", ] @@ -82,7 +82,7 @@ def test_GIVEN_end_as_end_of_another_word_WHEN_check_THEN_no_error_message(self) self.assertEqual(errors, []) def test_GIVEN_end_without_brackets_at_start_of_line_WHEN_check_THEN_error_message(self): - script_lines = ["from genie_python import genie as g\n" "def test():\n" " g.end"] + script_lines = ["from genie_python import genie as g\ndef test():\n g.end"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual( @@ -92,7 +92,7 @@ def test_GIVEN_end_without_brackets_at_start_of_line_WHEN_check_THEN_error_messa def test_GIVEN_end_without_brackets_on_line_with_fn_with_brackets_WHEN_check_THEN_error_message( self, ): - script_lines = ["from genie_python import genie as g\n" "g.begin(); g.end "] + script_lines = ["from genie_python import genie as g\ng.begin(); g.end "] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual( @@ -100,7 +100,7 @@ def test_GIVEN_end_without_brackets_on_line_with_fn_with_brackets_WHEN_check_THE ) def test_GIVEN_end_in_string_without_brackets_WHEN_check_THEN_no_message(self): - script_lines = ["def test():\n" ' " a string containing end "'] + script_lines = ['def test():\n " a string containing end "'] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual(errors, []) @@ -202,9 +202,7 @@ def test_GIVEN_variable_assignment_with_g__WHEN_check_THEN_no_message(self): self.assertEqual(errors, []) def test_GIVEN_function_with_g_WHEN_check_THEN_warn_user(self): - script_lines = [ - "from genie_python import genie as g\n" "def test():\n" " g.test_function()\n" - ] + script_lines = ["from genie_python import genie as g\ndef test():\n g.test_function()\n"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual( @@ -214,7 +212,7 @@ def test_GIVEN_function_with_g_WHEN_check_THEN_warn_user(self): def test_GIVEN_2_g_assignments_WHEN_check_THEN_warning_message(self): script_lines = [ - "from genie_python import genie as g\n" "def test():\n" " g=16\n", + "from genie_python import genie as g\ndef test():\n g=16\n", " g=17", ] @@ -224,9 +222,7 @@ def test_GIVEN_2_g_assignments_WHEN_check_THEN_warning_message(self): ) def test_GIVEN_g_non_existing_command_WHEN_call_THEN_error_message(self): - script_lines = [ - "from genie_python import genie as g\n" "def test():\n" " g.aitfor_time(10)" - ] + script_lines = ["from genie_python import genie as g\ndef test():\n g.aitfor_time(10)"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual( @@ -539,8 +535,7 @@ def test_GIVEN_trying_to_index_var_of_optional_type_WHEN_pyright_script_checker_ ): script_lines = [ "from typing import Optional, List\n", - "def get_first_element(elements: Optional[List[int]]) -> int:\n" - " return elements[0]\n", + "def get_first_element(elements: Optional[List[int]]) -> int:\n return elements[0]\n", ] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: @@ -563,7 +558,7 @@ def test_GIVEN_trying_to_iterate_over_var_of_optional_type_WHEN_pyright_script_c ): script_lines = [ "from typing import Optional, List\n", - "def iter_elements(elements: Optional[List[int]]):\n" " for element in elements:\n", + "def iter_elements(elements: Optional[List[int]]):\n for element in elements:\n", " pass\n", ] @@ -573,7 +568,7 @@ def test_GIVEN_trying_to_iterate_over_var_of_optional_type_WHEN_pyright_script_c def test_GIVEN_trying_to_define_function_with_none_type_args_type_WHEN_pyright_script_checker_called_THEN_no_error( self, ): - script_lines = ["def none_func(arg: int = None):\n" " print(arg)\n"] + script_lines = ["def none_func(arg: int = None):\n print(arg)\n"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual(errors, []) @@ -581,7 +576,7 @@ def test_GIVEN_trying_to_define_function_with_none_type_args_type_WHEN_pyright_s def test_GIVEN_trying_to_use_optional_operand__WHEN_pyright_script_checker_called_THEN_no_error( self, ): - script_lines = ["def none_func(arg1: int, arg2: int = None):\n" " print(arg2 + arg1)\n"] + script_lines = ["def none_func(arg1: int, arg2: int = None):\n print(arg2 + arg1)\n"] with CreateTempScriptAndReturnErrors(self.checker, self.machine, script_lines) as errors: self.assertEqual(errors, []) @@ -589,7 +584,7 @@ def test_GIVEN_trying_to_use_optional_operand__WHEN_pyright_script_checker_calle def test_GIVEN_trying_to_use_undefined_variable_WHEN_pyright_script_checker_called_THEN_no_error( self, ): - script_lines = ["def func():\n" " print(arg)\n"] + script_lines = ["def func():\n print(arg)\n"] with CreateTempScriptAndReturnErrors( self.checker, self.machine, script_lines, no_pylint=True diff --git a/tests/test_simulation.py b/tests/test_simulation.py index f2d4955c..93071b8c 100644 --- a/tests/test_simulation.py +++ b/tests/test_simulation.py @@ -18,8 +18,8 @@ import unittest from collections import OrderedDict from datetime import datetime +from unittest.mock import patch -from mock import patch from parameterized import parameterized from genie_python import genie diff --git a/tests/test_utilities.py b/tests/test_utilities.py index 6464bef3..0f349bf6 100644 --- a/tests/test_utilities.py +++ b/tests/test_utilities.py @@ -17,8 +17,7 @@ import json import unittest - -from mock import Mock +from unittest.mock import Mock from genie_python.utilities import ( EnvironmentDetails,