Merge pull request #710 from manoelmarques/stable

manoelmarques · web-flow · commit 997a378cb54c · 2019-10-16T15:46:33.000-04:00
[Stable] Release 0.6.1
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,7 @@
 # that they have been altered from the originals.
 
 notifications:
-    on_success: change
-    on_failure: always
+  email: false
 
 cache: pip
 os: linux
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,9 +15,17 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
 > -   **Fixed**: for any bug fixes.
 > -   **Security**: in case of vulnerabilities.
 
-[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.0...HEAD)
+[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.1...HEAD)
 ========================================================================
 
+[0.6.1](https://github.com/Qiskit/qiskit-aqua/compare/0.6.0...0.6.1) - 2019-10-16
+=================================================================================
+
+Changed
+-------
+
+-   Remove terra cap from stable branch. (#709)
+
 [0.6.0](https://github.com/Qiskit/qiskit-aqua/compare/0.5.5...0.6.0) - 2019-08-22
 =================================================================================
 
diff --git a/qiskit/aqua/VERSION.txt b/qiskit/aqua/VERSION.txt
@@ -1 +1 @@
-0.6.0
+0.6.1
diff --git a/qiskit/aqua/algorithms/adaptive/qgan/qgan.py b/qiskit/aqua/algorithms/adaptive/qgan/qgan.py
@@ -130,7 +130,7 @@ def __init__(self, data, bounds=None, num_qubits=None, batch_size=500, num_epoch
         self._num_qubits = num_qubits
         if np.ndim(data) > 1:
             if self._num_qubits is None:
-                self._num_qubits = np.ones[len(data[0])]*3
+                self._num_qubits = np.ones[len(data[0])]*3  # pylint: disable=unsubscriptable-object
             self._prob_data = np.zeros(int(np.prod(np.power(np.ones(len(self._data[0]))*2, self._num_qubits))))
         else:
             if self._num_qubits is None:
diff --git a/qiskit/aqua/components/multiclass_extensions/all_pairs.py b/qiskit/aqua/components/multiclass_extensions/all_pairs.py
@@ -86,7 +86,7 @@ def test(self, x, y):
         B = y
         _l = len(A)
         diff = np.sum(A != B)
-        logger.debug("%d out of %d are wrong" % (diff, _l))
+        logger.debug("%d out of %d are wrong", diff, _l)
         return 1. - (diff * 1.0 / _l)
 
     def predict(self, x):
diff --git a/qiskit/aqua/components/multiclass_extensions/error_correcting_code.py b/qiskit/aqua/components/multiclass_extensions/error_correcting_code.py
@@ -71,8 +71,8 @@ def train(self, x, y):
         classes_index = dict((c, i) for i, c in enumerate(self.classes))
         Y = np.array([self.codebook[classes_index[y[i]]]
                       for i in range(x.shape[0])], dtype=np.int)
-        logger.info("Require {} estimators.".format(Y.shape[1]))
-        for i in range(Y.shape[1]):
+        logger.info("Require {} estimators.".format(Y.shape[1]))  # pylint: disable=unsubscriptable-object
+        for i in range(Y.shape[1]):  # pylint: disable=unsubscriptable-object
             y_bit = Y[:, i]
             unique_y = np.unique(y_bit)
             if len(unique_y) == 1:
@@ -96,7 +96,7 @@ def test(self, x, y):
         B = y
         _l = len(A)
         diff = np.sum(A != B)
-        logger.debug("%d out of %d are wrong" % (diff, _l))
+        logger.debug("%d out of %d are wrong", diff, _l)
         return 1 - (diff * 1.0 / _l)
 
     def predict(self, x):
diff --git a/qiskit/aqua/components/multiclass_extensions/one_against_rest.py b/qiskit/aqua/components/multiclass_extensions/one_against_rest.py
@@ -77,7 +77,7 @@ def test(self, x, y):
         B = y
         _l = len(A)
         diff = np.sum(A != B)
-        logger.debug("%d out of %d are wrong" % (diff, _l))
+        logger.debug("%d out of %d are wrong", diff, _l)
         return 1 - (diff * 1.0 / _l)
 
     def predict(self, x):
diff --git a/qiskit/aqua/operators/tpb_grouped_weighted_pauli_operator.py b/qiskit/aqua/operators/tpb_grouped_weighted_pauli_operator.py
@@ -210,5 +210,5 @@ def multiply(self, other):
             TPBGroupedWeightedPauliOperator: the multiplied operator
         """
         ret_op = super().multiply(other)
-        ret_op = ret_op._grouping_func(ret_op, **self._kwargs)
+        ret_op = ret_op._grouping_func(ret_op, **self._kwargs)  # pylint: disable=no-member
         return ret_op
diff --git a/qiskit/aqua/utils/random_matrix_generator.py b/qiskit/aqua/utils/random_matrix_generator.py
@@ -286,7 +286,7 @@ def limit_entries(mat, n=5, sparsity=None):
     if sparsity is not None:
         n = int(sparsity*mat.shape[0]*mat.shape[1])
     entries = entries[:n]
-    row, col, data = np.array(entries).T
+    row, col, data = np.array(entries).T  # pylint: disable=unpacking-non-sequence
     return scipy.sparse.csr_matrix(
         (data, (row.real.astype(int), col.real.astype(int))))
 
diff --git a/qiskit/chemistry/aqua_extensions/algorithms/q_equation_of_motion/q_equation_of_motion.py b/qiskit/chemistry/aqua_extensions/algorithms/q_equation_of_motion/q_equation_of_motion.py
@@ -371,6 +371,7 @@ def _get_result(op):
                 v_mat[mu][nu] = v_mean if v_mean != 0.0 else v_mat[mu][nu]
 
         if self._is_eom_matrix_symmetric:
+            # pylint: disable=unsubscriptable-object
             q_mat = q_mat + q_mat.T - np.identity(q_mat.shape[0]) * q_mat
             w_mat = w_mat + w_mat.T - np.identity(w_mat.shape[0]) * w_mat
             m_mat = m_mat + m_mat.T - np.identity(m_mat.shape[0]) * m_mat
diff --git a/qiskit/chemistry/fermionic_operator.py b/qiskit/chemistry/fermionic_operator.py
@@ -444,7 +444,7 @@ def _convert_to_interleaved_spins(self):
           to up-down-up-down-up-down-up-down
         """
         matrix = np.zeros((self._h1.shape), self._h1.dtype)
-        n = matrix.shape[0]
+        n = matrix.shape[0]  # pylint: disable=unsubscriptable-object
         j = np.arange(n // 2)
         matrix[j, 2 * j] = 1.0
         matrix[j + n // 2, 2 * j + 1] = 1.0
@@ -457,7 +457,7 @@ def _convert_to_block_spins(self):
           to up-up-up-up-down-down-down-down
         """
         matrix = np.zeros((self._h1.shape), self._h1.dtype)
-        n = matrix.shape[0]
+        n = matrix.shape[0]  # pylint: disable=unsubscriptable-object
         j = np.arange(n // 2)
         matrix[2 * j, j] = 1.0
         matrix[2 * j + 1, n // 2 + j] = 1.0
diff --git a/test/aqua/test_docplex.py b/test/aqua/test_docplex.py
@@ -297,6 +297,7 @@ def test_docplex_constant_and_quadratic_terms_in_object_function(self):
                               [1., -0., 1., -2.]])
 
         mdl = Model()
+        # pylint: disable=unsubscriptable-object
         n = laplacian.shape[0]
         bias = [0] * 4
         x = {i: mdl.binary_var(name='x_{0}'.format(i)) for i in range(n)}
diff --git a/test/aqua/test_initial_state_zero.py b/test/aqua/test_initial_state_zero.py
@@ -41,12 +41,14 @@ def test_qubits_2_circuit(self):
         """ Qubits 2 Circuit test """
         zero = Zero(2)
         cct = zero.construct_circuit('circuit')
+        # pylint: disable=no-member
         self.assertEqual(cct.qasm(), 'OPENQASM 2.0;\ninclude "qelib1.inc";\nqreg q[2];\n')
 
     def test_qubits_5_circuit(self):
         """ Qubits 5 circuit test """
         zero = Zero(5)
         cct = zero.construct_circuit('circuit')
+        # pylint: disable=no-member
         self.assertEqual(cct.qasm(), 'OPENQASM 2.0;\ninclude "qelib1.inc";\nqreg q[5];\n')
 
 
diff --git a/test/aqua/test_portfolio_diversification.py b/test/aqua/test_portfolio_diversification.py
@@ -90,12 +90,12 @@ def _populate_by_row(self, prob, my_obj, my_ub, my_lb, my_ctype, my_sense, my_rh
         prob.set_results_stream(None)
 
         rows = []
-        col = [x for x in range(n**2, n**2+n)]
+        col = list(range(n**2, n**2+n))
         coef = [1 for x in range(0, n)]
         rows.append([col, coef])
 
         for i_i in range(0, n):
-            col = [x for x in range(0+n*i_i, n+n*i_i)]
+            col = list(range(0+n*i_i, n+n*i_i))
             coef = [1 for x in range(0, n)]
 
             rows.append([col, coef])
