Fix dependencies

Signed-off-by: Beat Buesser <[email protected]>

Author: beat-buesser

.github/actions/deepspeech-v3/Dockerfile

@@ -1,5 +1,5 @@
 # Get base image
-FROM python:3.10.13-slim-bullseye
+FROM python:3.10.13-slim-bookworm
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive

.github/actions/espresso/Dockerfile

@@ -1,5 +1,5 @@
 # Get base image
-FROM python:3.7.17-slim-bullseye
+FROM python:3.7.17-slim-bookworm
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive

.github/workflows/ci-deepspeech-v3.yml

@@ -25,7 +25,7 @@ jobs:
   test_deepspeech_v3_torch_2_1_1:
     name: PyTorchDeepSpeech v3 / PyTorch 2.1.1
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:deepspeech_v3_torch_2_1_1
+    container: bbuesser/art_testing_envs_deepspeech_v3_torch_2_1_1:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-espresso.yml

@@ -25,7 +25,7 @@ jobs:
   test_espresso:
     name: PyTorchEspresso
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:espresso
+    container: bbuesser/art_testing_envs_espresso:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

tests/attacks/inference/attribute_inference/test_baseline.py

@@ -78,8 +78,8 @@ def transform_feature(x):
             baseline_inferred_test
         )
 
-        expected_train_acc = {"nn": 0.58, "rf": 0.98, "gb": 0.98, "lr": 0.77, "dt": 0.98, "knn": 0.86, "svm": 0.83}
-        expected_test_acc = {"nn": 0.62, "rf": 0.86, "gb": 0.82, "lr": 0.86, "dt": 0.84, "knn": 0.82, "svm": 0.93}
+        expected_train_acc = {"nn": 0.58, "rf": 0.98, "gb": 0.98, "lr": 0.77, "dt": 0.98, "knn": 0.84, "svm": 0.83}
+        expected_test_acc = {"nn": 0.62, "rf": 0.83, "gb": 0.79, "lr": 0.86, "dt": 0.82, "knn": 0.82, "svm": 0.93}
 
         assert expected_train_acc[model_type] <= baseline_train_acc
         assert expected_test_acc[model_type] <= baseline_test_acc
@@ -176,7 +176,7 @@ def transform_feature(x):
         )
 
         expected_train_acc = {"nn": 0.58, "rf": 0.98, "gb": 0.98, "lr": 0.77, "dt": 0.98, "knn": 0.85, "svm": 0.83}
-        expected_test_acc = {"nn": 0.62, "rf": 0.86, "gb": 0.82, "lr": 0.86, "dt": 0.8, "knn": 0.81, "svm": 0.93}
+        expected_test_acc = {"nn": 0.62, "rf": 0.83, "gb": 0.82, "lr": 0.86, "dt": 0.8, "knn": 0.81, "svm": 0.93}
 
         assert expected_train_acc[model_type] <= baseline_train_acc
         assert expected_test_acc[model_type] <= baseline_test_acc
@@ -228,7 +228,7 @@ def transform_feature(x):
         )
 
         expected_train_acc = {"nn": 0.58, "rf": 0.98, "gb": 0.98, "lr": 0.77, "dt": 0.98, "knn": 0.85, "svm": 0.83}
-        expected_test_acc = {"nn": 0.62, "rf": 0.88, "gb": 0.82, "lr": 0.86, "dt": 0.8, "knn": 0.81, "svm": 0.93}
+        expected_test_acc = {"nn": 0.62, "rf": 0.82, "gb": 0.8, "lr": 0.86, "dt": 0.8, "knn": 0.81, "svm": 0.93}
 
         assert expected_train_acc[model_type] <= baseline_train_acc
         assert expected_test_acc[model_type] <= baseline_test_acc
@@ -510,7 +510,7 @@ def transform_other_feature(x):
         )
 
         expected_train_acc = {"nn": 0.58, "rf": 0.94, "gb": 0.95, "lr": 0.8, "dt": 0.94, "knn": 0.87, "svm": 0.8}
-        expected_test_acc = {"nn": 0.62, "rf": 0.84, "gb": 0.84, "lr": 0.86, "dt": 0.82, "knn": 0.86, "svm": 0.88}
+        expected_test_acc = {"nn": 0.62, "rf": 0.82, "gb": 0.84, "lr": 0.86, "dt": 0.79, "knn": 0.86, "svm": 0.88}
 
         assert expected_train_acc[model_type] <= baseline_train_acc
         assert expected_test_acc[model_type] <= baseline_test_acc

tests/utils.py

@@ -1748,10 +1748,10 @@ def get_tabular_classifier_scikit_list(clipped=False, model_list_names=None):
     )
 
     sklearn_version = list(map(int, sklearn.__version__.split(".")))
-    if sklearn_version[0] == 1 and sklearn_version[1] == 3:
-        suffix = "-eq-1.3.0"
-    elif sklearn_version[0] == 1 and sklearn_version[1] == 4:
-        suffix = "-eq-1.4.0"
+    if sklearn_version[0] == 1 and sklearn_version[1] == 5:
+        suffix = "-eq-1.5.2"
+    elif sklearn_version[0] == 1 and sklearn_version[1] == 6:
+        suffix = "-eq-1.6.1"
     else:
         suffix = ""
 

utils/resources/create_model_weights.py

@@ -154,7 +154,7 @@ def create_scikit_model_weights():
                 os.path.join(
                     os.path.dirname(os.path.dirname(__file__)),
                     "resources/models/scikit/",
-                    "scikit-" + model_name + "-iris-clipped-eq-1.4.0.pickle",
+                    "scikit-" + model_name + "-iris-clipped-eq-1.6.1.pickle",
                 ),
                 "wb",
             ),
@@ -168,7 +168,7 @@ def create_scikit_model_weights():
                 os.path.join(
                     os.path.dirname(os.path.dirname(__file__)),
                     "resources/models/scikit/",
-                    "scikit-" + model_name + "-iris-unclipped-eq-1.4.0.pickle",
+                    "scikit-" + model_name + "-iris-unclipped-eq-1.6.1.pickle",
                 ),
                 "wb",
             ),