black and flake8 run

slaclab · Nov 22, 2023 · dc090fd · dc090fd
1 parent f7acf40
commit dc090fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lcls_tools/common/devices/reader.py b/lcls_tools/common/devices/reader.py
@@ -1,6 +1,5 @@
 import os
 import yaml
-import numpy as np
 from typing import Union, Optional, Any, Dict
 from pydantic import ValidationError
 from lcls_tools.common.devices.screen import Screen, ScreenCollection
@@ -35,23 +34,25 @@ def _device_data(
             with open(location, "r") as device_file:
                 device_data = yaml.safe_load(device_file)
                 return device_data
-       
+
         except FileNotFoundError:
             print(f"Could not find yaml file for area: {area}")
             return None
 
     else:
         print("Please provide a machine area to create a magnet from.")
         return None
-
+
+
 def create_beampath():
     raise NotImplementedError
 
+
 def create_magnet(
     area: str = None, name: str = None
 ) -> Union[None, Magnet, MagnetCollection]:
     device_data = _device_data(area=area)
-    if not device_data: 
+    if not device_data:
         return None
 
     if name:
@@ -61,7 +62,7 @@ def create_magnet(
             magnet_data.update({"name": name})
             return Magnet(**magnet_data)
         except KeyError:
-            print(f'Magnet {name} does not exist in {area}.')
+            print(f"Magnet {name} does not exist in {area}.")
         except ValidationError as field_error:
             print(field_error)
             return None
@@ -73,8 +74,8 @@ def create_screen(
     area: str = None, name: str = None
 ) -> Union[None, Screen, ScreenCollection]:
     device_data = _device_data(area=area)
-    if not device_data: 
-       return None
+    if not device_data:
+        return None
 
     if name:
         try:
@@ -83,11 +84,9 @@ def create_screen(
             screen_data.update({"name": name})
             return Screen(**screen_data)
         except KeyError:
-            print(f'Screen {name} does not exist in {area}.')
+            print(f"Screen {name} does not exist in {area}.")
         except ValidationError as field_error:
             print(field_error)
             return None
     else:
         return ScreenCollection(**device_data)
-
-
diff --git a/tests/unit_tests/lcls_tools/common/devices/test_reader.py b/tests/unit_tests/lcls_tools/common/devices/test_reader.py
@@ -13,9 +13,7 @@ def setUp(self) -> None:
         # set up patch so that each magnet is constructured with ALL ctrl options
         self.ctrl_options_patch = patch("epics.PV.get_ctrlvars", new_callable=MagicMock)
         self.mock_ctrl_options = self.ctrl_options_patch.start()
-        self.mock_ctrl_options.return_value = {
-            "enum_strs": tuple("READY")
-        }
+        self.mock_ctrl_options.return_value = {"enum_strs": tuple("READY")}
         return super().setUp()
 
     def test_bad_file_location_raises_when_finding(self):