Restrict cvxpy testing to python 3.7 and 3.8

.github/workflows/docs.yml

@@ -80,7 +80,7 @@ jobs:
         run: |
           set -e
           cd qiskit-tutorials
-          rm -rf tutorials/chemistry tutorials/circuits tutorials/circuits_advanced tutorials/finance tutorials/optimization tutorials/noise
+          rm -rf tutorials/chemistry tutorials/circuits tutorials/circuits_advanced tutorials/finance tutorials/optimization tutorials/algorithms tutorials/operators tutorials/noise
           sphinx-build -b html . _build/html
       - uses: actions/upload-artifact@v2
         with:

qiskit/providers/aer/pulse/controllers/digest_pulse_qobj.py

@@ -340,7 +340,9 @@ def experiment_to_structs(experiment, ham_chans, pulse_inds, pulse_to_int, dt, q
                 structs['channels'][chan_name][1].extend([inst['t0'] * dt,
                                                           inst['phase'],
                                                           cond])
-
+            # Delay instruction
+            elif inst['name'] == 'delay':
+                pass  # nothing to be done in this case
             # A standard pulse
             else:
                 start = inst['t0'] * dt

requirements-dev.txt

@@ -3,7 +3,7 @@ cmake!=3.17.1,!=3.17.0
 conan>=1.22.2
 scikit-build
 asv
-cvxpy>=1.0.0
+cvxpy>=1.0.0;python_version>'3.6' and python_version<='3.8'
 pylint
 pycodestyle
 Sphinx>=1.8.3

test/terra/backends/test_config_pulse_simulator.py

@@ -66,7 +66,7 @@ def test_from_backend(self):
                 for idx, entry in enumerate(sim_dict[key]):
                     for entry_key in entry:
                         if entry_key == 'samples':
-                            self.assertTrue(all(entry[entry_key] == backend_dict[key][idx][entry_key]))
+                            self.assertTrue(np.array_equal(entry[entry_key], backend_dict[key][idx][entry_key]))
                         else:
                             self.assertTrue(entry[entry_key] == backend_dict[key][idx][entry_key])
             else:

test/terra/noise/test_noise_transformation.py

@@ -13,6 +13,7 @@
 NoiseTransformer class tests
 """
 
+import unittest
 from ..common import QiskitAerTestCase
 
 import numpy
@@ -26,7 +27,13 @@
 from qiskit.providers.aer.noise.errors.standard_errors import pauli_error
 from qiskit.providers.aer.noise.errors.quantum_error import QuantumError
 
+try:
+    import cvxpy
+    HAS_CVXPY = True
+except ImportError:
+    HAS_CVXPY = False
 
+@unittest.skipUnless(HAS_CVXPY, 'cvxpy is required to run these tests')
 class TestNoiseTransformer(QiskitAerTestCase):
     def setUp(self):
         super().setUp()