Merge branch 'main' into dev_1.3.3

Author: beat-buesser

Dockerfile

@@ -4,7 +4,7 @@ RUN pip3 install keras==2.3.1
 #FROM tensorflow/tensorflow:1.15.3-py3
 #RUN pip3 install keras==2.2.5
 
-RUN pip3 install numpy==1.18.1 scipy==1.4.1 matplotlib==3.2.1 scikit-learn==0.22.1 six==1.15.0 Pillow==6.2.2
+RUN pip3 install numpy==1.18.1 scipy==1.4.1 matplotlib==3.2.1 scikit-learn==0.22.1 six==1.15.0 Pillow==7.2.0
 RUN pip3 install tqdm==4.45.0 statsmodels==0.11.1 pydub==0.24.1 resampy==0.2.2 ffmpeg-python==0.2.0 cma==3.0.3 mypy==0.770
 
 #TODO check if jupyter notebook works
@@ -15,12 +15,12 @@ RUN pip3 install h5py==2.10.0
 RUN pip3 install tensorflow-addons==0.10.0
 RUN pip3 install mxnet==1.6.0
 RUN pip3 install torch==1.5.0 torchvision==0.6.0 -f https://download.pytorch.org/whl/torch_stable.html
-RUN pip3 install catboost==0.23.2
+RUN pip3 install catboost==0.24
 RUN pip3 install GPy==1.9.9
 RUN pip3 install lightgbm==2.3.1
 RUN pip3 install xgboost==1.1.1
 
-RUN pip3 install pytest==5.4.1 pytest-pep8==1.0.6 pytest-mock==3.1.0 codecov==2.1.8 requests==2.23.0
+RUN pip3 install pytest==5.4.1 pytest-pep8==1.0.6 pytest-mock==3.2.0 codecov==2.1.8 requests==2.23.0
 
 RUN mkdir /project; mkdir /project/TMP
 VOLUME /project/TMP

PULL_REQUEST_TEMPLATE.md

@@ -8,6 +8,7 @@ Fixes # (issue)
 
 Please check all relevant options.
 
+- [ ] Improvement (non-breaking)
 - [ ] Bug fix (non-breaking)
 - [ ] New feature (non-breaking)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

requirements.txt

@@ -1,11 +1,11 @@
 # base
-numpy==1.18.1
+numpy==1.19.1
 scipy==1.4.1
-matplotlib==3.2.1
-scikit-learn==0.22.1
+matplotlib==3.3.1
+scikit-learn==0.23.2
 six==1.15.0
-Pillow==7.1.0
-tqdm==4.45.0
+Pillow==7.2.0
+tqdm==4.48.2
 statsmodels==0.11.1
 pydub==0.24.1
 resampy==0.2.2
@@ -17,22 +17,22 @@ h5py==2.10.0
 # supported versions: (tensorflow==2.2.0 with keras==2.3.1) or (tensorflow==1.15.3 with keras==2.2.5)
 tensorflow
 keras
-tensorflow-addons==0.10.0
+tensorflow-addons==0.11.1
 mxnet==1.6.0
 --find-links https://download.pytorch.org/whl/torch_stable.html
 torch==1.5.0+cpu
 torchvision==0.6.0+cpu
-catboost==0.23.2
+catboost==0.24
 GPy==1.9.9
 lightgbm==2.3.1
 xgboost==1.1.1
 
 # other
 pytest==5.4.1
 pytest-pep8==1.0.6
-pytest-mock==3.1.0
+pytest-mock==3.2.0
 codecov==2.1.8
-requests==2.23.0
+requests==2.24.0
 
 # ART
 -e .

setup.py

@@ -10,7 +10,7 @@
     "numpy",
     "scipy==1.4.1",
     "matplotlib",
-    "scikit-learn==0.22.1",
+    "scikit-learn==0.23.2",
     "six",
     "setuptools",
     "Pillow",
@@ -32,7 +32,7 @@
     "numpy",
     "scipy==1.4.1",
     "six==1.13.0",
-    "scikit-learn==0.22.1",
+    "scikit-learn==0.23.2",
     "Pillow>=6.0.0",
 ]
 

tests/metrics/test_verification_decision_trees.py

@@ -117,7 +117,7 @@ def test_GradientBoosting(self):
             x=self.x_test, y=self.y_test, eps_init=0.3, nb_search_steps=10, max_clique=2, max_level=2
         )
 
-        self.assertEqual(average_bound, 0.009117187499999995)
+        self.assertAlmostEqual(average_bound, 0.009, delta=0.0002)
         self.assertEqual(verified_error, 1.0)
 
     def test_RandomForest(self):