Merge pull request #132 from AMReX-Codes/fix_bokeh

bokeh 3.4 needs plot.scatter instead of plot.circle

suite.py

@@ -855,7 +855,7 @@ def hover_tool():
                 plot = figure(**settings)
                 plot.add_tools(hover_tool())
 
-                plot.circle("date", "runtime", source=source)
+                plot.scatter("date", "runtime", source=source)
                 plot.xaxis.axis_label = "Date"
                 plot.yaxis.axis_label = "Runtime (s)"
 
@@ -1059,7 +1059,7 @@ def build_tools(self, test_list):
 
         for t in ctools:
             self.log.log(f"building {t}...")
-            comp_string, rc = self.build_c(opts="DEBUG=FALSE USE_MPI=FALSE EBASE={}".format(t))
+            comp_string, rc = self.build_c(opts=f"DEBUG=FALSE USE_MPI=FALSE EBASE={t}")
             if not rc == 0:
                 self.log.fail("unable to continue, tools not able to be built")
 
@@ -1212,7 +1212,7 @@ def cmake_clean( self, name, path ):
             shutil.rmtree(builddir)
 
         if os.path.isdir(installdir):
-                shutil.rmtree(installdir)
+            shutil.rmtree(installdir)
 
         return
 
@@ -1299,7 +1299,7 @@ def build_test_cmake(self, test, opts="",  outfile=None):
                 path_to_bin = None
                 cmake_output_dir = "CMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH="
                 cmake_cache = os.path.join(self.source_build_dir, "CMakeCache.txt")
-                with open(cmake_cache, "r") as cc:
+                with open(cmake_cache) as cc:
                     for ln in cc.readlines():
                         if ln.startswith(cmake_output_dir):
                             path_to_bin = ln[len(cmake_output_dir):].strip()

test_report.py

@@ -381,7 +381,7 @@ def report_single_test(suite, test, tests, failure_msg=None):
                     if suite.verbose > 0:
                         for btf in test.backtrace:
                             suite.log.warn(f"+++ Next backtrace: {btf} +++")
-                            suite.log.warn(open(btf, 'r').read())
+                            suite.log.warn(open(btf).read())
                             suite.log.warn(f"+++ End of backtrace: {btf} +++\n")
                     suite.log.testfail(f"{test.name} CRASHED (backtraces produced)")
                 else:

test_util.py

@@ -245,7 +245,7 @@ def fail(self, string):
         def email_developers():
             pattern = r'(\/.*?\.out)'
             filename = re.findall(pattern, string)
-            error_file = open(filename[0], "r") if filename else None
+            error_file = open(filename[0]) if filename else None
             error_string = error_file.read().encode("utf-8") if error_file else ""
 
             emailto = ",".join(self.suite.emailTo)