Skip to content

Commit 7d21ec1

Browse files
authored
Merge branch 'dev_1.5.0' into development_issue_60
2 parents 417d05a + 94ded55 commit 7d21ec1

File tree

8 files changed

+1002
-4
lines changed

8 files changed

+1002
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,22 @@ jobs:
9797
- name: Pre-install legacy
9898
if: ${{ matrix.framework == 'legacy' }}
9999
run: |
100-
sudo apt-get -y -q install ffmpeg libavcodec-extra
101100
pip install tensorflow==${{ matrix.tensorflow }}
102101
pip install keras==${{ matrix.keras }}
103102
pip install scikit-learn==${{ matrix.scikit-learn }}
104103
- name: Pre-install tensorflow
105104
if: ${{ matrix.framework == 'tensorflow' || matrix.framework == 'keras' || matrix.framework == 'kerastf' }}
106105
run: |
107-
sudo apt-get -y -q install ffmpeg libavcodec-extra
108106
pip install tensorflow==${{ matrix.tensorflow }}
109107
pip install keras==${{ matrix.keras }}
110108
- name: Pre-install scikit-learn
111109
if: ${{ matrix.framework == 'scikitlearn' }}
112110
run: |
113-
sudo apt-get -y -q install ffmpeg libavcodec-extra
114111
pip install scikit-learn==${{ matrix.scikit-learn }}
115112
- name: Install Dependencies
116113
run: |
114+
sudo apt-get update
115+
sudo apt-get -y -q install ffmpeg libavcodec-extra
117116
python -m pip install --upgrade pip setuptools wheel
118117
pip3 install -q -r requirements.txt
119118
pip list
@@ -131,6 +130,7 @@ jobs:
131130
python-version: 3.7
132131
- name: Pre-install
133132
run: |
133+
sudo apt-get update
134134
sudo apt-get -y -q install ffmpeg libavcodec-extra
135135
pip install tensorflow==2.2.0
136136
pip install keras==2.3.1

art/attacks/evasion/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@
4444
from art.attacks.evasion.shapeshifter import ShapeShifter
4545
from art.attacks.evasion.imperceptible_asr.imperceptible_asr_pytorch import ImperceptibleASRPytorch
4646
from art.attacks.evasion.brendel_bethge import BrendelBethgeAttack
47+
from art.attacks.evasion.dpatch_robust import RobustDPatch

0 commit comments

Comments
 (0)