Merge pull request #220 from h2020charisma/tox-pin-versions

Tox pin versions

Author: kerberizer

src/ramanchada2/protocols/calibration/calibration_component.py

@@ -1,10 +1,10 @@
 import logging
+from typing import Literal
 
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 from matplotlib.axes import Axes
-from typing import Literal
 
 from ramanchada2.misc.plottable import Plottable
 from ramanchada2.spectrum import Spectrum

src/ramanchada2/protocols/calibration/calibration_model.py

@@ -2,6 +2,7 @@
 import warnings
 
 from typing import Dict, Literal
+
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 

src/ramanchada2/protocols/calibration/xcalibration.py

@@ -1,18 +1,20 @@
+import json
 import logging
-from typing import Literal, Dict
+from typing import Dict, Literal
+
 import numpy as np
-from scipy.interpolate import RBFInterpolator, PchipInterpolator, CubicSpline
 import pandas as pd
+from scipy.interpolate import CubicSpline, PchipInterpolator, RBFInterpolator
+
+from ramanchada2.misc.utils import find_closest_pairs_idx
 
 from ramanchada2.misc.utils.matchsets import (
     cost_function_position,
     match_peaks,
     match_peaks_cluster,
 )
-from ramanchada2.misc.utils import find_closest_pairs_idx
 from ramanchada2.spectrum import Spectrum
 from .calibration_component import CalibrationComponent
-import json
 
 logger = logging.getLogger(__name__)
 

tests/protocols/test_calibrationmodel.py

@@ -117,7 +117,7 @@ def __init__(self):
                 should_fit=fit_peaks,
                 match_method="cluster",
                 si_profile=self.si_profile,
-                interpolator_method="pchip"
+                interpolator_method="pchip",
             )
             assert len(self.calmodel.components) == 2
             # print(self.calmodel.components[0])
@@ -154,8 +154,8 @@ def test_laser_zeroing(setup_module):
         setup_module.spe_sil, spe_units="cm-1"
     )
     spe_test = spe_sil_calib.trim_axes(
-        method='x-axis',
-        boundaries=(si_peak-50, si_peak+50))
+        method="x-axis", boundaries=(si_peak - 50, si_peak + 50)
+    )
     find_kw = {"wlen": 200, "width": 1, "sharpening": None}
     find_kw["prominence"] = (
         spe_test.y_noise_MAD() * setup_module.calmodel.prominence_coeff
@@ -193,8 +193,13 @@ def test_laser_zeroing(setup_module):
         spe_test_necalibrated_only.plot(
             ax=axsifit, label="Si (Ne calibrated only)", fmt=":"
         )
-        axsifit.axvline(x=si_peak_nm, color='black', linestyle=':', linewidth=2,
-                        label="Si peak {:.3f} nm".format(si_peak_nm))
+        axsifit.axvline(
+            x=si_peak_nm,
+            color="black",
+            linestyle=":",
+            linewidth=2,
+            label="Si peak {:.3f} nm".format(si_peak_nm),
+        )
         axsifit.grid()
         print(df.sort_values(by="amplitude", ascending=False).head())
         plt.grid()
@@ -237,7 +242,9 @@ def compare_calibrated_spe(setup_module, spectra, name="calibration"):
         # check if x is monotonically increasing
         # assert np.all(np.diff(spe.x) > 0)
         assert not np.any(np.isnan(spe.x)), "Array contains NaN values!"
-        spe_norm = resample_spline(_spe.normalize(strategy="unity_area"), _min, _max, 1000)
+        spe_norm = resample_spline(
+            _spe.normalize(strategy="unity_area"), _min, _max, 1000
+        )
         spe_y_original.append(spe_norm.y)
         spe_c = setup_module.calmodel.apply_calibration_x(_spe, spe_units="cm-1")
         assert not np.any(np.isnan(spe_c.x)), "Array contains NaN values!"

tox.ini

@@ -48,12 +48,12 @@ commands = coverage erase
 
 [testenv:mypy]
 base_python = python3.13
-deps = mypy
+deps = mypy==1.15.*
 commands = mypy src tests
 
 [testenv:black]
 base_python = python3.13
-deps=black
+deps = black==25.1.*
 commands =
     black \
         scripts \
@@ -68,7 +68,7 @@ commands =
 
 [testenv:usort]
 base_python = python3.13
-deps=usort
+deps = usort==1.0.*
 commands =
     usort format \
         scripts \
@@ -86,7 +86,7 @@ commands =
 
 [testenv:flake8]
 base_python = python3.13
-deps = flake8
+deps = flake8==7.3.*
 commands = flake8 scripts src tests
 
 [testenv:docs]