diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c5d43a89a..3703508a6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,6 +29,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install git+https://github.com/PennyLaneAI/pennylane.git pip install -r requirements-ci-legacy.txt pip install wheel pytest pytest-cov pytest-mock flaky --upgrade pip freeze @@ -70,13 +71,16 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install git+https://github.com/PennyLaneAI/pennylane.git pip install -r requirements-ci-legacy.txt pip install wheel pytest pytest-cov pytest-mock pytest-benchmark flaky --upgrade + pip freeze - name: Install Plugin run: | python setup.py bdist_wheel pip install dist/PennyLane*.whl + pip freeze - name: Run tests run: | diff --git a/.github/workflows/tests_qiskit_1.yml b/.github/workflows/tests_qiskit_1.yml index 103abf4ef..1ad3c3b53 100644 --- a/.github/workflows/tests_qiskit_1.yml +++ b/.github/workflows/tests_qiskit_1.yml @@ -29,6 +29,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install git+https://github.com/PennyLaneAI/pennylane.git pip install -r requirements-ci.txt pip install wheel pytest pytest-cov pytest-mock flaky --upgrade pip freeze @@ -67,6 +68,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install git+https://github.com/PennyLaneAI/pennylane.git pip install -r requirements-ci.txt pip install wheel pytest pytest-cov pytest-mock pytest-benchmark flaky --upgrade diff --git a/pennylane_qiskit/converter.py b/pennylane_qiskit/converter.py index f06e3fddc..d4d065e2a 100644 --- a/pennylane_qiskit/converter.py +++ b/pennylane_qiskit/converter.py @@ -21,7 +21,6 @@ import numpy as np from qiskit import QuantumCircuit, ClassicalRegister, QuantumRegister -from pennylane_qiskit.qiskit_device import QISKIT_OPERATION_MAP from qiskit.converters import circuit_to_dag, dag_to_circuit from qiskit.circuit import Parameter, ParameterExpression, ParameterVector from qiskit.circuit import Measure, Barrier, ControlFlowOp, Clbit @@ -35,6 +34,7 @@ import pennylane as qml import pennylane.ops as pennylane_ops +from pennylane_qiskit.qiskit_device import QISKIT_OPERATION_MAP from pennylane_qiskit.qiskit_device import QISKIT_OPERATION_MAP