Merge branch 'main' into dev_1.5.2

Author: beat-buesser

notebooks/attack_membership_inference.ipynb

@@ -101,7 +101,7 @@
    ],
    "source": [
     "import numpy as np\n",
-    "from art.attacks.inference import MembershipInferenceBlackBoxRuleBased\n",
+    "from art.attacks.inference.membership_inference import MembershipInferenceBlackBoxRuleBased\n",
     "\n",
     "attack = MembershipInferenceBlackBoxRuleBased(art_classifier)\n",
     "\n",
@@ -183,7 +183,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from art.attacks.inference import MembershipInferenceBlackBox\n",
+    "from art.attacks.inference.membership_inference import MembershipInferenceBlackBox\n",
     "\n",
     "attack_train_ratio = 0.5\n",
     "attack_train_size = int(len(x_train) * attack_train_ratio)\n",

setup.py

@@ -7,7 +7,7 @@
     long_description = fh.read()
 
 install_requires = [
-    "numpy",
+    "numpy>=1.18.0",
     "scipy>=1.4.1",
     "matplotlib",
     "scikit-learn>=0.22.2,==0.23.*",