Merge branch 'dev_1.10.0' into development_issue_1475

Author: beat-buesser

.github/workflows/ci-keras.yml

@@ -25,27 +25,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Keras 2.3.1 (TensorFlow 2.2.1 Python 3.7)
+          - name: Keras 2.3.1 (TensorFlow 2.2.1 Python 3.8)
             framework: keras
-            python: 3.7
+            python: 3.8
             tensorflow: 2.2.1
             keras: 2.3.1
             tf_addons: 0.13.0
-          - name: TensorFlow-Keras 2.3.4 (Keras 2.4.3 Python 3.7)
+          - name: TensorFlow-Keras 2.3.4 (Keras 2.4.3 Python 3.8)
             framework: kerastf
-            python: 3.7
+            python: 3.8
             tensorflow: 2.3.4
             keras: 2.4.3
             tf_addons: 0.13.0
-          - name: Keras 2.6.0 (TensorFlow 2.6.0 Python 3.8)
+          - name: Keras 2.6.0 (TensorFlow 2.6.0 Python 3.9)
             framework: keras
-            python: 3.8
+            python: 3.9
             tensorflow: 2.6.0
             keras: 2.6.0
             tf_addons: 0.14.0
-          - name: TensorFlow-Keras 2.6.0 (Keras 2.6.0 Python 3.8)
+          - name: TensorFlow-Keras 2.6.0 (Keras 2.6.0 Python 3.9)
             framework: kerastf
-            python: 3.8
+            python: 3.9
             tensorflow: 2.6.0
             keras: 2.6.0
             tf_addons: 0.14.0

.github/workflows/ci-legacy.yml

@@ -26,15 +26,15 @@ jobs:
       matrix:
         module: [attacks_1, attacks_2, estimators, defences, metrics, art]
         include:
-          - name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.10.2 scikit-learn 0.24.2 Python 3.8)
+          - name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.10.2 scikit-learn 1.0.2 Python 3.9)
             framework: legacy
-            python: 3.8
+            python: 3.9
             tensorflow: 2.6.0
             keras: 2.6.0
             torch: 1.10.2+cpu
             torchvision: 0.11.3+cpu
             torchaudio: 0.10.2+cpu
-            scikit-learn: 0.24.2
+            scikit-learn: 1.0.2
 
     name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
     steps:

.github/workflows/ci-lingvo.yml

@@ -47,7 +47,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;/^Pillow/d;/^pytest-mock/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-mock/d' requirements_test.txt)
           pip install scipy==1.5.4
           pip install matplotlib==3.3.4
           pip install pandas==1.1.5
@@ -59,6 +59,7 @@ jobs:
           pip install tensorflow-addons==0.9.1
           pip install model-pruning-google-research==0.0.3
           pip install jax[cpu]==0.2.17
+          pip install h5py==2.10.0
           pip install pytest-mock
           pip list
       - name: Run ${{ matrix.name }} Tests

.github/workflows/ci-mxnet.yml

@@ -25,9 +25,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: mxnet (Python 3.7)
+          - name: mxnet (Python 3.8)
             framework: mxnet
-            python: 3.7
+            python: 3.8
 
     name: Run ${{ matrix.name }} Tests
     steps:

.github/workflows/ci-pytorch-object-detectors.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v3
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install Dependencies
         run: |
           sudo apt-get update

.github/workflows/ci-pytorch.yml

@@ -25,21 +25,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: PyTorch 1.8.1 (Python 3.7)
+          - name: PyTorch 1.8.1 (Python 3.8)
             framework: pytorch
-            python: 3.7
+            python: 3.8
             torch: 1.8.1+cpu
             torchvision: 0.9.1+cpu
             torchaudio: 0.8.1
-          - name: PyTorch 1.9.1 (Python 3.7)
+          - name: PyTorch 1.9.1 (Python 3.8)
             framework: pytorch
-            python: 3.7
+            python: 3.8
             torch: 1.9.1+cpu
             torchvision: 0.10.1+cpu
             torchaudio: 0.9.1
-          - name: PyTorch 1.10.2 (Python 3.7)
+          - name: PyTorch 1.10.2 (Python 3.8)
             framework: pytorch
-            python: 3.7
+            python: 3.8
             torch: 1.10.2+cpu
             torchvision: 0.11.3+cpu
             torchaudio: 0.10.2+cpu

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

@@ -25,22 +25,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: scikit-learn 0.22.2 (Python 3.7)
-            framework: scikitlearn
-            scikit-learn: 0.22.2
-            python: 3.7
-          - name: scikit-learn 0.23.2 (Python 3.8)
+          - name: scikit-learn 0.23.2 (Python 3.9)
             framework: scikitlearn
             scikit-learn: 0.23.2
-            python: 3.8
-          - name: scikit-learn 0.24.2 (Python 3.8)
+            python: 3.9
+          - name: scikit-learn 0.24.2 (Python 3.9)
             framework: scikitlearn
             scikit-learn: 0.24.2
-            python: 3.8
-          - name: scikit-learn 1.0 (Python 3.8)
+            python: 3.9
+          - name: scikit-learn 1.0.2 (Python 3.9)
             framework: scikitlearn
-            scikit-learn: 1.0
-            python: 3.8
+            scikit-learn: 1.0.2
+            python: 3.9
 
     name: ${{ matrix.name }}
     steps:
@@ -56,8 +52,8 @@ jobs:
           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 tensorflow==2.4.3
-          pip install keras==2.4.3
+          pip install tensorflow==2.7.0
+          pip install keras==2.7.0
           pip install scikit-learn==${{ matrix.scikit-learn }}
           pip list
       - name: Run Tests

.github/workflows/ci-style-checks.yml

@@ -28,19 +28,22 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v3
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Pre-install
         run: |
           sudo apt-get update
           sudo apt-get -y -q install ffmpeg libavcodec-extra
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          pip install -q pylint==2.7.4 mypy==0.812 pycodestyle==2.7.0 black==20.8b1
+          pip install -q pylint==2.12.2 mypy==0.931 pycodestyle==2.8.0 black==21.12b0
           pip install -q -r requirements_test.txt
           pip install pluggy==0.13.1
-          pip install tensorflow==2.4.1
-          pip install keras==2.4.3
+          pip install tensorflow==2.7.0
+          pip install keras==2.7.0
+          python -m pip install types-six
+          python -m pip install types-PyYAML
+          python3 -m pip install types-setuptools
           pip list
       - name: pycodestyle
         run: pycodestyle --ignore=C0330,C0415,E203,E231,W503 --max-line-length=120 art

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

@@ -25,26 +25,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: TensorFlow 2.5.1 (Keras 2.4.3 Python 3.8)
+          - name: TensorFlow 2.6.2 (Keras 2.6.0 Python 3.8)
             framework: tensorflow
-            python: 3.7
-            tensorflow: 2.5.1
+            python: 3.8
+            tensorflow: 2.6.2
             tf_version: v2
-            keras: 2.4.3
+            keras: 2.6.0
             tf_addons: 0.14.0
-          - name: TensorFlow 2.5.1v1 (Keras 2.4.3 Python 3.8)
+          - name: TensorFlow 2.7.0v1 (Keras 2.7.0 Python 3.9)
             framework: tensorflow2v1
-            python: 3.8
-            tensorflow: 2.5.1
+            python: 3.9
+            tensorflow: 2.7.0
             tf_version: v2
-            keras: 2.4.3
+            keras: 2.7.0
             tf_addons: 0.14.0
-          - name: TensorFlow 2.6.0 (Keras 2.6.0 Python 3.8)
+          - name: TensorFlow 2.7.0 (Keras 2.7.0 Python 3.9)
             framework: tensorflow
-            python: 3.8
-            tensorflow: 2.6.0
+            python: 3.9
+            tensorflow: 2.7.0
             tf_version: v2
-            keras: 2.6.0
+            keras: 2.7.0
             tf_addons: 0.14.0
 
     name: ${{ matrix.name }}

art/attacks/attack.py

@@ -91,7 +91,7 @@ class Attack(abc.ABC):
     Abstract base class for all attack abstract base classes.
     """
 
-    attack_params: List[str] = list()
+    attack_params: List[str] = []
     # The _estimator_requirements define the requirements an estimator must satisfy to be used as a target for an
     # attack. They should be a tuple of requirements, where each requirement is either a class the estimator must
     # inherit from, or a tuple of classes which define a union, i.e. the estimator must inherit from at least one class