From a35c4ed30ebfc5bf930dd1234796c292328c0300 Mon Sep 17 00:00:00 2001 From: Manoel Marques Date: Thu, 23 Apr 2020 16:03:46 -0400 Subject: [PATCH 1/2] Append pauli.to_instruction to circuit --- qiskit/aqua/operators/weighted_pauli_operator.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qiskit/aqua/operators/weighted_pauli_operator.py b/qiskit/aqua/operators/weighted_pauli_operator.py index aa4b7a7de9..519f6b7630 100644 --- a/qiskit/aqua/operators/weighted_pauli_operator.py +++ b/qiskit/aqua/operators/weighted_pauli_operator.py @@ -709,7 +709,7 @@ def evaluation_instruction(self, statevector_mode, use_simulator_snapshot_mode=F # will remove global phase at default compilation level but the results here # rely on global phase. tmp_qc.barrier(list(range(self.num_qubits))) - tmp_qc.append(pauli, list(range(self.num_qubits))) + tmp_qc.append(pauli.to_instruction(), list(range(self.num_qubits))) instructions[pauli.to_label()] = tmp_qc.to_instruction() else: cr = ClassicalRegister(self.num_qubits) diff --git a/requirements.txt b/requirements.txt index 74bf8c0966..8628e9e198 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -qiskit-terra>=0.13.0 +qiskit-terra>=0.14.0 qiskit-ignis>=0.2.0 scipy>=1.0 sympy>=1.3 diff --git a/setup.py b/setup.py index 15f1b2f340..a7ae856e36 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ Qiskit Finance, Qiskit Machine Learning and Qiskit Optimization to experiment with real-world applications to quantum computing.""" requirements = [ - "qiskit-terra>=0.13.0", + "qiskit-terra>=0.14.0", "qiskit-ignis>=0.2.0", "scipy>=1.0", "sympy>=1.3", From d81305b0957ac41b4f9be6aa69dc12481732b02e Mon Sep 17 00:00:00 2001 From: Manoel Marques Date: Thu, 23 Apr 2020 16:43:11 -0400 Subject: [PATCH 2/2] prevent travis from installing requirements.txt --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 742b7b10d0..1d8d3bfc24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -344,6 +344,8 @@ jobs: - ml38 - optimization37 - optimization38 + install: + - pip --version script: - sort -f -u aqua137.dep aqua138.dep aqua237.dep aqua238.dep chemistry37.dep chemistry38.dep finance37.dep finance38.dep ml37.dep ml38.dep optimization37.dep optimization38.dep || true - stage: Coverage