Skip to content

Commit 00b8bdf

Browse files
author
Beat Buesser
committed
Merge remote-tracking branch 'origin/main' into dev_1.6.2
2 parents 1a0db4b + bcdce12 commit 00b8bdf

File tree

10 files changed

+32
-28
lines changed

10 files changed

+32
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
container: minhitbk/art_testing_envs:deepspeech_v2
2626
steps:
2727
- name: Checkout Repo
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v2.3.4
2929
- name: Run Test Action
3030
uses: ./.github/actions/deepspeech-v2
3131
- name: Upload coverage to Codecov
32-
uses: codecov/codecov-action@v1
32+
uses: codecov/codecov-action@v1.5.0

.github/workflows/ci-lingvo.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
name: Run ${{ matrix.name }} Tests
3737
steps:
3838
- name: Checkout Repo
39-
uses: actions/checkout@v2
39+
uses: actions/checkout@v2.3.4
4040
- name: Setup Python
41-
uses: actions/setup-python@v2
41+
uses: actions/setup-python@v2.2.2
4242
with:
4343
python-version: ${{ matrix.python }}
4444
- name: Pre-install Lingvo ASR
@@ -60,4 +60,4 @@ jobs:
6060
- name: Run ${{ matrix.name }} Tests
6161
run: ./run_tests.sh ${{ matrix.framework }}
6262
- name: Upload coverage to Codecov
63-
uses: codecov/codecov-action@v1
63+
uses: codecov/codecov-action@v1.5.0

.github/workflows/ci-mxnet.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
name: Run ${{ matrix.name }} Tests
6060
steps:
6161
- name: Checkout Repo
62-
uses: actions/checkout@v2
62+
uses: actions/checkout@v2.3.4
6363
- name: Setup Python
64-
uses: actions/setup-python@v2
64+
uses: actions/setup-python@v2.2.2
6565
with:
6666
python-version: ${{ matrix.python }}
6767
- name: Install Dependencies
@@ -86,4 +86,4 @@ jobs:
8686
- name: Run ${{ matrix.name }} Tests
8787
run: ./run_tests.sh ${{ matrix.framework }}
8888
- name: Upload coverage to Codecov
89-
uses: codecov/codecov-action@v1
89+
uses: codecov/codecov-action@v1.5.0

.github/workflows/ci-pytorch-fasterrcnn.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
fail-fast: false
2727
steps:
2828
- name: Checkout Repo
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v2.3.4
3030
- name: Setup Python
31-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v2.2.2
3232
with:
3333
python-version: 3.7
3434
- name: Install Dependencies
@@ -46,4 +46,4 @@ jobs:
4646
- name: Run Test Action
4747
run: pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_detection/test_pytorch_faster_rcnn.py --framework=pytorch --skip_travis=True --durations=0
4848
- name: Upload coverage to Codecov
49-
uses: codecov/codecov-action@v1
49+
uses: codecov/codecov-action@v1.5.0

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ jobs:
7373
framework: scikitlearn
7474
scikit-learn: 0.23.2
7575
python: 3.8
76-
- name: scikit-learn 0.24.1 (Python 3.8)
76+
- name: scikit-learn 0.24.2 (Python 3.8)
7777
framework: scikitlearn
78-
scikit-learn: 0.24.1
78+
scikit-learn: 0.24.2
7979
python: 3.8
8080

8181
name: ${{ matrix.name }}
8282
steps:
8383
- name: Checkout Repo
84-
uses: actions/checkout@v2
84+
uses: actions/checkout@v2.3.4
8585
- name: Setup Python
86-
uses: actions/setup-python@v2
86+
uses: actions/setup-python@v2.2.2
8787
with:
8888
python-version: ${{ matrix.python }}
8989
- name: Install Dependencies
@@ -133,4 +133,4 @@ jobs:
133133
- name: Run Tests
134134
run: ./run_tests.sh ${{ matrix.framework }}
135135
- name: Upload coverage to Codecov
136-
uses: codecov/codecov-action@v1
136+
uses: codecov/codecov-action@v1.5.0

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v2.3.4
3434

3535
# Initializes the CodeQL tools for scanning.
3636
- name: Initialize CodeQL

README-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
1616
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/adversarial-robustness-toolbox)](https://pypi.org/project/adversarial-robustness-toolbox/)
1717
[![slack-img](https://img.shields.io/badge/chat-on%20slack-yellow.svg)](https://ibm-art.slack.com/)
18+
[![Downloads](https://pepy.tech/badge/adversarial-robustness-toolbox)](https://pepy.tech/project/adversarial-robustness-toolbox)
19+
[![Downloads](https://pepy.tech/badge/adversarial-robustness-toolbox/month)](https://pepy.tech/project/adversarial-robustness-toolbox)
1820

1921

2022
对抗性鲁棒性工具集(ART)是用于机器学习安全性的Python库。ART提供的工具可

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
1616
[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/adversarial-robustness-toolbox)](https://pypi.org/project/adversarial-robustness-toolbox/)
1717
[![slack-img](https://img.shields.io/badge/chat-on%20slack-yellow.svg)](https://ibm-art.slack.com/)
18+
[![Downloads](https://pepy.tech/badge/adversarial-robustness-toolbox)](https://pepy.tech/project/adversarial-robustness-toolbox)
19+
[![Downloads](https://pepy.tech/badge/adversarial-robustness-toolbox/month)](https://pepy.tech/project/adversarial-robustness-toolbox)
1820

1921
[中文README请按此处](README-cn.md)
2022

requirements.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# base
22
numpy>=1.18.0
3-
scipy==1.6.2
4-
matplotlib==3.4.1
5-
scikit-learn>=0.22.2,<=0.24.1
6-
six==1.15.0
3+
scipy==1.6.3
4+
matplotlib==3.4.2
5+
scikit-learn>=0.22.2,<0.24.3
6+
six==1.16.0
77
Pillow==8.2.0
88
tqdm==4.60.0
99
statsmodels==0.12.2
@@ -29,10 +29,10 @@ torch==1.8.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
2929
torchaudio==0.8.1 -f https://download.pytorch.org/whl/torch_stable.html
3030
torchvision==0.9.1 -f https://download.pytorch.org/whl/torch_stable.html
3131
catboost==0.25.1
32-
GPy==1.9.9
32+
GPy==1.10.0
3333
lightgbm==3.2.1
34-
xgboost==1.4.1
35-
kornia~=0.5.0
34+
xgboost==1.4.2
35+
kornia~=0.5.1
3636

3737
# Lingvo ASR dependencies
3838
# supported versions: (lingvo==0.6.4 with tensorflow-gpu==2.1.0)
@@ -41,9 +41,9 @@ kornia~=0.5.0
4141
#lingvo==0.6.4
4242

4343
# other
44-
pytest~=6.2.3
44+
pytest~=6.2.4
4545
pytest-flake8~=1.0.7
46-
pytest-mock~=3.5.1
46+
pytest-mock~=3.6.1
4747
pytest-cov~=2.11.1
4848
codecov~=2.1.11
4949
requests~=2.25.1

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"numpy>=1.18.0",
1111
"scipy>=1.4.1",
1212
"matplotlib",
13-
"scikit-learn>=0.22.2,<=0.24.1",
13+
"scikit-learn>=0.22.2,<0.24.3",
1414
"six",
1515
"setuptools",
1616
"Pillow",
@@ -33,7 +33,7 @@
3333
"numpy",
3434
"scipy>=1.4.1",
3535
"six>=1.13.0",
36-
"scikit-learn>=0.22.2,<=0.24.1",
36+
"scikit-learn>=0.22.2,<0.24.3",
3737
"Pillow>=6.0.0",
3838
]
3939

0 commit comments

Comments
 (0)