Merge remote-tracking branch 'origin/main' into dependabot/pip/black-25.1.0

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/actions/goturn/Dockerfile

@@ -1,5 +1,7 @@
 # Get base image
-FROM python:3.8.19-slim-bullseye
+FROM python:3.8.19-slim-bookworm
+
+ENV MONO_TLS_PROVIDER=legacy
 
 # Install system wide software
 RUN apt-get update \

.github/actions/tfv2-faster-rcnn/Dockerfile

@@ -1,5 +1,5 @@
 # Get base from a tensorflow image
-FROM tensorflow/tensorflow:2.10.1
+FROM tensorflow/tensorflow:2.13.0
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive
@@ -38,10 +38,9 @@ RUN cd TensorFlow && wget https://github.com/protocolbuffers/protobuf/releases/d
 RUN cd TensorFlow && unzip protoc-3.17.3-linux-x86_64.zip -d protobuf
 RUN cd TensorFlow/models/research && /TensorFlow/protobuf/bin/protoc object_detection/protos/*.proto --python_out=.
 RUN cd TensorFlow/models/research && cp object_detection/packages/tf2/setup.py .
-RUN cd TensorFlow/models/research && python -m pip install --use-feature=2020-resolver .
+RUN cd TensorFlow/models/research && python -m pip install .
 
 RUN pip install tqdm
 RUN pip install requests
-RUN pip install sklearn
 RUN pip install numba==0.50.0
 RUN pip install pytest-cov

.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_env_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_env_espresso:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-goturn.yml

@@ -25,7 +25,7 @@ jobs:
   test_pytorch_goturn:
     name: PyTorchGoturn
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:goturn
+    container: bbuesser/art_testing_env_goturn:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/ci-legacy.yml

@@ -29,15 +29,15 @@ jobs:
       matrix:
         module: [attacks_1, attacks_2, estimators, defences, metrics, art]
         include:
-          - name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.1.3 Python 3.9)
+          - name: legacy (TensorFlow 2.14.0 Keras 2.14.0 PyTorch 1.13.1 scikit-learn 1.6.1 Python 3.9)
             framework: legacy
             python: '3.10'
             tensorflow: 2.14.0
             keras: 2.14.0
             torch: 1.13.1+cpu
             torchvision: 0.14.1+cpu
             torchaudio: 0.13.1+cpu
-            scikit-learn: 1.1.3
+            scikit-learn: 1.6.1
 
     name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
     steps:

.github/workflows/ci-scikit-learn.yml

@@ -28,13 +28,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: scikit-learn 1.3.2 (Python 3.10)
+          - name: scikit-learn 1.5.2 (Python 3.10)
             framework: scikitlearn
-            scikit-learn: 1.3.2
+            scikit-learn: 1.5.2
             python: '3.10'
-          - name: scikit-learn 1.4.0 (Python 3.10)
+          - name: scikit-learn 1.6.1 (Python 3.10)
             framework: scikitlearn
-            scikit-learn: 1.4.0
+            scikit-learn: 1.6.1
             python: '3.10'
 
     name: ${{ matrix.name }}
@@ -50,7 +50,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 -r requirements_test.txt
+          pip install -q -r <(sed '/^scikit-learn/d' requirements_test.txt)
           pip install scikit-learn==${{ matrix.scikit-learn }}
           pip list
       - name: Run Tests

.github/workflows/ci-tfv2-faster-rcnn.yml

@@ -25,7 +25,7 @@ jobs:
   test_tf_v2_faster_rcnn:
     name: TensorFlowV2FasterRCNN
     runs-on: ubuntu-latest
-    container: adversarialrobustnesstoolbox/art_testing_envs:tfv2-faster-rcnn
+    container: bbuesser/art_testing_env_tfv2-faster-rcnn:latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4