Merge branch 'qutip:master' into qiskit-pulse-simulators

tests/test_circuit.py

@@ -479,7 +479,7 @@ def test_N_level_system(self):
         """
         Test for circuit with N-level system.
         """
-        mat3 = qp.rand_unitary_haar(3)
+        mat3 = qp.rand_unitary(3)
 
         def controlled_mat3(arg_value):
             """

tests/test_gates.py

@@ -1,4 +1,5 @@
 from copy import deepcopy
+from packaging.version import parse as parse_version
 import pytest
 import functools
 import itertools
@@ -23,7 +24,10 @@ def _infidelity(a, b):
 
 def _make_random_three_qubit_gate():
     """Create a random three-qubit gate."""
-    operation = qutip.rand_unitary(8, dims=[[2]*3]*2)
+    if parse_version(qutip.__version__) < parse_version('5.dev'):
+        operation = qutip.rand_unitary(8, dims=[[2] * 3] * 2)
+    else:
+        operation = qutip.rand_unitary([2] * 3)
 
     def gate(N=None, controls=None, target=None):
         if N is None:
@@ -272,7 +276,10 @@ def test_permutation_without_expansion(self, permutation):
     def test_general_qubit_expansion(self, n_targets):
         # Test all permutations with the given number of targets.
         n_qubits = 5
-        operation = qutip.rand_unitary(2**n_targets, dims=[[2]*n_targets]*2)
+        if parse_version(qutip.__version__) < parse_version('5.dev'):
+            operation = qutip.rand_unitary(2**n_targets, dims=[[2]*n_targets]*2)
+        else:
+            operation = qutip.rand_unitary([2]*n_targets)
         for targets in itertools.permutations(range(n_qubits), n_targets):
             expected = _tensor_with_entanglement([qutip.qeye(2)] * n_qubits,
                                                  operation, targets)
@@ -339,7 +346,10 @@ def test_non_qubit_systems(self, dimensions):
             np.testing.assert_allclose(test.full(), expected.full())
 
 def test_gates_class():
-    init_state = qutip.rand_ket(8, dims=[[2, 2, 2], [1, 1, 1]])
+    if parse_version(qutip.__version__) < parse_version('5.dev'):
+        init_state = qutip.rand_ket(8, dims=[[2, 2, 2], [1, 1, 1]])
+    else:
+        init_state = qutip.rand_ket([2, 2, 2])
 
     circuit1 = QubitCircuit(3)
     circuit1.add_gate("X", 1)

tests/test_optpulseprocessor.py

@@ -116,7 +116,12 @@ def test_with_model(self):
         processor.load_circuit(
             qc, merge_gates=True, num_tslots=10, evo_time=2.0
         )
-        init_state = qutip.rand_ket(8, dims=[[2, 2, 2], [1, 1, 1]])
+
+        if parse_version(qutip.__version__) < parse_version('5.dev'):
+            init_state = qutip.rand_ket(8, dims=[[2, 2, 2], [1, 1, 1]])
+        else:
+            init_state = qutip.rand_ket([2, 2, 2])
+
         num_result = processor.run_state(init_state=init_state).states[-1]
         ideal_result = qc.run(init_state)
         assert (