Merge branch 'main' into main

Author: beat-buesser

.github/workflows/ci-tensorflow-v1.yml

@@ -48,7 +48,7 @@ jobs:
           sudo apt-get update
           sudo apt-get -y -q install ffmpeg libavcodec-extra
           python -m pip install --upgrade pip setuptools wheel
-          pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d;/^timm/d' requirements_test.txt)
+          pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d;/^timm/d;/^types-six/d' requirements_test.txt)
           pip install pandas==1.3.5
           pip install scipy==1.7.2
           pip install matplotlib==3.5.3
@@ -73,6 +73,7 @@ jobs:
           pip install pytest-cov
           pip install requests==2.31.0
           pip install timm==0.9.12
+          pip install types-six==1.16.21.9
           pip list
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}

art/evaluations/security_curve/security_curve.py

@@ -165,7 +165,12 @@ def plot(self) -> None:  # pragma: no cover
         from matplotlib import pyplot as plt
 
         plt.plot(self.eps_list, self.accuracy_adv_list, label="adversarial", marker="o")
-        plt.plot([self.eps_list[0], self.eps_list[-1]], [self.accuracy, self.accuracy], linestyle="--", label="benign")
+        plt.plot(
+            [self.eps_list[0], self.eps_list[-1]],  # type: ignore
+            [self.accuracy, self.accuracy],  # type: ignore
+            linestyle="--",
+            label="benign",
+        )
         plt.legend()
         plt.xlabel("Attack budget eps")
         plt.ylabel("Accuracy")

art/visualization.py

@@ -150,7 +150,7 @@ def plot_3d(
     for i, coord in enumerate(points):
         try:
             color_point = labels[i]
-            axis.scatter3D(coord[0], coord[1], coord[2], color=colors[color_point])
+            axis.scatter3D(coord[0], coord[1], coord[2], color=colors[color_point])  # type: ignore
         except IndexError:
             raise ValueError(
                 "Labels outside the range. Should start from zero and be sequential there after"

requirements_test.txt

@@ -4,7 +4,7 @@
 
 numpy>=1.18.5,<1.27
 scipy==1.10.1
-matplotlib==3.7.1
+matplotlib==3.9.4
 scikit-learn==1.6.1
 six==1.17.0
 Pillow==11.1.0
@@ -47,7 +47,7 @@ xgboost==2.1.1
 kornia~=0.8.0
 tensorboardX==2.6.2.2
 lief==0.15.1
-jax[cpu]==0.4.26
+jax[cpu]==0.4.30
 
 # lingvo==0.13.1
 
@@ -60,8 +60,8 @@ mypy==1.11.1
 pycodestyle==2.12.1
 black==25.1.0
 ruff==0.9.3
-types-six==1.16.21.9
-types-PyYAML==6.0.12.20240917
+types-six==1.17.0.20250515
+types-PyYAML==6.0.12.20250516
 types-setuptools==80.9.0.20250529
 
 # other