Merge branch 'main' into dependabot/pip/pytest-mock-approx-eq-3.12.0

Author: beat-buesser

.github/actions/deepspeech-v3/Dockerfile

@@ -1,5 +1,5 @@
-pod# Get base from a pytorch image
-FROM pytorch/pytorch:2.1.1-cuda12.1-cudnn8-runtime
+# Get base from a pytorch image
+FROM python:3.10.13-slim-bullseye
 
 # Set to install things in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive
@@ -26,10 +26,10 @@ RUN apt-get update \
 RUN pip install --ignore-installed PyYAML torch==2.1.1 tensorflow==2.14.1 torchaudio==2.1.1 pytorch-lightning==2.1.2 scikit-learn==1.3.2
 RUN pip install --no-build-isolation fairscale==0.4.13
 
-RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git
-RUN cd deepspeech.pytorch && sed -i '/^sklearn/d' requirements.txt && pip install -r requirements.txt && pip install -e .
+RUN git clone https://github.com/SeanNaren/deepspeech.pytorch.git && cd deepspeech.pytorch && sed -i '/^sklearn/d' requirements.txt && pip install -r requirements.txt && pip install -e .
 
 RUN pip install numba==0.56.4 pytest-cov==4.1.0 pydub==0.25.1
-RUN pip list
 
 RUN mkdir -p /root/.art/data && cd /root/.art/data && curl -LJO "https://github.com/SeanNaren/deepspeech.pytorch/releases/download/V3.0/librispeech_pretrained_v3.ckpt"
+
+CMD ["/bin/bash"]

.github/workflows/ci-lingvo.yml

@@ -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 -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^h5py/d;/^Pillow/d;/^pytest/d;/^pytest-mock/d;/^torch/d;/^torchaudio/d;/^torchvision/d;/^xgboost/d;/^requests/d;/^tensorflow/d;/^keras/d;/^kornia/d;/^librosa/d;/^tqdm/d;/^timm/d;/^catboost/d' requirements_test.txt)
+          pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^h5py/d;/^Pillow/d;/^pytest/d;/^pytest-mock/d;/^torch/d;/^torchaudio/d;/^torchvision/d;/^xgboost/d;/^requests/d;/^tensorflow/d;/^keras/d;/^kornia/d;/^librosa/d;/^tqdm/d;/^timm/d;/^catboost/d;/^scikit-learn/d' requirements_test.txt)
           pip install scipy==1.5.4
           pip install matplotlib==3.3.4
           pip install pandas==1.1.5
@@ -75,6 +75,7 @@ jobs:
           pip install librosa==0.9.2
           pip install tqdm==4.64.1
           pip install catboost==1.1.1
+          pip install scikit-learn==0.24.2
           pip list
       - name: Run ${{ matrix.name }} Tests
         run: pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/speech_recognition/test_tensorflow_lingvo.py --framework=${{ matrix.framework }} --durations=0

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

@@ -28,18 +28,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: scikit-learn 1.1.3 (Python 3.9)
-            framework: scikitlearn
-            scikit-learn: 1.1.3
-            python: 3.9
-          - name: scikit-learn 1.2.2 (Python 3.10)
-            framework: scikitlearn
-            scikit-learn: 1.2.2
-            python: '3.10'
           - name: scikit-learn 1.3.2 (Python 3.10)
             framework: scikitlearn
             scikit-learn: 1.3.2
             python: '3.10'
+          - name: scikit-learn 1.4.0 (Python 3.10)
+            framework: scikitlearn
+            scikit-learn: 1.4.0
+            python: '3.10'
 
     name: ${{ matrix.name }}
     steps:

.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' 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' requirements_test.txt)
           pip install pandas==1.3.5
           pip install scipy==1.7.2
           pip install matplotlib==3.5.3
@@ -62,6 +62,8 @@ jobs:
           pip install torchvision==0.14.1+cpu
           pip install Pillow==9.5.0
           pip install h5py==3.8.0
+          pip install kornia==0.6.12
+          pip install scikit-learn==1.0.2
           pip list
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}

.github/workflows/dockerhub.yml

@@ -24,22 +24,22 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
           images: adversarialrobustnesstoolbox/releases
           tags: |
-            type=raw,value={{branch}}-1.17.0-{{sha}}
+            type=raw,value={{branch}}-1.17.1-{{sha}}
             type=semver,pattern={{version}}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
         with:
           context: .
           push: true

art/__init__.py

@@ -12,7 +12,7 @@
 from art import preprocessing
 
 # Semantic Version
-__version__ = "1.17.0"
+__version__ = "1.17.1"
 
 # pylint: disable=C0103
 

docs/conf.py

@@ -27,7 +27,7 @@
 # The short X.Y version
 version = "1.17"
 # The full version, including alpha/beta/rc tags
-release = "1.17.0"
+release = "1.17.1"
 
 
 # -- General configuration ---------------------------------------------------