Merge branch 'main' into quantum-time-evo

anedumla · Dec 7, 2021 · 405cdc4 · 405cdc4
2 parents 5831cad + 2af1016
commit 405cdc4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/qiskit/test/base.py b/qiskit/test/base.py
@@ -62,7 +62,6 @@ class BaseTestCase(testtools.TestCase):
         assertRaises = unittest.TestCase.assertRaises
         assertEqual = unittest.TestCase.assertEqual
 
-
 else:
 
     class BaseTestCase(unittest.TestCase):

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,7 +6,7 @@ ipywidgets>=7.3.0
 jupyter
 matplotlib>=3.3
 pillow>=4.2.1
-black==21.4b2
+black[jupyter]==21.12b0
 pydot
 astroid==2.5.6
 pylint==2.8.3

diff --git a/test/ipynb/mpl_tester.ipynb b/test/ipynb/mpl_tester.ipynb
@@ -7,8 +7,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#Testing Circuits\n",
-    "import warnings; warnings.simplefilter('ignore')\n",
+    "# Testing Circuits\n",
+    "import warnings\n",
+    "\n",
+    "warnings.simplefilter(\"ignore\")\n",
     "%run \"mpl/circuit/test_circuit_matplotlib_drawer.py\""
    ]
   },
@@ -19,7 +21,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#Testing Graphs\n",
+    "# Testing Graphs\n",
     "%run \"mpl/graph/test_graph_matplotlib_drawer.py\""
    ]
   },

diff --git a/test/python/notebooks/test_backend_tools.ipynb b/test/python/notebooks/test_backend_tools.ipynb
@@ -13,6 +13,7 @@
    "source": [
     "import os\n",
     "import sys\n",
+    "\n",
     "cwd = os.getcwd()\n",
     "qiskit_dir = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(cwd))))\n",
     "sys.path.append(qiskit_dir)"

diff --git a/test/python/notebooks/test_pbar_status.ipynb b/test/python/notebooks/test_pbar_status.ipynb
@@ -13,6 +13,7 @@
    "source": [
     "import os\n",
     "import sys\n",
+    "\n",
     "cwd = os.getcwd()\n",
     "qiskit_dir = os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(cwd))))\n",
     "sys.path.append(qiskit_dir)"
@@ -49,7 +50,7 @@
    },
    "outputs": [],
    "source": [
-    "sim_backend = BasicAer.get_backend('qasm_simulator')"
+    "sim_backend = BasicAer.get_backend(\"qasm_simulator\")"
    ]
   },
   {
@@ -64,6 +65,8 @@
    "outputs": [],
    "source": [
     "import time\n",
+    "\n",
+    "\n",
     "def func(_):\n",
     "    time.sleep(0.1)\n",
     "    return 0"
@@ -184,7 +187,7 @@
     "qc.measure(q, c)\n",
     "\n",
     "HTMLProgressBar()\n",
-    "qobj = transpile([qc]*20, backend=sim_backend)"
+    "qobj = transpile([qc] * 20, backend=sim_backend)"
    ]
   },
   {
@@ -205,7 +208,7 @@
    },
    "outputs": [],
    "source": [
-    "job_sim2 = execute([qc]*10, backend=sim_backend)\n",
+    "job_sim2 = execute([qc] * 10, backend=sim_backend)\n",
     "job_monitor(job_sim2)"
    ]
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,6 @@ class BaseTestCase(testtools.TestCase): @@
             assertRaises = unittest.TestCase.assertRaises
             assertEqual = unittest.TestCase.assertEqual
     else:
         class BaseTestCase(unittest.TestCase):
@@ Expand Down @@