run fix-style and remove import of deprecated function

LLNL · bgunnar5 · Oct 9, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 17, 2023
commit e47196a362b0c06a9d6010110f0ee327da1b5f78
diff --git a/merlin/exceptions/__init__.py b/merlin/exceptions/__init__.py
@@ -42,7 +42,7 @@
     "HardFailException",
     "InvalidChainException",
     "RestartException",
-    "DeepMergeException,"
+    "DeepMergeException,",
 )
 
 

diff --git a/merlin/study/celeryadapter.py b/merlin/study/celeryadapter.py
@@ -205,7 +205,6 @@ def query_celery_workers(spec_worker_names, queues, workers_regex):
     :param `workers_regex`: A list of regexs to filter by
     """
     from merlin.celery import app  # pylint: disable=C0415
-    from merlin.display import tabulate_info  # pylint: disable=C0415
 
     # Ping all workers and grab which ones are running
     workers = get_workers_from_app()

diff --git a/merlin/study/step.py b/merlin/study/step.py
@@ -460,4 +460,4 @@ def execute(self, adapter_config):
         if self.restart and self.get_restart_cmd():
             return ReturnCode(self.mstep.restart(adapter))
 
-        return ReturnCode(self.mstep.execute(adapter))
+        return ReturnCode(self.mstep.execute(adapter))
diff --git a/merlin/utils.py b/merlin/utils.py
@@ -662,4 +662,4 @@ def ws_time_to_dt(ws_time: str) -> datetime:
     hour = int(ws_time[9:11])
     minute = int(ws_time[11:13])
     second = int(ws_time[13:])
-    return datetime(year, month, day, hour=hour, minute=minute, second=second)
+    return datetime(year, month, day, hour=hour, minute=minute, second=second)
diff --git a/tests/unit/study/__init__.py b/tests/unit/study/__init__.py
@@ -26,4 +26,4 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-###############################################################################
+###############################################################################