lint: complied with flake8, added some exceptions.

Author: pabloitu

floatcsep/commands/main.py

@@ -90,7 +90,7 @@ def run(config: str, **kwargs) -> None:
     exp.make_repr()
 
     log.info("Finalized")
-    log.debug(f"-------- END OF RUN --------")
+    log.debug("-------- END OF RUN --------")
 
 
 def plot(config: str, **kwargs) -> None:

floatcsep/evaluation.py

@@ -1,6 +1,6 @@
 import datetime
 import os
-from typing import Dict, Callable, Union, Sequence, List, Optional, Any
+from typing import Dict, Callable, Union, Sequence, List, Any
 
 from csep.core.catalogs import CSEPCatalog
 from csep.core.forecasts import GriddedForecast
@@ -297,7 +297,7 @@ def plot_results(
                             pyplot.show()
                 # Single model test plots (e.g., test distribution)
                 # todo: handle this more elegantly
-                except AttributeError as msg:
+                except AttributeError:
                     if self.type in ["consistency", "comparative"]:
                         for time_str in timewindow:
                             results = self.read_results(time_str, models)
@@ -311,7 +311,9 @@ def plot_results(
                                 ax = func(result, plot_args=fargs, **fkwargs, show=False)
                                 if "code" in fargs:
                                     exec(fargs["code"])
-                                pyplot.savefig(fig_path, dpi=dpi)
+                                fig = ax.get_figure()
+                                fig.savefig(fig_path, dpi=dpi)
+
                                 if show:
                                     pyplot.show()
 

floatcsep/experiment.py

@@ -88,22 +88,6 @@ class Experiment:
         intervals=1, region='csep-italy', ...)``
     """
 
-    """
-    Data management
-    
-    Model:
-        - FILE   - read from file, scale in runtime             
-                 - drop to db, scale from function in runtime   
-        - CODE  - run, read from file              
-                - run, store in db, read from db   
-    
-    TEST:
-        - use forecast from runtime
-        - read forecast from file (TD)
-          (does not make sense for TI (too much FS space) unless is already
-           dropped to DB)
-    """
-
     def __init__(
         self,
         name: str = None,
@@ -155,7 +139,7 @@ def __init__(
             log.info(f"Logging at {self.registry.logger}")
             add_fhandler(self.registry.logger)
 
-        log.debug(f"-------- BEGIN OF RUN --------")
+        log.debug("-------- BEGIN OF RUN --------")
         log.info(f"Setting up experiment {self.name}:")
         log.info(f"\tStart: {self.start_date}")
         log.info(f"\tEnd: {self.end_date}")
@@ -554,7 +538,7 @@ def run(self) -> None:
             numpy.random.seed(self.seed)
 
         self.task_graph.run()
-        log.info(f"Calculation completed")
+        log.info("Calculation completed")
         log.debug("Post-run forecast registry")
         self.registry.log_forecast_trees(self.timewindows)
         log.debug("Post-run result summary")
@@ -687,8 +671,6 @@ def from_yml(cls, config_yml: str, repr_dir=None, **kwargs):
             # experiment configuration file
             _dict = yaml.load(yml, NoAliasLoader)
             _dir_yml = dirname(config_yml)
-            # uses yml path and append if a rel/abs path is given in config.
-            _path = _dict.get("path", "")
 
             # Only ABSOLUTE PATH
             _dict["path"] = abspath(join(_dir_yml, _dict.get("path", "")))
@@ -750,13 +732,10 @@ def test_stat(test_orig, test_repr):
     def get_results(self):
 
         win_orig = timewindow2str(self.original.timewindows)
-        win_repr = timewindow2str(self.reproduced.timewindows)
 
         tests_orig = self.original.tests
-        tests_repr = self.reproduced.tests
 
         models_orig = [i.name for i in self.original.models]
-        models_repr = [i.name for i in self.reproduced.models]
 
         results = dict.fromkeys([i.name for i in tests_orig])
 
@@ -809,13 +788,10 @@ def get_hash(filename):
     def get_filecomp(self):
 
         win_orig = timewindow2str(self.original.timewindows)
-        win_repr = timewindow2str(self.reproduced.timewindows)
 
         tests_orig = self.original.tests
-        tests_repr = self.reproduced.tests
 
         models_orig = [i.name for i in self.original.models]
-        models_repr = [i.name for i in self.reproduced.models]
 
         results = dict.fromkeys([i.name for i in tests_orig])
 

floatcsep/postprocess/plot_handler.py

@@ -1,7 +1,6 @@
 import importlib.util
 import logging
 import os
-from datetime import datetime
 from typing import TYPE_CHECKING, Union
 
 from cartopy import crs as ccrs

floatcsep/postprocess/reporting.py

@@ -57,7 +57,7 @@ def generate_report(experiment, timewindow=-1):
     # Generate catalog plot
     if experiment.catalog_repo.catalog is not None:
         report.add_figure(
-            f"Input catalog",
+            "Input catalog",
             [
                 experiment.registry.get_figure("main_catalog_map"),
                 experiment.registry.get_figure("main_catalog_time"),
@@ -434,7 +434,7 @@ def add_table(self, data, use_header=True):
             table (str): this can be added to subheading or other cell if
                 desired.
         """
-        table = ['<div class="table table-striped">', f"<table>"]
+        table = ['<div class="table table-striped">', "<table>"]
 
         def make_header(row_):
             header = ["<tr>"]

floatcsep/utils/accessors.py

@@ -104,7 +104,7 @@ def download_file(url: str, filename: str) -> None:
     if total_size:
         print(f"Downloading file with size of {total_size / block_size:.3f} kB")
     else:
-        print(f"Downloading file with unknown size")
+        print("Downloading file with unknown size")
     with open(filename, "wb") as f:
         for data in r.iter_content(chunk_size=block_size):
             download_size += len(data)

floatcsep/utils/helpers.py

@@ -30,7 +30,6 @@
 from csep.core.regions import CartesianGrid2D
 from csep.models import EvaluationResult
 from csep.utils.calc import cleaner_range
-from csep.utils.plots import plot_spatial_dataset
 
 # floatCSEP libraries
 import floatcsep.utils.accessors

pyproject.toml

@@ -13,3 +13,7 @@ testpaths = [
 line-length = 96
 skip-string-normalization = false
 target-version = ["py39", "py310", "py311"]
+
+[tool.flake8]
+ignore = ["E203", "W503", "F401"]
+max-line-length = 96