19 files changed, 38 insertions, 32 deletions

diff --git a/test/sca/conftest.py b/test/sca/conftest.py
index a7a21d6..4d312a3 100644
--- a/test/sca/conftest.py
+++ b/test/sca/conftest.py
@@ -1,10 +1,9 @@
 from typing import Dict
 
+import matplotlib.pyplot as plt
 import pytest
 from importlib_resources import files, as_file
 
-import matplotlib.pyplot as plt
-
 from pyecsca.sca import Trace
 
 cases: Dict[str, int] = {}
diff --git a/test/sca/perf_combine.py b/test/sca/perf_combine.py
index 8ac274c..07b201e 100644
--- a/test/sca/perf_combine.py
+++ b/test/sca/perf_combine.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 import click
-
 from importlib_resources import files, as_file
-from test.utils import Profiler
+
 import test.data.sca
 from pyecsca.sca import (
     InspectorTraceSet,
@@ -13,6 +12,7 @@ from pyecsca.sca import (
     subtract,
     conditional_average,
 )
+from test.utils import Profiler
 
 
 @click.command()
diff --git a/test/sca/perf_stacked_combine.py b/test/sca/perf_stacked_combine.py
index 024370e..cf0b3ad 100644
--- a/test/sca/perf_stacked_combine.py
+++ b/test/sca/perf_stacked_combine.py
@@ -1,13 +1,13 @@
 from __future__ import annotations
 
+import json
+import sys
 from argparse import Namespace, FileType, ArgumentParser
 from contextlib import contextmanager, nullcontext
-from itertools import product
-from pathlib import Path
 from copy import copy
 from csv import DictWriter
-import json
-import sys
+from itertools import product
+from pathlib import Path
 from typing import (Any, Callable, Dict, List, Optional, TextIO,
                     Tuple, Union, cast)
 from warnings import warn
diff --git a/test/sca/perf_zvp.py b/test/sca/perf_zvp.py
index 34090df..eb390e8 100644
--- a/test/sca/perf_zvp.py
+++ b/test/sca/perf_zvp.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 import click
 
-from pyecsca.ec.mod.gmp import has_gmp
+from pyecsca.ec.formula.unroll import unroll_formula
 from pyecsca.ec.mod.flint import has_flint
+from pyecsca.ec.mod.gmp import has_gmp
+from pyecsca.ec.params import get_params
 from pyecsca.misc.cfg import TemporaryConfig
 from pyecsca.sca.re.zvp import zvp_points, map_to_affine
-from pyecsca.ec.formula.unroll import unroll_formula
-from pyecsca.ec.params import get_params
 from test.utils import Profiler
 
 
diff --git a/test/sca/test_align.py b/test/sca/test_align.py
index ad45d86..e354e37 100644
--- a/test/sca/test_align.py
+++ b/test/sca/test_align.py
@@ -1,6 +1,8 @@
 import numpy as np
 import pytest
 from importlib_resources import files, as_file
+
+import test.data.sca
 from pyecsca.sca import (
     align_correlation,
     align_peaks,
@@ -10,7 +12,6 @@ from pyecsca.sca import (
     Trace,
     InspectorTraceSet,
 )
-import test.data.sca
 
 
 def test_align():
diff --git a/test/sca/test_attacks.py b/test/sca/test_attacks.py
index b147dfe..84396ec 100644
--- a/test/sca/test_attacks.py
+++ b/test/sca/test_attacks.py
@@ -1,11 +1,12 @@
-import pytest
 import random
 
+import pytest
+
 from pyecsca.ec.mult import LTRMultiplier
-from pyecsca.sca.attack.DPA import DPA
 from pyecsca.sca.attack.CPA import CPA
-from pyecsca.sca.target import LeakageTarget
+from pyecsca.sca.attack.DPA import DPA
 from pyecsca.sca.attack.leakage_model import HammingWeight, NormalNoice
+from pyecsca.sca.target import LeakageTarget
 
 
 @pytest.fixture()
diff --git a/test/sca/test_combine.py b/test/sca/test_combine.py
index 5c4285b..7c5e316 100644
--- a/test/sca/test_combine.py
+++ b/test/sca/test_combine.py
@@ -1,4 +1,5 @@
 from collections import namedtuple
+
 import numpy as np
 import pytest
 
diff --git a/test/sca/test_leakage_models.py b/test/sca/test_leakage_models.py
index 08a3b07..b40da32 100644
--- a/test/sca/test_leakage_models.py
+++ b/test/sca/test_leakage_models.py
@@ -1,10 +1,11 @@
+import pytest
+
 from pyecsca.ec.context import local, DefaultContext
 from pyecsca.ec.formula import FormulaAction, OpResult
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.mult import LTRMultiplier
 from pyecsca.ec.op import OpType
 from pyecsca.sca.attack.leakage_model import Identity, Bit, Slice, HammingWeight, HammingDistance, BitLength
-import pytest
 
 
 def test_identity():
diff --git a/test/sca/test_plot.py b/test/sca/test_plot.py
index 78e1098..6ec201c 100644
--- a/test/sca/test_plot.py
+++ b/test/sca/test_plot.py
@@ -1,6 +1,6 @@
-import numpy as np
 import holoviews as hv
 import matplotlib as mpl
+import numpy as np
 import pytest
 
 from pyecsca.sca.trace import Trace
diff --git a/test/sca/test_rpa.py b/test/sca/test_rpa.py
index 8d843a4..7027a7d 100644
--- a/test/sca/test_rpa.py
+++ b/test/sca/test_rpa.py
@@ -1,12 +1,12 @@
 from functools import partial
+from math import isqrt
 
 import pytest
-from math import isqrt
 
 from pyecsca.ec.context import local
-from pyecsca.ec.model import ShortWeierstrassModel
 from pyecsca.ec.curve import EllipticCurve
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
+from pyecsca.ec.model import ShortWeierstrassModel
 from pyecsca.ec.mult import (
     LTRMultiplier,
     RTLMultiplier,
diff --git a/test/sca/test_sampling.py b/test/sca/test_sampling.py
index 062e726..f7791e0 100644
--- a/test/sca/test_sampling.py
+++ b/test/sca/test_sampling.py
@@ -1,4 +1,5 @@
 import numpy as np
+
 from pyecsca.sca import (
     Trace,
     downsample_average,
diff --git a/test/sca/test_stacked_combine.py b/test/sca/test_stacked_combine.py
index 5ef355c..9e35967 100644
--- a/test/sca/test_stacked_combine.py
+++ b/test/sca/test_stacked_combine.py
@@ -1,7 +1,7 @@
+import numpy as np
 import pytest
 from numba import cuda
 
-import numpy as np
 from pyecsca.sca import StackedTraces, GPUTraceManager, CombinedTrace, CPUTraceManager
 
 TPB = 128
diff --git a/test/sca/test_stacked_traces.py b/test/sca/test_stacked_traces.py
index c0984cb..d7dcb4a 100644
--- a/test/sca/test_stacked_traces.py
+++ b/test/sca/test_stacked_traces.py
@@ -1,12 +1,12 @@
-import pytest
 import numpy as np
+import pytest
+
 from pyecsca.sca import (
     Trace,
     StackedTraces,
     TraceSet,
 )
 
-
 TRACE_COUNT = 2 ** 10
 TRACE_LEN = 2 ** 15
 
diff --git a/test/sca/test_target.py b/test/sca/test_target.py
index a5a58e4..8ead8e7 100644
--- a/test/sca/test_target.py
+++ b/test/sca/test_target.py
@@ -13,6 +13,7 @@ from pyecsca.ec.mod import Mod
 from pyecsca.ec.mult import LTRMultiplier
 from pyecsca.ec.params import get_params
 from pyecsca.ec.signature import SignatureResult, ECDSA_SHA1
+from pyecsca.sca.attack import HammingWeight
 from pyecsca.sca.target import (
     BinaryTarget,
     SimpleSerialTarget,
@@ -20,7 +21,6 @@ from pyecsca.sca.target import (
     has_pyscard,
     LeakageTarget,
 )
-from pyecsca.sca.attack import HammingWeight
 from pyecsca.sca.target.ectester import (
     KeyAgreementEnum,
     SignatureEnum,
diff --git a/test/sca/test_test.py b/test/sca/test_test.py
index 6925eb0..7e239ac 100644
--- a/test/sca/test_test.py
+++ b/test/sca/test_test.py
@@ -1,4 +1,5 @@
 from collections import namedtuple
+
 import numpy as np
 import pytest
 
diff --git a/test/sca/test_trace.py b/test/sca/test_trace.py
index bea68f2..203c87f 100644
--- a/test/sca/test_trace.py
+++ b/test/sca/test_trace.py
@@ -1,4 +1,5 @@
 import numpy as np
+
 from pyecsca.sca import Trace
 
 
diff --git a/test/sca/test_traceset.py b/test/sca/test_traceset.py
index 5a3ed52..60e74be 100644
--- a/test/sca/test_traceset.py
+++ b/test/sca/test_traceset.py
@@ -2,11 +2,10 @@ import os.path
 import shutil
 import tempfile
 
+import numpy as np
 import pytest
 from importlib_resources import files, as_file
 
-import numpy as np
-
 import test.data.sca
 from pyecsca.sca import (
     TraceSet,
diff --git a/test/sca/test_tree.py b/test/sca/test_tree.py
index f3e87cd..58537f5 100644
--- a/test/sca/test_tree.py
+++ b/test/sca/test_tree.py
@@ -2,9 +2,10 @@ import random
 from collections import OrderedDict
 from copy import deepcopy
 
-from pyecsca.sca.re.tree import Tree, Map
 import pandas as pd
 
+from pyecsca.sca.re.tree import Tree, Map
+
 
 def test_map():
     cfgs = {"a", "b"}
diff --git a/test/sca/test_zvp.py b/test/sca/test_zvp.py
index f266e55..6a5f2e9 100644
--- a/test/sca/test_zvp.py
+++ b/test/sca/test_zvp.py
@@ -1,7 +1,10 @@
 import pytest
+from sympy import symbols, Poly, sympify, FF
 
+from pyecsca.ec.context import local, DefaultContext
 from pyecsca.ec.coordinates import AffineCoordinateModel
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.formula.unroll import unroll_formula
+from pyecsca.ec.mod import mod
 from pyecsca.ec.mult import LTRMultiplier, AccumulationOrder
 from pyecsca.ec.point import Point
 from pyecsca.sca.re.zvp import (
@@ -17,9 +20,6 @@ from pyecsca.sca.re.zvp import (
     solve_easy_dcp,
     solve_hard_dcp,
 )
-from pyecsca.ec.formula.unroll import unroll_formula
-from pyecsca.ec.context import local, DefaultContext
-from sympy import symbols, Poly, sympify, FF
 
 
 @pytest.fixture(params=["add-2007-bl", "add-2015-rcb", "dbl-2007-bl"])