Bump black from 22.3.0 to 24.3.0 (#1206)

dependabot[bot] · lbianchi-lbl · web-flow · commit 295119ee2c2e · 2024-03-21T19:06:27.000-05:00
* Bump black from 22.3.0 to 24.3.0 Bumps [black](https://github.com/psf/black) from 22.3.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@22.3.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * Format using Black 24.3.0 * Run Black 24.3.0 also on files outside foqus_lib --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ludovico Bianchi <lbianchi@lbl.gov>
diff --git a/examples/2020-shmtg/CompDemo/Flowsheet-UQ-SM/MEA_SSM_Part2_files/Ensemble_201008152339/Analysis_201009204103/alamo_surrogate_uq.py b/examples/2020-shmtg/CompDemo/Flowsheet-UQ-SM/MEA_SSM_Part2_files/Ensemble_201008152339/Analysis_201009204103/alamo_surrogate_uq.py
@@ -34,6 +34,7 @@
 import math
 import json
 
+
 # ==================================================
 # Function to get input data for interpolation
 # ==================================================
@@ -81,6 +82,8 @@ def genOutputFile(outFileName, outData):
 indexes = [5, 6, 1]
 nInputs = 6
 nOutputs = 3
+
+
 # ==================================================
 # Interpolate function for ALAMO
 # ==================================================
diff --git a/examples/2020-shmtg/CompDemo/Flowsheet-UQ-SM/MEA_SSM_Part2_files/Ensemble_201008152339/Analysis_201009204306/alamo_surrogate_uq.py b/examples/2020-shmtg/CompDemo/Flowsheet-UQ-SM/MEA_SSM_Part2_files/Ensemble_201008152339/Analysis_201009204306/alamo_surrogate_uq.py
@@ -34,6 +34,7 @@
 import math
 import json
 
+
 # ==================================================
 # Function to get input data for interpolation
 # ==================================================
@@ -81,6 +82,8 @@ def genOutputFile(outFileName, outData):
 indexes = [5, 6, 1]
 nInputs = 6
 nOutputs = 3
+
+
 # ==================================================
 # Interpolate function for ALAMO
 # ==================================================
diff --git a/examples/other_files/ML_AI_Plugin/generate_gradient_data.py b/examples/other_files/ML_AI_Plugin/generate_gradient_data.py
@@ -35,9 +35,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model.py b/examples/other_files/ML_AI_Plugin/mea_column_model.py
@@ -19,13 +19,14 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
 
+
 # custom class to define Keras NN layers
 @tf.keras.utils.register_keras_serializable()
 class mea_column_model(tf.keras.layers.Layer):
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform.py b/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform.py
@@ -19,9 +19,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform_json.py b/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform_json.py
@@ -19,9 +19,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform_savedmodel.py b/examples/other_files/ML_AI_Plugin/mea_column_model_customnormform_savedmodel.py
@@ -19,9 +19,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_training.py b/examples/other_files/ML_AI_Plugin/mea_column_model_training.py
@@ -20,9 +20,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
@@ -36,6 +36,7 @@
 # 4) Back to create_model() to compile and train model
 # 5) Back to code at end of file to save, load and test model
 
+
 # custom class to define Keras NN layers
 @tf.keras.utils.register_keras_serializable()
 class mea_column_model(tf.keras.layers.Layer):
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform.py b/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform.py
@@ -20,9 +20,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform_json.py b/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform_json.py
@@ -20,9 +20,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform_savedmodel.py b/examples/other_files/ML_AI_Plugin/mea_column_model_training_customnormform_savedmodel.py
@@ -20,9 +20,9 @@
 
 # set seed values for reproducibility
 os.environ["PYTHONHASHSEED"] = "0"
-os.environ[
-    "CUDA_VISIBLE_DEVICES"
-] = ""  # changing "" to "0" or "-1" may solve import issues
+os.environ["CUDA_VISIBLE_DEVICES"] = (
+    ""  # changing "" to "0" or "-1" may solve import issues
+)
 np.random.seed(46)
 rn.seed(1342)
 tf.random.set_seed(62)
diff --git a/foqus_lib/framework/graph/node.py b/foqus_lib/framework/graph/node.py
@@ -267,9 +267,9 @@ def setCodeStrings(self):
         self.codeString[27] = "Can't read variable in results (see log)"
         self.codeString[50] = "Node script interrupt exception"
         self.codeString[61] = "Unknow type string"
-        self.codeString[
-            self.ERROR_CONFIGURATION_MISSING
-        ] = "Model Missing Configuration"
+        self.codeString[self.ERROR_CONFIGURATION_MISSING] = (
+            "Model Missing Configuration"
+        )
         self.codeString[self.ERROR_NODE_FLOWSHEET] = "Node cannot be set to a flowsheet"
 
 
diff --git a/foqus_lib/framework/pymodel/heat_integration.py b/foqus_lib/framework/pymodel/heat_integration.py
@@ -866,9 +866,9 @@ def run(self):
         # pull GAMS results in the node variables
         costUtiHr = float((f.readline()).strip())  # utility cost (hourly) ($MM/hr)
         costUtiYr = costUtiHr * timeOpe / 1e6  # utility cost (annually) ($MM/yr)
-        self.outputs[
-            "Utility.Cost"
-        ].value = costUtiYr  # utility cost (annually) ($MM/yr)
+        self.outputs["Utility.Cost"].value = (
+            costUtiYr  # utility cost (annually) ($MM/yr)
+        )
         areaHx = float((f.readline()).strip())  # heat exchanger area (m^2)
         self.outputs["Heat.Exchanger.Area"].value = areaHx  # heat exchanger area (m^2)
         numShell_2 = numpy.ceil(
diff --git a/foqus_lib/framework/sim/turbineConfiguration.py b/foqus_lib/framework/sim/turbineConfiguration.py
@@ -124,9 +124,9 @@ def setCodeStrings(self):
         self.codeString[5] = "Gateway SSL error (probably wrong address)"
         self.codeString[7] = "Unknown Socket Error"
         self.codeString[10] = "Gateway unknown http error"
-        self.codeString[
-            11
-        ] = "Gateway 401 authentication error (bad user name or password)"
+        self.codeString[11] = (
+            "Gateway 401 authentication error (bad user name or password)"
+        )
         self.codeString[12] = "Gateway 404 page not found error"
         self.codeString[13] = "Gateway 403 access forbidden"
         self.codeString[14] = "Gateway 400 bad request"
@@ -177,9 +177,9 @@ def setCodeStrings(self):
         )
         self.codeString[310] = "Could not update simulation, it does not exist"
         self.codeString[350] = "Job failed"
-        self.codeString[
-            351
-        ] = "Job failed to converge (may have also been another error)"
+        self.codeString[351] = (
+            "Job failed to converge (may have also been another error)"
+        )
         self.codeString[352] = "Job failed due to run timeout"
         self.codeString[353] = "Job failed due to max wait timeout"
         self.codeString[354] = "Job failed could not get status"
diff --git a/foqus_lib/framework/surrogate/keras_nn.py b/foqus_lib/framework/surrogate/keras_nn.py
@@ -301,9 +301,9 @@ def run(self):
         """
         # set seed values for reproducibility
         os.environ["PYTHONHASHSEED"] = "0"
-        os.environ[
-            "CUDA_VISIBLE_DEVICES"
-        ] = ""  # changing "" to "0" or "-1" may solve import issues
+        os.environ["CUDA_VISIBLE_DEVICES"] = (
+            ""  # changing "" to "0" or "-1" may solve import issues
+        )
         np_seed = self.options["numpy_seed"].value
         rn_seed = self.options["random_seed"].value
         tf_seed = self.options["tensorflow_seed"].value
diff --git a/foqus_lib/framework/uq/RSInference.py b/foqus_lib/framework/uq/RSInference.py
@@ -711,9 +711,9 @@ def getplotdat(mfile, variableInputNames, xmin, xmax, plotvars, show=None):
         zlim = [zmin, zmax]
         ylabel = ["Probabilities"] * len(xlabel)
         sb_indices = np.reshape(np.arange(1, nshow**2 + 1), [nshow, nshow])
-        sb_indices[
-            np.tril(sb_indices, -1) > 0
-        ] = -1  # set lower triangular elements to -1
+        sb_indices[np.tril(sb_indices, -1) > 0] = (
+            -1
+        )  # set lower triangular elements to -1
 
         return (xdat, ydat, zdat, xlabel, ylabel, xlim, ylim, zlim, sb_indices, loglik)
 
diff --git a/foqus_lib/gui/ouu/ouuSetupFrame.py b/foqus_lib/gui/ouu/ouuSetupFrame.py
@@ -1015,9 +1015,9 @@ def analyze(self):
                     Nrs = (
                         self.z4SubsetSize_spin.value()
                     )  # add spinbox to get number of samples to generate RS
-                    x4sample[
-                        "nsamplesRS"
-                    ] = Nrs  # TO DO: make sure spinbox has M4+1 as min and x4sample's sample size as max
+                    x4sample["nsamplesRS"] = (
+                        Nrs  # TO DO: make sure spinbox has M4+1 as min and x4sample's sample size as max
+                    )
 
             #  TODO: Get rid of usebobyqa option. Behavior should be as if usebobyqa is always false
             # TODO: Change GUI to display optimizer and optimizing with bobyqa
diff --git a/foqus_lib/gui/tests/test_plugins.py b/foqus_lib/gui/tests/test_plugins.py
@@ -63,6 +63,7 @@ def test_model_files_are_present(model_files: List[Path]):
 # ----------------------------------------------------------------------------
 # parent class to run flowsheet, starting from main FOQUS session
 
+
 # use the ML_AI session since it already exists, will load and run plugins here
 @pytest.fixture(
     scope="class", params=["other_files/ML_AI_Plugin/mea_column_model.foqus"]
diff --git a/pytest_qt_extras.py b/pytest_qt_extras.py
@@ -206,8 +206,7 @@ def instrument(target, signal_begin=None, signal_end=None):
     assert callable(func), f"{func} must be callable"
     _logger.debug(dict(target=target, name=name, owner=owner, func=func))
 
-    def _do_nothing(*args, **kwargs):
-        ...
+    def _do_nothing(*args, **kwargs): ...
 
     _patched_callable = _wrap_callable(
         func,
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -17,7 +17,7 @@ pytest<8.1
 ### coverage
 coverage
 pytest-cov
-black==22.3.0
+black==24.3.0
 addheader==0.3.2
 
 # pytest-qt-extras
