Merge pull request #290 from IFCA-Advanced-Computing/feature-update-dependant-versions

Update dependant versions

Author: Jaime Céspedes Sisniega

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   python-version:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: ['3.9',
@@ -27,14 +27,14 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install setuptools==68.2.2 tox==3.24.5 tox-gh-actions==2.9.1
+          python -m pip install setuptools==68.2.2 tox==4.12.0 tox-gh-actions==3.2.0
 
       - name: Optional - Install frouros (only used by linters)
         if: matrix.python-version == 3.9
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          pip install "pytest>=7.1.2,<7.2"
+          pip install "pytest>=7.4.4,<7.5"
           pip install -e .
 
       - name: Run tox

.github/workflows/code_coverage.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   code-coverage:
     if: github.event.pull_request.merged == true
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

.readthedocs.yaml

@@ -7,7 +7,7 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
     python: "3.9"
 

frouros/callbacks/base.py

@@ -57,14 +57,14 @@ def set_detector(self, detector) -> None:
     #         )
     #     self._detector = value
 
-    def on_fit_start(self, X: np.ndarray) -> None:  # noqa: N803
+    def on_fit_start(self, X: np.ndarray) -> None:  # noqa: N803, B027
         """On fit start method.
 
         :param X: reference data
         :type X: numpy.ndarray
         """
 
-    def on_fit_end(self, X: np.ndarray) -> None:  # noqa: N803
+    def on_fit_end(self, X: np.ndarray) -> None:  # noqa: N803, B027
         """On fit end method.
 
         :param X: reference data

frouros/datasets/base.py

@@ -99,10 +99,17 @@ def _remove_temporal_file(self) -> None:
 
     def _request_file(self, url: str) -> requests.models.Response:
         logger.info("Trying to download data from %s to %s", url, self._file_path)
-        request_head = requests.head(url=url)
+        request_head = requests.head(
+            url=url,
+            timeout=10,
+        )
         if not request_head.ok:
             raise requests.exceptions.RequestException()
-        request_response = requests.get(url=url, stream=True)
+        request_response = requests.get(
+            url=url,
+            stream=True,
+            timeout=10,
+        )
         request_response.raise_for_status()
         return request_response
 
@@ -175,7 +182,7 @@ def __repr__(self) -> str:
         )
 
 
-class BaseDatasetGenerator(abc.ABC):
+class BaseDatasetGenerator(abc.ABC):  # noqa: B024
     """Abstract class representing a dataset generator."""
 
     def __init__(self, seed: Optional[int] = None) -> None:

frouros/detectors/concept_drift/base.py

@@ -9,7 +9,7 @@
 from frouros.utils.checks import check_callbacks
 
 
-class BaseConceptDriftConfig(abc.ABC):
+class BaseConceptDriftConfig(abc.ABC):  # noqa: B024
     """Abstract class representing a concept drift configuration class."""
 
     def __init__(

frouros/detectors/concept_drift/streaming/statistical_process_control/eddm.py

@@ -367,7 +367,6 @@ def _update(self, value: Union[int, float], **kwargs) -> None:
                 self.num_instances
                 >= self.config.min_num_misclassified_instances  # type: ignore
             ):
-
                 distance_threshold = (
                     self.mean_distance_error
                     + self.config.level * self.std_distance_error  # type: ignore

frouros/detectors/data_drift/batch/statistical_test/chisquare.py

@@ -1,7 +1,8 @@
 """ChiSquareTest (Chi-square test) module."""
 
 import collections
-from typing import Optional, Tuple, Union
+import typing
+from typing import Optional, Set, Tuple, Union
 
 import numpy as np  # type: ignore
 from scipy.stats import chi2_contingency  # type: ignore
@@ -77,19 +78,20 @@ def _statistical_test(
         return test
 
     @staticmethod
+    @typing.no_type_check  # FIXME: X_ref_counter and X_counter cause mypy errors  # pylint: disable=fixme  # noqa: E501
     def _calculate_frequencies(
         X_ref: np.ndarray,  # noqa: N803
         X: np.ndarray,
     ) -> Tuple[list[int], list[int]]:
         X_ref_counter, X_counter = [  # noqa: N806
             *map(collections.Counter, [X_ref, X])  # noqa: N806
         ]
-        possible_values = set([*X_ref_counter.keys()] + [*X_counter.keys()])
+        possible_values: Set[str] = set(
+            [*X_ref_counter.keys()] + [*X_counter.keys()]
+        )  # noqa: N806
         f_exp, f_obs = {}, {}
         for value in possible_values:
-            f_exp[value] = X_ref_counter.get(value, 0)
-            f_obs[value] = X_counter.get(value, 0)
-        f_exp_values, f_obs_values = [
-            *map(list, [f_exp.values(), f_obs.values()])  # type: ignore
-        ]
-        return f_exp_values, f_obs_values  # type: ignore
+            f_exp[value] = X_ref_counter.get(value, 0)  # noqa: N806
+            f_obs[value] = X_counter.get(value, 0)  # noqa: N806
+        f_exp_values, f_obs_values = [*map(list, [f_exp.values(), f_obs.values()])]
+        return f_exp_values, f_obs_values

frouros/tests/conftest.py

@@ -389,9 +389,9 @@ def train_prediction_normal(
 
 
 @pytest.fixture(scope="module", name="dataset_simple")
-def concept_drift_dataset_simple() -> Tuple[
-    Tuple[np.ndarray, np.ndarray], Tuple[np.ndarray, np.ndarray]
-]:
+def concept_drift_dataset_simple() -> (
+    Tuple[Tuple[np.ndarray, np.ndarray], Tuple[np.ndarray, np.ndarray]]
+):
     """Dataset with multiple concepts to induce concept drift.
 
     :return: dataset split in reference and test