diff --git a/.github/workflows/test_dev_ext.yml b/.github/workflows/test_dev_ext.yml index ef1daf26..7be40eee 100644 --- a/.github/workflows/test_dev_ext.yml +++ b/.github/workflows/test_dev_ext.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: 3.9 - name: Install qvm run: | find /usr/lib -name "libffi.so*" @@ -66,7 +66,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: 3.8 + python-version: 3.9 - name: Install OpenQAOA run: | diff --git a/examples/02_simulators_comparison.ipynb b/examples/02_simulators_comparison.ipynb index 5ca47ca4..721c15fd 100644 --- a/examples/02_simulators_comparison.ipynb +++ b/examples/02_simulators_comparison.ipynb @@ -200,10 +200,9 @@ } ], "source": [ - "from qiskit import Aer\n", - "from qiskit.test.mock import FakeVigo\n", - "from qiskit.providers.aer.noise import NoiseModel\n", - "from qiskit.providers.aer import QasmSimulator\n", + "from qiskit_ibm_runtime.fake_provider import FakeVigo\n", + "from qiskit_aer.noise import NoiseModel\n", + "from qiskit_aer import QasmSimulator\n", "device_backend = FakeVigo()\n", "device = QasmSimulator.from_backend(device_backend)\n", "noise_model = NoiseModel.from_backend(device)" @@ -324,9 +323,9 @@ ], "metadata": { "kernelspec": { - "display_name": "fix_qiskit_and_deprecations", + "display_name": "Python 3", "language": "python", - "name": "fix_qiskit_and_deprecations" + "name": "python3" }, "language_info": { "codemirror_mode": { @@ -352,11 +351,6 @@ "toc_position": {}, "toc_section_display": true, "toc_window_display": false - }, - "vscode": { - "interpreter": { - "hash": "d2582286b70c3b030a2fde61b871db03dec7fee33191883f4394b540a2eb90c7" - } } }, "nbformat": 4, diff --git a/src/openqaoa-azure/requirements.txt b/src/openqaoa-azure/requirements.txt index 1132ee17..d91373cb 100644 --- a/src/openqaoa-azure/requirements.txt +++ b/src/openqaoa-azure/requirements.txt @@ -1,4 +1,4 @@ qdk -qiskit-qir +qiskit-qir~=0.5.0 qiskit-ionq azure-quantum[qiskit] \ No newline at end of file diff --git a/src/openqaoa-qiskit/openqaoa_qiskit/backends/qaoa_qiskit_sim.py b/src/openqaoa-qiskit/openqaoa_qiskit/backends/qaoa_qiskit_sim.py index 152b757f..7d4f3efa 100644 --- a/src/openqaoa-qiskit/openqaoa_qiskit/backends/qaoa_qiskit_sim.py +++ b/src/openqaoa-qiskit/openqaoa_qiskit/backends/qaoa_qiskit_sim.py @@ -3,8 +3,8 @@ # IBM Qiskit imports from qiskit import QuantumCircuit, QuantumRegister -from qiskit.providers.aer import AerSimulator -from qiskit.providers.aer.noise import NoiseModel +from qiskit_aer import AerSimulator +from qiskit_aer.noise import NoiseModel from qiskit.quantum_info import Statevector, SparsePauliOp from qiskit.circuit import Parameter diff --git a/src/openqaoa-qiskit/requirements.txt b/src/openqaoa-qiskit/requirements.txt index 469ae1b6..f2ce81dd 100644 --- a/src/openqaoa-qiskit/requirements.txt +++ b/src/openqaoa-qiskit/requirements.txt @@ -1,3 +1,5 @@ -qiskit>=0.36.1,<1.0 +qiskit~=1.0.0 qiskit-ibm-provider -qiskit-aer \ No newline at end of file +qiskit-aer +qiskit-ibm-runtime +mitiq[qiskit] \ No newline at end of file diff --git a/src/openqaoa-qiskit/tests/test_qpu_qiskit.py b/src/openqaoa-qiskit/tests/test_qpu_qiskit.py index 88793669..348652f6 100644 --- a/src/openqaoa-qiskit/tests/test_qpu_qiskit.py +++ b/src/openqaoa-qiskit/tests/test_qpu_qiskit.py @@ -9,7 +9,6 @@ from qiskit import QuantumCircuit from qiskit.quantum_info import Operator -from qiskit.tools.monitor import job_monitor from qiskit_ibm_provider.job.exceptions import IBMJobError from qiskit.converters import circuit_to_dag, dag_to_circuit diff --git a/src/openqaoa-qiskit/tests/test_workflows_qiskit.py b/src/openqaoa-qiskit/tests/test_workflows_qiskit.py index 6f4153b6..518dec86 100644 --- a/src/openqaoa-qiskit/tests/test_workflows_qiskit.py +++ b/src/openqaoa-qiskit/tests/test_workflows_qiskit.py @@ -4,8 +4,8 @@ import numpy as np import datetime -from qiskit.providers.fake_provider import FakeVigo -from qiskit.providers.aer.noise import NoiseModel +from qiskit_ibm_runtime.fake_provider import FakeVigo +from qiskit_aer.noise import NoiseModel from qiskit_aer import AerSimulator from openqaoa import QAOA, RQAOA