Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated use of qiskit.test.mock #1547

Merged
merged 4 commits into from
Jun 28, 2022
Merged

Remove deprecated use of qiskit.test.mock #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10054dd
Remove deprecated use of qiskit.test.mock
jakelishman Jun 27, 2022
ebd40c1
Flatten unnecessarily nested import
jakelishman Jun 27, 2022
e5baafa
Merge remote-tracking branch 'ibm/main' into change-qiskit.test.mock
jakelishman Jun 27, 2022
f5894a8
Merge branch 'main' into change-qiskit.test.mock
hhorii Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions releasenotes/notes/terra-version-bump-68eac37136428805.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
The required version of Qiskit Terra has been bumped to 0.20.0.
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def install_needed_req(import_name, package_name=None, min_version=None, max_ver
if not _DISABLE_CONAN:
setup_requirements.append('conan>=1.22.2')

requirements = common_requirements + ['qiskit-terra>=0.19.1', 'scipy>=1.0']
requirements = common_requirements + ['qiskit-terra>=0.20.0', 'scipy>=1.0']

if not hasattr(setuptools,
'find_namespace_packages') or not inspect.ismethod(
Expand Down
3 changes: 1 addition & 2 deletions test/terra/backends/test_config_pulse_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
from test.terra import common

from qiskit import QuantumCircuit, transpile, schedule
from qiskit.test.mock.backends.armonk.fake_armonk import FakeArmonk
from qiskit.test.mock.backends.athens.fake_athens import FakeAthens
from qiskit.providers.fake_provider import FakeArmonk, FakeAthens

from qiskit.providers.aer.backends import PulseSimulator
from qiskit.pulse import (Schedule, Play, ShiftPhase, SetPhase, Delay, Acquire,
Expand Down
2 changes: 1 addition & 1 deletion test/terra/backends/test_pulse_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel
from qiskit.providers.models.backendconfiguration import UchannelLO
from qiskit.providers.aer.aererror import AerError
from qiskit.test.mock import FakeArmonk
from qiskit.providers.fake_provider import FakeArmonk

from .pulse_sim_independent import (simulate_1q_model,
simulate_2q_exchange_model,
Expand Down
4 changes: 2 additions & 2 deletions test/terra/pulse/test_system_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import numpy as np
from numpy.linalg import norm
from test.terra.common import QiskitAerTestCase
from qiskit.test.mock import FakeOpenPulse2Q
from qiskit.providers.fake_provider import FakeOpenPulse2Q
from qiskit.providers.aer.pulse.system_models.pulse_system_model import PulseSystemModel
from qiskit.providers.aer.pulse.system_models.hamiltonian_model import HamiltonianModel
from qiskit.test.mock import FakeArmonk
from qiskit.providers.fake_provider import FakeArmonk
from qiskit.providers.models.backendconfiguration import UchannelLO


Expand Down