From c5f7ceacad9ab6e8eee58e7c177bf3c81151b343 Mon Sep 17 00:00:00 2001 From: "Diego M. Rodriguez" Date: Sat, 11 May 2019 12:47:08 +0200 Subject: [PATCH 1/2] Remote deprecated qiskit.qiskiterror module --- qiskit/qiskiterror.py | 23 ------------------- .../quantum_info/operators/base_operator.py | 2 +- qiskit/quantum_info/operators/channel/chi.py | 2 +- qiskit/quantum_info/operators/channel/choi.py | 2 +- .../quantum_info/operators/channel/kraus.py | 2 +- qiskit/quantum_info/operators/channel/ptm.py | 2 +- .../operators/channel/quantum_channel.py | 2 +- .../operators/channel/stinespring.py | 2 +- .../quantum_info/operators/channel/superop.py | 2 +- .../operators/channel/transformations.py | 2 +- qiskit/quantum_info/operators/measures.py | 2 +- qiskit/quantum_info/operators/operator.py | 2 +- 12 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 qiskit/qiskiterror.py diff --git a/qiskit/qiskiterror.py b/qiskit/qiskiterror.py deleted file mode 100644 index f1a3ff083e4e..000000000000 --- a/qiskit/qiskiterror.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- - -# This code is part of Qiskit. -# -# (C) Copyright IBM 2017. -# -# 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 -# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0. -# -# Any modifications or derivative works of this code must retain this -# copyright notice, and modified files need to carry a notice indicating -# that they have been altered from the originals. - -"""Exception for errors raised by Qiskit. - -Note: this module will be deprecated in Terra 0.8+. Please import the exceptions -from the `qiskit.exceptions` module instead. -""" - -# pylint: disable=unused-import - -from .exceptions import QiskitError diff --git a/qiskit/quantum_info/operators/base_operator.py b/qiskit/quantum_info/operators/base_operator.py index 8b573bb1a9c1..d814451bae71 100644 --- a/qiskit/quantum_info/operators/base_operator.py +++ b/qiskit/quantum_info/operators/base_operator.py @@ -12,7 +12,7 @@ import numpy as np -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.predicates import ATOL_DEFAULT, RTOL_DEFAULT diff --git a/qiskit/quantum_info/operators/channel/chi.py b/qiskit/quantum_info/operators/channel/chi.py index 08733ff26460..d6eeeb8d1b9b 100644 --- a/qiskit/quantum_info/operators/channel/chi.py +++ b/qiskit/quantum_info/operators/channel/chi.py @@ -27,7 +27,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.choi import Choi from qiskit.quantum_info.operators.channel.superop import SuperOp diff --git a/qiskit/quantum_info/operators/channel/choi.py b/qiskit/quantum_info/operators/channel/choi.py index 12a5b69681a4..0f8cc4e2e616 100644 --- a/qiskit/quantum_info/operators/channel/choi.py +++ b/qiskit/quantum_info/operators/channel/choi.py @@ -28,7 +28,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.superop import SuperOp from qiskit.quantum_info.operators.channel.transformations import _to_choi diff --git a/qiskit/quantum_info/operators/channel/kraus.py b/qiskit/quantum_info/operators/channel/kraus.py index f737eddb7a99..7105383b812f 100644 --- a/qiskit/quantum_info/operators/channel/kraus.py +++ b/qiskit/quantum_info/operators/channel/kraus.py @@ -32,7 +32,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.predicates import is_identity_matrix from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.choi import Choi diff --git a/qiskit/quantum_info/operators/channel/ptm.py b/qiskit/quantum_info/operators/channel/ptm.py index a7f80fc52a3f..d2843ef3939b 100644 --- a/qiskit/quantum_info/operators/channel/ptm.py +++ b/qiskit/quantum_info/operators/channel/ptm.py @@ -33,7 +33,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.superop import SuperOp from qiskit.quantum_info.operators.channel.transformations import _to_ptm diff --git a/qiskit/quantum_info/operators/channel/quantum_channel.py b/qiskit/quantum_info/operators/channel/quantum_channel.py index 645cf6bce985..7912bbaae988 100644 --- a/qiskit/quantum_info/operators/channel/quantum_channel.py +++ b/qiskit/quantum_info/operators/channel/quantum_channel.py @@ -12,7 +12,7 @@ import numpy as np -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.base_operator import BaseOperator from qiskit.quantum_info.operators.operator import Operator from qiskit.quantum_info.operators.predicates import is_identity_matrix diff --git a/qiskit/quantum_info/operators/channel/stinespring.py b/qiskit/quantum_info/operators/channel/stinespring.py index c105402e626a..194d9f7ae160 100644 --- a/qiskit/quantum_info/operators/channel/stinespring.py +++ b/qiskit/quantum_info/operators/channel/stinespring.py @@ -30,7 +30,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.predicates import is_identity_matrix from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.kraus import Kraus diff --git a/qiskit/quantum_info/operators/channel/superop.py b/qiskit/quantum_info/operators/channel/superop.py index d52779e30f38..8e643dbafb6e 100644 --- a/qiskit/quantum_info/operators/channel/superop.py +++ b/qiskit/quantum_info/operators/channel/superop.py @@ -26,7 +26,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.channel.quantum_channel import QuantumChannel from qiskit.quantum_info.operators.channel.transformations import _to_superop from qiskit.quantum_info.operators.channel.transformations import _bipartite_tensor diff --git a/qiskit/quantum_info/operators/channel/transformations.py b/qiskit/quantum_info/operators/channel/transformations.py index a034fbc30d64..bb8e0ae35bb9 100644 --- a/qiskit/quantum_info/operators/channel/transformations.py +++ b/qiskit/quantum_info/operators/channel/transformations.py @@ -13,7 +13,7 @@ import numpy as np import scipy.linalg as la -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.predicates import is_hermitian_matrix from qiskit.quantum_info.operators.predicates import ATOL_DEFAULT diff --git a/qiskit/quantum_info/operators/measures.py b/qiskit/quantum_info/operators/measures.py index 9d7a9d2b59b0..05c59898fdb9 100644 --- a/qiskit/quantum_info/operators/measures.py +++ b/qiskit/quantum_info/operators/measures.py @@ -20,7 +20,7 @@ import numpy as np -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators import Operator from qiskit.quantum_info.operators import SuperOp diff --git a/qiskit/quantum_info/operators/operator.py b/qiskit/quantum_info/operators/operator.py index 8356559db489..933bc2195ca7 100644 --- a/qiskit/quantum_info/operators/operator.py +++ b/qiskit/quantum_info/operators/operator.py @@ -14,7 +14,7 @@ from qiskit.circuit.quantumcircuit import QuantumCircuit from qiskit.circuit.instruction import Instruction -from qiskit.qiskiterror import QiskitError +from qiskit.exceptions import QiskitError from qiskit.quantum_info.operators.predicates import is_unitary_matrix from qiskit.quantum_info.operators.base_operator import BaseOperator From 13be86699cde026b8495cdf55b99a71de58da8f7 Mon Sep 17 00:00:00 2001 From: "Diego M. Rodriguez" Date: Sat, 11 May 2019 12:49:28 +0200 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5531bf766d02..9c93b8312b1f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -30,6 +30,8 @@ Removed - The previously deprecated ``qiskit._util`` module has been removed. Use ``qiskit.util`` instead. (#2329) - The logging tools in ``qiskit.tools.logging`` are removed. (#2387) +- The ``qiskit.qiskiterror`` module has been removed. Please use + ``qiskit.exceptions`` instead. (#2399) `0.8.0`_ - 2019-05-02 =====================