Merge branch 'new_device_feature_branch' into generalize_ops

PennyLaneAI · Apr 25, 2024 · 22bf8c3 · 22bf8c3
2 parents 7f7fdf2 + f0c6dc9
commit 22bf8c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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