Merge branch 'master' into gate-deprecations

Author: Cryoris

azure-pipelines.yml

@@ -39,6 +39,7 @@ steps:
     pip install -U qiskit jupyter sphinx nbsphinx sphinx_rtd_theme
     pip install 'matplotlib<3.3'
     pip install -U qiskit[visualization] cvxpy
+    pip install pyscf
     sudo apt-get install -y pandoc graphviz
   displayName: 'Install dependencies'
 - bash: |

tutorials/circuits_advanced/1_advanced_circuits.ipynb

@@ -146,12 +146,12 @@
     "# Convert to a gate and stick it into an arbitrary place in the bigger circuit\n",
     "sub_inst = sub_circ.to_instruction()\n",
     "\n",
-    "q = QuantumRegister(3, 'q')\n",
-    "circ = QuantumCircuit(q)\n",
+    "qr = QuantumRegister(3, 'q')\n",
+    "circ = QuantumCircuit(qr)\n",
     "circ.h(qr[0])\n",
     "circ.cx(qr[0], qr[1])\n",
     "circ.cx(qr[1], qr[2])\n",
-    "circ.append(sub_inst, [q[1], q[2]])\n",
+    "circ.append(sub_inst, [qr[1], qr[2]])\n",
     "\n",
     "circ.draw()"
    ]

tutorials/finance/11_time_series.ipynb

@@ -106,7 +106,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qiskit.pulse import pulse_lib\n",
+    "from qiskit.pulse import library\n",
     "\n",
     "amp = 1\n",
     "sigma = 10\n",
@@ -143,7 +143,7 @@
     }
    ],
    "source": [
-    "pulse = pulse_lib.Gaussian(num_samples, amp, sigma, name=\"Parametric Gaus\")\n",
+    "pulse = library.Gaussian(num_samples, amp, sigma, name=\"Parametric Gaus\")\n",
     "pulse.draw()"
    ]
   },
@@ -179,7 +179,7 @@
     "times = np.arange(num_samples)\n",
     "gaussian_samples = np.exp(-1/2 *((times - num_samples / 2) ** 2 / sigma**2))\n",
     "\n",
-    "pulse = pulse_lib.SamplePulse(gaussian_samples, name=\"WF Gaus\")\n",
+    "pulse = library.Waveform(gaussian_samples, name=\"WF Gaus\")\n",
     "pulse.draw()"
    ]
   },
@@ -210,7 +210,7 @@
     }
    ],
    "source": [
-    "pulse = pulse_lib.gaussian(duration=num_samples, amp=amp, sigma=sigma, name=\"Lib Gaus\")\n",
+    "pulse = library.gaussian(duration=num_samples, amp=amp, sigma=sigma, name=\"Lib Gaus\")\n",
     "pulse.draw()"
    ]
   },
@@ -244,7 +244,7 @@
     "from scipy import signal\n",
     "\n",
     "sampled_gaussian_envelope = signal.gaussian(num_samples, sigma)\n",
-    "pulse = pulse_lib.SamplePulse(sampled_gaussian_envelope, name=\"Scipy Gaus\")\n",
+    "pulse = library.Waveform(sampled_gaussian_envelope, name=\"Scipy Gaus\")\n",
     "pulse.draw()"
    ]
   },
@@ -355,8 +355,8 @@
     {
      "data": {
       "text/html": [
-       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.6</td></tr><tr><td>Terra</td><td>0.14.2</td></tr><tr><td>Aer</td><td>0.5.2</td></tr><tr><td>Ignis</td><td>0.3.3</td></tr><tr><td>Aqua</td><td>0.7.3</td></tr><tr><td>IBM Q Provider</td><td>0.7.2</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
-       "[Clang 11.0.3 (clang-1103.0.32.62)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>32.0</td></tr><tr><td colspan='2'>Fri Aug 07 15:30:19 2020 EDT</td></tr></table>"
+       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.20.0</td></tr><tr><td>Terra</td><td>0.15.0</td></tr><tr><td>Aer</td><td>0.6.1</td></tr><tr><td>Ignis</td><td>0.4.0</td></tr><tr><td>Aqua</td><td>0.7.5</td></tr><tr><td>IBM Q Provider</td><td>0.8.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.3 (default, Apr 24 2020, 18:51:23) \n",
+       "[Clang 11.0.3 (clang-1103.0.32.62)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>32.0</td></tr><tr><td colspan='2'>Mon Aug 10 17:01:23 2020 EDT</td></tr></table>"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"