Merge branch 'develop' into up-master

README.md

@@ -123,7 +123,7 @@ of the `[extras]` section.
    Installs: `foolbox >= 3.3.0`, `eagerpy >= 0.29.0`, `torch >= 1.4`, `torchvision >= 0.5`
  - `cleverhans` : Wrapper of [CleverHans](https://github.com/tensorflow/cleverhans), 
    a Python library to benchmark vulnerability of machine learning systems to adversarial examples.  
-   Installs: `tensorflow >= 1.14.*, < 2`, `cleverhans`  
+   Installs: `tensorflow >= 1.14.*, < 2`, `cleverhans < 3.1`  
    *Warning*: not available for `python >= 3.8`
  - `tf-gpu` : Shortcut for installing `TensorFlow` package with GPU support (Linux and Windows only).  
    Installs: `tensorflow-gpu >= 1.14.*, < 2`  

setup.py

@@ -179,12 +179,12 @@ def install_deps():
     install_requires=REQ_PKGS,
     extras_require={
         'pytorch': ["torch>=1.4,!=1.5.*", "torchvision>=0.5,!=0.6.*"],
-        'cleverhans': ["tensorflow>=1.14,<2", "cleverhans"],
+        'cleverhans': ["tensorflow>=1.14,<2", "cleverhans<3.1"],
         'tf-gpu': ["tensorflow-gpu>=1.14,<2"],
         'foolbox': ["foolbox>=3.3.0", "torch>=1.4,!=1.5.*", "torchvision>=0.5,!=0.6.*"],
         'unittests': ['pytest>=5,<5.1',
                       'pytest-cov>=2.9', 'coverage<5',
-                      'jupyter', 'nbval', 'requests-mock']
+                      'jupyter', 'nbval', 'requests-mock<1.9']
     },
     zip_safe=False
 )

tox.ini

@@ -31,7 +31,7 @@ deps =
     {min}-!nofoolbox: torch~=1.4.0
     {min}-!nofoolbox: foolbox~=3.3.0
     !py38-{min,tf114}-!nocleverhans: tensorflow~=1.14.0
-    !py38-{min,clh}-!nocleverhans: cleverhans
+    !py38-{min,clh}-!nocleverhans: cleverhans<3.1
     !py38-gpu-!nocleverhans: tensorflow-gpu~=1.14.0
 commands_pre =
     python -V