qiskit 1.0.0b1__cp38-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl → 1.0.0rc1__cp38-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl

qiskit/VERSION.txt

@@ -1 +1 @@
-1.0.0b1
+1.0.0rc1

qiskit/__init__.py

@@ -14,9 +14,36 @@
 
 """Main Qiskit public functionality."""
 
+import importlib.metadata
+import importlib.util
+import os
 import sys
 import warnings
 
+try:
+    importlib.metadata.version("qiskit-terra")
+except importlib.metadata.PackageNotFoundError:
+    # All good!
+    pass
+else:
+    # 'qiskit.tools' is present in all 0.x series of Qiskit and not in Qiskit 1.0+.  If a dev has an
+    # editable install and switches from 0.x branches to 1.0+ branches, they might have an empty
+    # `qiskit/tools` folder in their path, which will appear as a "namespace package" with no valid
+    # location.  We catch that case as "not actually having Qiskit 0.x" as a convenience to devs.
+    _has_tools = getattr(importlib.util.find_spec("qiskit.tools"), "has_location", False)
+    _suppress_error = os.environ.get("QISKIT_SUPPRESS_1_0_IMPORT_ERROR", False) == "1"
+    if not _suppress_error and _has_tools:
+        raise ImportError(
+            "Qiskit is installed in an invalid environment that has both Qiskit >=1.0"
+            " and an earlier version."
+            " You should create a new virtual environment, and ensure that you do not mix"
+            " dependencies between Qiskit <1.0 and >=1.0."
+            " Any packages that depend on 'qiskit-terra' are not compatible with Qiskit 1.0 and"
+            " will need to be updated."
+            " Qiskit unfortunately cannot enforce this requirement during environment resolution."
+            " See https://qisk.it/packaging-1-0 for more detail."
+        )
+
 import qiskit._accelerate
 
 
@@ -37,22 +64,12 @@ sys.modules["qiskit._accelerate.optimize_1q_gates"] = qiskit._accelerate.optimiz
 sys.modules["qiskit._accelerate.sampled_exp_val"] = qiskit._accelerate.sampled_exp_val
 sys.modules["qiskit._accelerate.vf2_layout"] = qiskit._accelerate.vf2_layout
 sys.modules["qiskit._accelerate.error_map"] = qiskit._accelerate.error_map
-sys.modules[
-    "qiskit._accelerate.euler_one_qubit_decomposer"
-] = qiskit._accelerate.euler_one_qubit_decomposer
-sys.modules[
-    "qiskit._accelerate.convert_2q_block_matrix"
-] = qiskit._accelerate.convert_2q_block_matrix
-
-
-# Extend namespace for backwards compat
-from qiskit import namespace
-
-# Add hook to redirect imports from qiskit.providers.aer* to qiskit_aer*
-# this is necessary for backwards compatibility for users when qiskit-aer
-# and qiskit-terra shared the qiskit namespace
-new_meta_path_finder = namespace.QiskitElementImport("qiskit.providers.aer", "qiskit_aer")
-sys.meta_path = [new_meta_path_finder] + sys.meta_path
+sys.modules["qiskit._accelerate.euler_one_qubit_decomposer"] = (
+    qiskit._accelerate.euler_one_qubit_decomposer
+)
+sys.modules["qiskit._accelerate.convert_2q_block_matrix"] = (
+    qiskit._accelerate.convert_2q_block_matrix
+)
 
 # qiskit errors operator
 from qiskit.exceptions import QiskitError, MissingOptionalLibraryError
@@ -69,126 +86,20 @@ from qiskit import user_config as _user_config
 import qiskit.circuit.measure
 import qiskit.circuit.reset
 
-# Please note these are global instances, not modules.
-from qiskit.providers.basicaer import BasicAer
-
 _config = _user_config.get_config()
 
-# Moved to after IBMQ and Aer imports due to import issues
-# with other modules that check for IBMQ (tools)
-from qiskit.execute_function import execute
 from qiskit.compiler import transpile, assemble, schedule, sequence
 
 from .version import __version__
 
-
-class AerWrapper:
-    """Lazy loading wrapper for Aer provider."""
-
-    def __init__(self):
-        self.aer = None
-
-    def __bool__(self):
-        if self.aer is None:
-            try:
-                from qiskit.providers import aer
-
-                self.aer = aer.Aer
-                warnings.warn(
-                    "The qiskit.Aer entry point will be deprecated in a future release and "
-                    "subsequently removed. Instead you should use this "
-                    "directly from the root of the qiskit-aer package.",
-                    PendingDeprecationWarning,
-                    stacklevel=2,
-                )
-            except ImportError:
-                return False
-        return True
-
-    def __getattr__(self, attr):
-        if not self.aer:
-            try:
-                from qiskit.providers import aer
-
-                self.aer = aer.Aer
-                warnings.warn(
-                    "The qiskit.Aer entry point will be deprecated in a future release and "
-                    "subsequently removed. Instead you should use this "
-                    "directly from the root of the qiskit-aer package.",
-                    PendingDeprecationWarning,
-                    stacklevel=2,
-                )
-            except ImportError as ex:
-                raise MissingOptionalLibraryError(
-                    "qiskit-aer", "Aer provider", "pip install qiskit-aer"
-                ) from ex
-        return getattr(self.aer, attr)
-
-
-class IBMQWrapper:
-    """Lazy loading wrapper for IBMQ provider."""
-
-    def __init__(self):
-        self.ibmq = None
-
-    def __bool__(self):
-        if self.ibmq is None:
-            try:
-                from qiskit.providers import ibmq
-
-                self.ibmq = ibmq.IBMQ
-                warnings.warn(
-                    "The qiskit.IBMQ entrypoint and the qiskit-ibmq-provider package ("
-                    "accessible from 'qiskit.providers.ibmq`) are deprecated and will be removed "
-                    "in a future release. Instead you should use the qiskit-ibm-provider package "
-                    "which is accessible from 'qiskit_ibm_provider'. You can install it with "
-                    "'pip install qiskit_ibm_provider'",
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
-
-            except ImportError:
-                return False
-        return True
-
-    def __getattr__(self, attr):
-        if not self.ibmq:
-            try:
-                from qiskit.providers import ibmq
-
-                self.ibmq = ibmq.IBMQ
-                warnings.warn(
-                    "The qiskit.IBMQ entrypoint and the qiskit-ibmq-provider package ("
-                    "accessible from 'qiskit.providers.ibmq`) are deprecated and will be removed "
-                    "in a future release. Instead you should use the qiskit-ibm-provider package "
-                    "which is accessible from 'qiskit_ibm_provider'. You can install it with "
-                    "'pip install qiskit_ibm_provider'. Just replace 'qiskit.IBMQ' with "
-                    "'qiskit_ibm_provider.IBMProvider'",
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
-            except ImportError as ex:
-                raise MissingOptionalLibraryError(
-                    "qiskit-ibmq-provider", "IBMQ provider", "pip install qiskit-ibmq-provider"
-                ) from ex
-        return getattr(self.ibmq, attr)
-
-
-Aer = AerWrapper()
-IBMQ = IBMQWrapper()
-
 __all__ = [
-    "Aer",
     "AncillaRegister",
-    "BasicAer",
     "ClassicalRegister",
-    "IBMQ",
     "MissingOptionalLibraryError",
     "QiskitError",
     "QuantumCircuit",
     "QuantumRegister",
     "assemble",
-    "execute",
     "schedule",
     "sequence",
     "transpile",

qiskit/assembler/assemble_circuits.py

@@ -34,7 +34,7 @@ from qiskit.qobj import (
     converters,
     QobjHeader,
 )
-from qiskit.tools.parallel import parallel_map
+from qiskit.utils.parallel import parallel_map
 
 
 PulseLibrary = Dict[str, List[complex]]

qiskit/assembler/assemble_schedules.py

@@ -224,7 +224,7 @@ def _assemble_instructions(
     for time, instruction in sched.instructions:
 
         if isinstance(instruction, instructions.Play):
-            if isinstance(instruction.pulse, (library.ParametricPulse, library.SymbolicPulse)):
+            if isinstance(instruction.pulse, library.SymbolicPulse):
                 is_backend_supported = True
                 try:
                     pulse_shape = ParametricPulseShapes.from_instance(instruction.pulse).name

qiskit/assembler/disassemble.py

@@ -36,20 +36,6 @@ CircuitModule = NewType(
 # and a header dictionary.
 PulseModule = NewType("PulseModule", Tuple[List[pulse.Schedule], Dict[str, Any], Dict[str, Any]])
 
-# Prevent the disassembler from accessing deprecated circuit methods. This can happen for
-# gates where the name of the gate matches a circuit method (e.g. Isometry.name is "isometry")
-# and the circuit attribute is also QuantumCircuit.isometry
-_DEPRECATED_CIRCUIT_METHODS = {
-    "isometry",
-    "snapshot",
-    "ucrx",
-    "ucry",
-    "ucrz",
-    "squ",
-    "diagonal",
-    "hamiltonian",
-}
-
 
 def disassemble(qobj) -> Union[CircuitModule, PulseModule]:
     """Disassemble a qobj and return the circuits or pulse schedules, run_config, and user header.
@@ -179,9 +165,7 @@ def _experiments_to_circuits(qobj):
                     clbits.append(creg_dict[clbit_label[0]][clbit_label[1]])
             except Exception:  # pylint: disable=broad-except
                 pass
-            # TODO remove the check that name is not in the deprecated circuit methods
-            # once the methods have been removed
-            if hasattr(circuit, name) and name not in _DEPRECATED_CIRCUIT_METHODS:
+            if hasattr(circuit, name):
                 instr_method = getattr(circuit, name)
                 if i.name == "initialize":
                     _inst = instr_method(params, qubits)

qiskit/circuit/__init__.py

@@ -71,8 +71,7 @@ with equal probability.
 .. plot::
    :include-source:
 
-   from qiskit import BasicAer, transpile, QuantumRegister, ClassicalRegister, QuantumCircuit
-
+   from qiskit import transpile, QuantumRegister, ClassicalRegister, QuantumCircuit
    qr = QuantumRegister(1)
    cr = ClassicalRegister(1)
    qc = QuantumCircuit(qr, cr)
@@ -82,7 +81,8 @@ with equal probability.
 
 .. code-block::
 
-   backend = BasicAer.get_backend('qasm_simulator')
+   from qiskit.providers.basic_provider import BasicSimulator
+   backend = BasicSimulator()
    tqc = transpile(qc, backend)
    counts = backend.run(tqc).result().get_counts()
 
@@ -100,7 +100,7 @@ always be :math:`|1\\rangle`.
 .. plot::
    :include-source:
 
-   from qiskit import BasicAer, transpile, QuantumRegister, ClassicalRegister, QuantumCircuit
+   from qiskit import transpile, QuantumRegister, ClassicalRegister, QuantumCircuit
 
    qr = QuantumRegister(1)
    cr = ClassicalRegister(1)
@@ -115,7 +115,8 @@ always be :math:`|1\\rangle`.
 
 .. code-block::
 
-   backend = BasicAer.get_backend('qasm_simulator')
+   from qiskit.providers.basic_provider import BasicSimulator
+   backend = BasicSimulator()
    tqc = transpile(qc, backend)
    counts = backend.run(tqc).result().get_counts()
 
@@ -280,7 +281,6 @@ Gates and Instructions
    InstructionSet
    Operation
    EquivalenceLibrary
-   Store
 
 Control Flow Operations
 -----------------------
@@ -377,7 +377,6 @@ from .barrier import Barrier
 from .delay import Delay
 from .measure import Measure
 from .reset import Reset
-from .store import Store
 from .parameter import Parameter
 from .parametervector import ParameterVector
 from .parameterexpression import ParameterExpression
@@ -399,27 +398,4 @@ from .controlflow import (
     ContinueLoopOp,
 )
 
-
-_DEPRECATED_NAMES = {
-    "Int1": "qiskit.circuit.classicalfunction.types",
-    "Int2": "qiskit.circuit.classicalfunction.types",
-    "classical_function": "qiskit.circuit.classicalfunction",
-    "BooleanExpression": "qiskit.circuit.classicalfunction",
-}
-
-
-def __getattr__(name):
-    if name in _DEPRECATED_NAMES:
-        import importlib
-        import warnings
-
-        module_name = _DEPRECATED_NAMES[name]
-        warnings.warn(
-            f"Accessing '{name}' from '{__name__}' is deprecated since Qiskit Terra 0.22 "
-            f"and will be removed in 0.23.  Import from '{module_name}' instead. "
-            "This will require installing 'tweedledum' as an optional dependency from Terra 0.23.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return getattr(importlib.import_module(module_name), name)
-    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
+from .annotated_operation import AnnotatedOperation, InverseModifier, ControlModifier, PowerModifier