From 9fdbc46fd330b7b48377527fe8b2f6b40e27e843 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Fri, 24 Jun 2022 11:59:26 -0400 Subject: [PATCH 1/2] fix fake bogota import --- test/unit/test_ibm_job_states.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/test_ibm_job_states.py b/test/unit/test_ibm_job_states.py index 831a8ef2e..b47c17c0e 100644 --- a/test/unit/test_ibm_job_states.py +++ b/test/unit/test_ibm_job_states.py @@ -25,7 +25,7 @@ from qiskit import transpile from qiskit.providers import JobTimeoutError from qiskit.providers.jobstatus import JobStatus -from qiskit.test.mock.backends.bogota.fake_bogota import FakeBogota +from qiskit.providers.fake_provider import FakeBogota from qiskit.test.reference_circuits import ReferenceCircuits from qiskit_ibm_provider.api.exceptions import ( From 3d1cf7399ebebee83e3156317153d31d980c9620 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Fri, 1 Jul 2022 09:48:49 -0400 Subject: [PATCH 2/2] fix all qiskit test mock imports --- qiskit_ibm_provider/jupyter/__init__.py | 2 +- qiskit_ibm_provider/jupyter/backend_info.py | 2 +- qiskit_ibm_provider/jupyter/config_widget.py | 2 +- qiskit_ibm_provider/jupyter/gates_widget.py | 2 +- qiskit_ibm_provider/jupyter/jobs_widget.py | 2 +- qiskit_ibm_provider/jupyter/live_data_widget.py | 2 +- qiskit_ibm_provider/jupyter/qubits_widget.py | 2 +- qiskit_ibm_provider/jupyter/utils.py | 2 +- qiskit_ibm_provider/test/ibm_provider_mock.py | 3 ++- test/fake_account_client.py | 2 +- test/unit/mock/fake_account_client.py | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/qiskit_ibm_provider/jupyter/__init__.py b/qiskit_ibm_provider/jupyter/__init__.py index e775a54ac..91d5260d4 100644 --- a/qiskit_ibm_provider/jupyter/__init__.py +++ b/qiskit_ibm_provider/jupyter/__init__.py @@ -72,7 +72,7 @@ from IPython import get_ipython # pylint: disable=import-error from .dashboard.dashboard import IBMDashboardMagic - from qiskit.test.mock import FakeBackendV2 as FakeBackend + from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from ..ibm_backend import IBMBackend from .backend_info import backend_widget diff --git a/qiskit_ibm_provider/jupyter/backend_info.py b/qiskit_ibm_provider/jupyter/backend_info.py index 605163b1d..44a55db0e 100644 --- a/qiskit_ibm_provider/jupyter/backend_info.py +++ b/qiskit_ibm_provider/jupyter/backend_info.py @@ -18,7 +18,7 @@ import ipyvuetify as vue from IPython.display import display # pylint: disable=import-error -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.ibm_backend import IBMBackend from .config_widget import config_tab diff --git a/qiskit_ibm_provider/jupyter/config_widget.py b/qiskit_ibm_provider/jupyter/config_widget.py index a30b1d55d..53e874de1 100644 --- a/qiskit_ibm_provider/jupyter/config_widget.py +++ b/qiskit_ibm_provider/jupyter/config_widget.py @@ -16,7 +16,7 @@ from typing import Union import ipywidgets as wid -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.ibm_backend import IBMBackend from qiskit_ibm_provider.utils.converters import duration_difference diff --git a/qiskit_ibm_provider/jupyter/gates_widget.py b/qiskit_ibm_provider/jupyter/gates_widget.py index 81c007e8e..5b906f709 100644 --- a/qiskit_ibm_provider/jupyter/gates_widget.py +++ b/qiskit_ibm_provider/jupyter/gates_widget.py @@ -17,7 +17,7 @@ from typing import Union import ipywidgets as wid -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.ibm_backend import IBMBackend diff --git a/qiskit_ibm_provider/jupyter/jobs_widget.py b/qiskit_ibm_provider/jupyter/jobs_widget.py index 470c6f0ca..8cc625e6e 100644 --- a/qiskit_ibm_provider/jupyter/jobs_widget.py +++ b/qiskit_ibm_provider/jupyter/jobs_widget.py @@ -18,7 +18,7 @@ import ipywidgets as wid import plotly.graph_objects as go -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from ..ibm_backend import IBMBackend from ..visualization.interactive.plotly_wrapper import PlotlyWidget diff --git a/qiskit_ibm_provider/jupyter/live_data_widget.py b/qiskit_ibm_provider/jupyter/live_data_widget.py index 5c6e435db..b3cde87c0 100644 --- a/qiskit_ibm_provider/jupyter/live_data_widget.py +++ b/qiskit_ibm_provider/jupyter/live_data_widget.py @@ -27,7 +27,7 @@ import numpy as np from sklearn.decomposition import PCA from qiskit.providers.jobstatus import JobStatus -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend # PLOTS ENABLE_LEVEL_0 = False diff --git a/qiskit_ibm_provider/jupyter/qubits_widget.py b/qiskit_ibm_provider/jupyter/qubits_widget.py index 9608073a4..b09782c10 100644 --- a/qiskit_ibm_provider/jupyter/qubits_widget.py +++ b/qiskit_ibm_provider/jupyter/qubits_widget.py @@ -16,7 +16,7 @@ from typing import Union import ipywidgets as wid -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.ibm_backend import IBMBackend diff --git a/qiskit_ibm_provider/jupyter/utils.py b/qiskit_ibm_provider/jupyter/utils.py index 4fda67c2c..74da8b8c5 100644 --- a/qiskit_ibm_provider/jupyter/utils.py +++ b/qiskit_ibm_provider/jupyter/utils.py @@ -15,7 +15,7 @@ from datetime import datetime, timedelta from typing import Optional, Union -from qiskit.test.mock import FakeBackendV2 as FakeBackend +from qiskit.providers.fake_provider import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.backendreservation import BackendReservation from qiskit_ibm_provider.ibm_backend import IBMBackend diff --git a/qiskit_ibm_provider/test/ibm_provider_mock.py b/qiskit_ibm_provider/test/ibm_provider_mock.py index 7326d4003..6cc979bca 100644 --- a/qiskit_ibm_provider/test/ibm_provider_mock.py +++ b/qiskit_ibm_provider/test/ibm_provider_mock.py @@ -36,7 +36,8 @@ def mock_get_backend(backend): mock_ibm_provider = MagicMock() if not hasattr(backend_mocks, backend): raise NameError( - "The specified backend name is not a valid mock from " "qiskit.test.mock" + "The specified backend name is not a valid mock from " + "qiskit.providers.fake_provider" ) fake_backend = getattr(backend_mocks, backend)() mock_ibm_provider.get_backend.return_value = fake_backend diff --git a/test/fake_account_client.py b/test/fake_account_client.py index 043efc31b..127f233cd 100644 --- a/test/fake_account_client.py +++ b/test/fake_account_client.py @@ -23,7 +23,7 @@ from random import randrange from typing import Dict, Any -from qiskit.test.mock.backends.poughkeepsie.fake_poughkeepsie import FakePoughkeepsie +from qiskit.providers.fake_provider import FakePoughkeepsie from qiskit_ibm_provider.api.exceptions import ( RequestsApiError, diff --git a/test/unit/mock/fake_account_client.py b/test/unit/mock/fake_account_client.py index 872831e7b..14d4ab5bb 100644 --- a/test/unit/mock/fake_account_client.py +++ b/test/unit/mock/fake_account_client.py @@ -15,7 +15,7 @@ from datetime import datetime as python_datetime from typing import List, Dict, Any, Optional -from qiskit.test.mock.backends import FakeLima +from qiskit.providers.fake_provider import FakeLima class FakeApiBackend: