Update and apply lint stuff

Author: felixhekhorn

pyproject.toml

@@ -71,8 +71,8 @@ pineko = "pineko:command"
 test = "pytest tests"
 bench.cmd = "pytest benchmarks"
 bench.env.NUMBA_DISABLE_JIT.default = "1"
-lint = "pylint src/**/*.py -E"
-lint-warnings = "pylint src/**/*.py --exit-zero"
+lint = "pylint src/ -E"
+lint-warnings = "pylint src/ --exit-zero"
 pineko = "pineko"
 docs = { "shell" = "cd docs; make html" }
 docs-view = { "shell" = "cd docs; make view" }

src/pineko/cli/check.py

@@ -1,6 +1,6 @@
 """CLI entry point to check compatibility."""
 from collections import namedtuple
-from enum import Enum, auto
+from enum import Enum
 
 import click
 import eko

src/pineko/cli/convolute.py

@@ -1,12 +1,8 @@
 """CLI entry point to convolution."""
-import pathlib
-
 import click
 import eko
 import pineappl
 import rich
-import yaml
-from eko import couplings as sc
 
 from .. import evolve
 from ._base import command

src/pineko/cli/scaffold.py

@@ -42,7 +42,7 @@ def check():
         rich.print("[red]Error:[/] Project is not correctly configured.")
         for conf in check_res.confs:
             rich.print(f"[red]Missing entry in conf file: '{conf}'")
-        for key, folder in check_res.folders.items():
+        for folder in check_res.folders.values():
             if not isinstance(folder, dict):
                 rich.print(f"[red]Missing folder:\n{folder}")
             else:

src/pineko/configs.py

@@ -105,10 +105,9 @@ def detect(path=None):
         configs_file = path / name if path.is_dir() else path
         if configs_file.is_file():
             return configs_file
-        else:
-            raise ValueError(
-                "Provided path is not pointing to (or does not contain) the pineko.toml file"
-            )
+        raise ValueError(
+            "Provided path is not pointing to (or does not contain) the pineko.toml file"
+        )
 
     # If no path is provided we need to look after the file.
     # We want to check cwd and all its parent folders (without their subfolders

src/pineko/evolve.py

@@ -11,8 +11,7 @@
 import rich.box
 import rich.panel
 import yaml
-from eko.io.types import EvolutionMethod, ScaleVariationsMethod
-
+from eko.io.types import ScaleVariationsMethod
 
 from . import check, comparator, ekompatibility, version
 
@@ -32,14 +31,11 @@ def sv_scheme(tcard):
     if np.isclose(xif, 1.0):
         if modsv in modsv_list:
             raise ValueError("ModSv is not None but xif is 1.0")
-        else:
-            return None
-    else:
-        # scheme C case
-        if modsv not in modsv_list:
-            return None
-        else:
-            return modsv
+        return None
+    # scheme C case
+    if modsv not in modsv_list:
+        return None
+    return modsv
 
 
 def write_operator_card_from_file(

src/pineko/scaffold.py

@@ -1,7 +1,6 @@
 """Tools related to generation and managing of a pineko project."""
 
 import dataclasses
-import os
 import pathlib
 
 from .configs import NEEDED_FILES, NEEDED_KEYS

src/pineko/theory.py

@@ -14,7 +14,6 @@
 import pineappl
 import rich
 import yaml
-from eko import couplings as sc
 
 from . import check, configs, evolve, parser, theory_card
 
@@ -393,7 +392,6 @@ def fk(self, name, grid_path, tcard, pdf):
                     )
         # loading ekos
         with eko.EKO.edit(eko_filename) as operators:
-
             # Obtain the assumptions hash
             assumptions = theory_card.construct_assumptions(tcard)
             # do it!