diff --git a/docs/conf.py b/docs/conf.py index bfd6b61ff..d88a3f92d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -106,7 +106,7 @@ # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = 'en' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/qiskit_ibm_provider/jupyter/__init__.py b/qiskit_ibm_provider/jupyter/__init__.py index e775a54ac..c8991a9b4 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.fake_backend 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..9eeeaa49a 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.fake_backend 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..92b9e22d8 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.fake_backend 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..21fa28bdc 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.fake_backend 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..ab6b5e795 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.fake_backend 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..a3cb06d22 100644 --- a/qiskit_ibm_provider/jupyter/live_data_widget.py +++ b/qiskit_ibm_provider/jupyter/live_data_widget.py @@ -23,11 +23,12 @@ import logging import pytz from websocket import WebSocketApp + import ipywidgets as widgets 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.fake_backend 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..8e5845dcf 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.fake_backend 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..3b2dfcae7 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.fake_backend import FakeBackendV2 as FakeBackend from qiskit_ibm_provider.backendreservation import BackendReservation from qiskit_ibm_provider.ibm_backend import IBMBackend diff --git a/requirements-dev.txt b/requirements-dev.txt index 8268c9288..83a255774 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,7 +20,7 @@ reno>=2.11.0 scipy>=1.0 nbformat>=4.4.0 nbconvert>=5.3.1 -qiskit-aer +qiskit-aer>=0.10.3 websockets>=8 black==22.3.0 coverage>=6.3 diff --git a/requirements.txt b/requirements.txt index bfd37098b..c02804cf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ numpy>=1.13 urllib3>=1.21.1 python-dateutil>=2.8.0 websocket-client>=1.0.1 -websockets>=10.0 \ No newline at end of file +websockets>=10.0 diff --git a/test/fake_account_client.py b/test/fake_account_client.py index 043efc31b..f5eca6013 100644 --- a/test/fake_account_client.py +++ b/test/fake_account_client.py @@ -23,7 +23,9 @@ from random import randrange from typing import Dict, Any -from qiskit.test.mock.backends.poughkeepsie.fake_poughkeepsie import FakePoughkeepsie +from qiskit.providers.fake_provider.backends.poughkeepsie.fake_poughkeepsie import ( + FakePoughkeepsie, +) from qiskit_ibm_provider.api.exceptions import ( RequestsApiError, diff --git a/test/integration/test_ibm_qasm_simulator.py b/test/integration/test_ibm_qasm_simulator.py index 6d023c1f2..469a9cc07 100644 --- a/test/integration/test_ibm_qasm_simulator.py +++ b/test/integration/test_ibm_qasm_simulator.py @@ -17,7 +17,9 @@ from qiskit import ClassicalRegister, QuantumCircuit, QuantumRegister from qiskit.compiler import transpile -from qiskit.providers.aer.noise import NoiseModel +from qiskit.providers.aer.noise import ( + NoiseModel, +) # pylint: disable=import-error,no-name-in-module from qiskit.test.reference_circuits import ReferenceCircuits from qiskit_ibm_provider import IBMBackend diff --git a/test/unit/mock/fake_account_client.py b/test/unit/mock/fake_account_client.py index 872831e7b..a21a726d3 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.backends.lima.fake_lima import FakeLima class FakeApiBackend: diff --git a/test/unit/test_ibm_job_states.py b/test/unit/test_ibm_job_states.py index 831a8ef2e..4631177f8 100644 --- a/test/unit/test_ibm_job_states.py +++ b/test/unit/test_ibm_job_states.py @@ -25,7 +25,8 @@ 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.backends.bogota.fake_bogota import FakeBogota + from qiskit.test.reference_circuits import ReferenceCircuits from qiskit_ibm_provider.api.exceptions import (