From 5581b16daef76d861418fd4fcafa427b2a3cffa5 Mon Sep 17 00:00:00 2001 From: Will Shanks Date: Tue, 28 Nov 2023 16:38:42 -0500 Subject: [PATCH] Remove workarounds for qiskit-aer 0.13.0 + Unpin qiskit-aer extra requirement now that 0.13.1 has been released and we do not have to worry about https://github.com/Qiskit/qiskit-aer/issues/1985 + Remove workaround in test for https://github.com/Qiskit/qiskit-aer/issues/1975 Note that the tests will not pass with 0.13.0 because the workaround was removed, but the workaround was for an Aer bug so we don't reflect it as an incomapitibility with qiskit-experiments. --- requirements-extras.txt | 3 ++- test/library/tomography/tomo_utils.py | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements-extras.txt b/requirements-extras.txt index 25689a0858..5c0e9f0de9 100644 --- a/requirements-extras.txt +++ b/requirements-extras.txt @@ -1,5 +1,6 @@ qiskit-ibm-provider>=0.6.1 # for submitting experiments to backends through the IBM provider cvxpy>=1.3.2 # for tomography scikit-learn # for discriminators -qiskit-aer>=0.11.0,<=0.12.2 # temporary version pin until 0.13.1 release +# Avoid qiskit-aer 0.13.0 because of https://github.com/Qiskit-Extensions/qiskit-experiments/issues/1292 +qiskit-aer>=0.11.0,!=0.13.0 qiskit_dynamics>=0.4.0 # for the PulseBackend diff --git a/test/library/tomography/tomo_utils.py b/test/library/tomography/tomo_utils.py index 1304876bb9..2a1e75b9ec 100644 --- a/test/library/tomography/tomo_utils.py +++ b/test/library/tomography/tomo_utils.py @@ -87,9 +87,7 @@ def readout_noise_model(num_qubits, seed=None): p1g0s = 0.15 * rng.random(num_qubits) p0g1s = 0.3 * rng.random(num_qubits) amats = np.stack([[1 - p1g0s, p1g0s], [p0g1s, 1 - p0g1s]]).T - # Set `basis_gates` so that reset is included. - # See https://github.com/Qiskit/qiskit-aer/issues/1975 - noise_model = NoiseModel(basis_gates=["id", "rz", "sx", "cx", "reset"]) + noise_model = NoiseModel() for i, amat in enumerate(amats): noise_model.add_readout_error(amat.T, [i]) return noise_model