[Stable] Prepare 0.9.3 release (#1617)

* Prepare 0.9.3 release * fix the tests after Terra #6634 (#1619) * Fix lint errors (#1618) * Fix lint errors * Round test decimal places * fix lint * Pin networkx (#1620) * pin yfinance Co-authored-by: Julien Gacon <[email protected]>
qiskit-community · Jul 12, 2021 · 249d18a · 249d18a
1 parent 95d4f57
commit 249d18a
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/qiskit/aqua/VERSION.txt b/qiskit/aqua/VERSION.txt
@@ -1 +1 @@
-0.9.2
+0.9.3
diff --git a/qiskit/aqua/circuits/boolean_logical_circuits.py b/qiskit/aqua/circuits/boolean_logical_circuits.py
@@ -1,6 +1,6 @@
 # This code is part of Qiskit.
 #
-# (C) Copyright IBM 2019, 2020.
+# (C) Copyright IBM 2019, 2021.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -312,7 +312,7 @@ def construct_circuit(
                                   flags=flags, mcx_mode=mct_mode)
                 qubits = self._variable_register[:] + [self._output_register[0]]
                 if self._ancillary_register:
-                    qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]
+                    qubits += self._ancillary_register[:and_circuit.num_ancillas]
 
                 circuit.compose(and_circuit, qubits, inplace=True)
         else:  # self._depth == 2:
@@ -335,7 +335,7 @@ def construct_circuit(
                                     flags=flags, mcx_mode=mct_mode)
                     qubits = self._variable_register[:] + [self._clause_register[clause_index]]
                     if self._ancillary_register:
-                        qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]
+                        qubits += self._ancillary_register[:or_circuit.num_ancillas]
 
                     circuit.compose(or_circuit, qubits, inplace=True)
 
@@ -359,7 +359,7 @@ def construct_circuit(
                                     flags=flags, mcx_mode=mct_mode)
                     qubits = self._variable_register[:] + [self._clause_register[clause_index]]
                     if self._ancillary_register:
-                        qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]
+                        qubits += self._ancillary_register[:or_circuit.num_ancillas]
 
                     circuit.compose(or_circuit, qubits, inplace=True)
 
@@ -418,7 +418,7 @@ def construct_circuit(
                                 flags=flags, mcx_mode=mct_mode)
                 qubits = self._variable_register[:] + [self._output_register[0]]
                 if self._ancillary_register:
-                    qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]
+                    qubits += self._ancillary_register[:or_circuit.num_ancillas]
 
                 circuit.compose(or_circuit, qubits, inplace=True)
             else:
@@ -441,7 +441,7 @@ def construct_circuit(
                                       flags=flags, mcx_mode=mct_mode)
                     qubits = self._variable_register[:] + [self._clause_register[clause_index]]
                     if self._ancillary_register:
-                        qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]
+                        qubits += self._ancillary_register[:and_circuit.num_ancillas]
 
                     circuit.compose(and_circuit, qubits, inplace=True)
                 else:
@@ -472,7 +472,7 @@ def construct_circuit(
                                       flags=flags, mcx_mode=mct_mode)
                     qubits = self._variable_register[:] + [self._clause_register[clause_index]]
                     if self._ancillary_register:
-                        qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]
+                        qubits += self._ancillary_register[:and_circuit.num_ancillas]
 
                     circuit.compose(and_circuit, qubits, inplace=True)
                 else:
@@ -535,7 +535,7 @@ def build_clause(clause_expr):
                               flags=flags, mcx_mode=mct_mode)
             qubits = self._variable_register[:] + [self._output_register[self._output_idx]]
             if self._ancillary_register:
-                qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]
+                qubits += self._ancillary_register[:and_circuit.num_ancillas]
 
             circuit.compose(and_circuit, qubits, inplace=True)
 

diff --git a/qiskit/ml/circuit/library/raw_feature_vector.py b/qiskit/ml/circuit/library/raw_feature_vector.py
@@ -166,14 +166,16 @@ def ordered_parameters(self) -> List[ParameterExpression]:
         return list(param for param in self._ordered_parameters
                     if isinstance(param, ParameterExpression))
 
-    def bind_parameters(self, value_dict):  # pylint: disable=arguments-differ
+    # pylint: disable=arguments-differ
+    def bind_parameters(self, values):
         """Bind parameters."""
-        if not isinstance(value_dict, dict):
-            value_dict = dict(zip(self.ordered_parameters, value_dict))
-        return super().bind_parameters(value_dict)
+        if not isinstance(values, dict):
+            values = dict(zip(self.ordered_parameters, values))
+        return super().bind_parameters(values)
 
-    def assign_parameters(self, param_dict, inplace=False):  # pylint: disable=arguments-differ
+    def assign_parameters(self, parameters, inplace=False):
         """Call the initialize instruction."""
+        param_dict = parameters
         if not isinstance(param_dict, dict):
             param_dict = dict(zip(self.ordered_parameters, param_dict))
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -15,7 +15,7 @@ discover
 qiskit-aer>=0.8.0,<0.10.0
 mypy>=0.780,<0.900
 mypy-extensions>=0.4.3
-networkx>=2.2
+networkx>=2.2,<2.6
 ipython<7.22.0
 ipykernel<5.5.2
 nbsphinx

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-qiskit-terra>=0.17.0
+qiskit-terra>=0.18.0
 qiskit-ignis>=0.6.0
 scipy>=1.4
 sympy>=1.3
@@ -13,6 +13,6 @@ setuptools>=40.1.0
 h5py<3.3.0
 pandas
 quandl
-yfinance
+yfinance<0.1.63
 retworkx>=0.8.0
 dataclasses; python_version < '3.7'
diff --git a/test/aqua/operators/test_gradients.py b/test/aqua/operators/test_gradients.py
@@ -658,7 +658,7 @@ def grad_combo_fn(x):
             return grad
 
         qc = RealAmplitudes(2, reps=1)
-        grad_op = ListOp([StateFn(qc)], combo_fn=combo_fn, grad_combo_fn=grad_combo_fn)
+        grad_op = ListOp([StateFn(qc.decompose())], combo_fn=combo_fn, grad_combo_fn=grad_combo_fn)
         grad = Gradient(grad_method=method).convert(grad_op, qc.ordered_parameters)
         value_dict = dict(zip(qc.ordered_parameters, np.random.rand(len(qc.ordered_parameters))))
         correct_values = [[(-0.16666259133549044+0j)], [(-7.244949702732864+0j)],
@@ -687,7 +687,7 @@ def grad_combo_fn(x):
             return grad
 
         qc = RealAmplitudes(2, reps=1)
-        grad_op = ListOp([StateFn(qc)], combo_fn=combo_fn, grad_combo_fn=grad_combo_fn)
+        grad_op = ListOp([StateFn(qc.decompose())], combo_fn=combo_fn, grad_combo_fn=grad_combo_fn)
         grad = NaturalGradient(grad_method='lin_comb', regularization='ridge'
                                ).convert(grad_op, qc.ordered_parameters)
         value_dict = dict(

diff --git a/test/chemistry/test_bosonic_esc_calculation.py b/test/chemistry/test_bosonic_esc_calculation.py
@@ -97,7 +97,7 @@ def test_vqe_uvccsd_factory(self):
         for idx, _ in enumerate(self.reference_energies):
             self.assertAlmostEqual(results.computed_vibronic_energies[idx],
                                    self.reference_energies[idx],
-                                   places=1)
+                                   places=0)
 
 
 if __name__ == '__main__':