Run notebooks again on latest release and resolve conflicts (#960)

Co-authored-by: Paul Nation <nonhermitian@gmail.com>
Co-authored-by: Matthew Treinish <mtreinish@kortar.org>

Author: 3 people

tutorials/pulse/1_getting_started_with_pulse.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.8.5 (default, Jul 27 2020, 08:42:51) \n",
-       "[GCC 10.1.0]</td></tr><tr><td>OS</td><td>Linux</td></tr><tr><td>CPUs</td><td>32</td></tr><tr><td>Memory (Gb)</td><td>125.72603988647461</td></tr><tr><td colspan='2'>Sun Aug 09 12:26:12 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>"
@@ -408,7 +408,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,