From 48336d4d57a6467f2c95894dcac1717ff03a0271 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 24 Jun 2020 08:56:57 -0400 Subject: [PATCH 1/4] Move Ignis to its own package Namespace packages are constant source of problems for users. The python packaging ecosystem around splitting packages across namespaces is fragile at the best of times and can often leave a you with an environment that isn't recoverable (especially when mixing install methods). There is also a performance hit whenever there is a piece of the namespace we allow external packages to extend since it requires doing a full python path search which can be slow depending on the backing I/O and the number of paths in sys.path for an environment. This commit addresses the piece from the ignis perspective by moving qiskit.ignis to it's own package and namespace 'qiskit_ignis'. This will be coupled with a change in terra that removes the arbitrary namespace hook points and hard coding the element namespace maps via a custom import loader at the root of the namespace. This has 2 advantages it removes the use of namespace packages so the fragility and performance impact are fixed since every element will be renamed to use 'qiskit_*' instead of 'qiskit.*', but it also makes it explicit where we extend the namespace. The previous method allowed any package to extend qiskit.* and qiskit.providers.* with whatever they wanted. This commit will need to be coordinated with the terra change to ensure we don't block development, because while it's not breaking for end users as a coordinated code release piecewise it's a breaking change for each element, including Ignis. Depends-On: Qiskit/qiskit-terra#4767 Fixes Qiskit/qiskit#559 --- MANIFEST.in | 2 +- {qiskit/ignis => qiskit_ignis}/VERSION.txt | 0 {qiskit/ignis => qiskit_ignis}/__init__.py | 0 .../ignis => qiskit_ignis}/characterization/__init__.py | 0 .../characterization/calibrations/__init__.py | 0 .../characterization/calibrations/fitters.py | 0 .../characterization/calibrations/ibmq_utils.py | 0 .../characterization/calibrations/pulse_schedules.py | 0 .../characterization/characterization_utils.py | 0 .../characterization/coherence/__init__.py | 0 .../characterization/coherence/circuits.py | 0 .../characterization/coherence/fitters.py | 0 .../ignis => qiskit_ignis}/characterization/fitters.py | 0 .../characterization/gates/__init__.py | 0 .../characterization/gates/circuits.py | 0 .../characterization/gates/fitters.py | 0 .../characterization/hamiltonian/__init__.py | 0 .../characterization/hamiltonian/circuits.py | 0 .../characterization/hamiltonian/fitters.py | 0 {qiskit/ignis => qiskit_ignis}/logging/__init__.py | 0 {qiskit/ignis => qiskit_ignis}/logging/ignis_logging.py | 0 {qiskit/ignis => qiskit_ignis}/logging/logging.yaml | 0 {qiskit/ignis => qiskit_ignis}/measurement/__init__.py | 0 .../measurement/discriminator/__init__.py | 0 .../measurement/discriminator/discriminators.py | 0 .../measurement/discriminator/filters.py | 0 .../measurement/discriminator/iq_discriminators.py | 0 {qiskit/ignis => qiskit_ignis}/mitigation/__init__.py | 0 .../mitigation/measurement/__init__.py | 0 .../mitigation/measurement/circuits.py | 0 .../mitigation/measurement/filters.py | 0 .../mitigation/measurement/fitters.py | 0 {qiskit/ignis => qiskit_ignis}/utils.py | 0 {qiskit/ignis => qiskit_ignis}/verification/__init__.py | 0 .../verification/accreditation/__init__.py | 0 .../verification/accreditation/circuits.py | 0 .../verification/accreditation/fitters.py | 0 .../verification/accreditation/qotp.py | 0 .../verification/entanglement/__init__.py | 0 .../verification/entanglement/analysis.py | 0 .../verification/entanglement/linear.py | 0 .../verification/entanglement/parallelize.py | 0 .../verification/quantum_volume/__init__.py | 0 .../verification/quantum_volume/circuits.py | 0 .../verification/quantum_volume/fitters.py | 0 .../verification/randomized_benchmarking/__init__.py | 0 .../verification/randomized_benchmarking/circuits.py | 0 .../verification/randomized_benchmarking/dihedral.py | 0 .../verification/randomized_benchmarking/fitters.py | 0 .../verification/randomized_benchmarking/rb_groups.py | 0 .../verification/randomized_benchmarking/rb_utils.py | 0 .../verification/tomography/__init__.py | 0 .../verification/tomography/basis/__init__.py | 0 .../verification/tomography/basis/circuits.py | 0 .../verification/tomography/basis/gatesetbasis.py | 0 .../verification/tomography/basis/paulibasis.py | 0 .../verification/tomography/basis/sicbasis.py | 0 .../verification/tomography/basis/tomographybasis.py | 0 .../verification/tomography/data.py | 0 .../verification/tomography/fitters/__init__.py | 0 .../verification/tomography/fitters/base_fitter.py | 0 .../verification/tomography/fitters/cvx_fit.py | 0 .../verification/tomography/fitters/gateset_fitter.py | 0 .../verification/tomography/fitters/lstsq_fit.py | 0 .../verification/tomography/fitters/process_fitter.py | 0 .../verification/tomography/fitters/state_fitter.py | 0 .../verification/topological_codes/__init__.py | 0 .../verification/topological_codes/circuits.py | 0 .../verification/topological_codes/fitters.py | 0 {qiskit/ignis => qiskit_ignis}/version.py | 0 setup.py | 8 +++----- 71 files changed, 4 insertions(+), 6 deletions(-) rename {qiskit/ignis => qiskit_ignis}/VERSION.txt (100%) rename {qiskit/ignis => qiskit_ignis}/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/calibrations/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/calibrations/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/calibrations/ibmq_utils.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/calibrations/pulse_schedules.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/characterization_utils.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/coherence/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/coherence/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/coherence/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/gates/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/gates/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/gates/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/hamiltonian/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/hamiltonian/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/characterization/hamiltonian/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/logging/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/logging/ignis_logging.py (100%) rename {qiskit/ignis => qiskit_ignis}/logging/logging.yaml (100%) rename {qiskit/ignis => qiskit_ignis}/measurement/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/measurement/discriminator/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/measurement/discriminator/discriminators.py (100%) rename {qiskit/ignis => qiskit_ignis}/measurement/discriminator/filters.py (100%) rename {qiskit/ignis => qiskit_ignis}/measurement/discriminator/iq_discriminators.py (100%) rename {qiskit/ignis => qiskit_ignis}/mitigation/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/mitigation/measurement/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/mitigation/measurement/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/mitigation/measurement/filters.py (100%) rename {qiskit/ignis => qiskit_ignis}/mitigation/measurement/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/utils.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/accreditation/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/accreditation/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/accreditation/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/accreditation/qotp.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/entanglement/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/entanglement/analysis.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/entanglement/linear.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/entanglement/parallelize.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/quantum_volume/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/quantum_volume/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/quantum_volume/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/dihedral.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/rb_groups.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/randomized_benchmarking/rb_utils.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/gatesetbasis.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/paulibasis.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/sicbasis.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/basis/tomographybasis.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/data.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/base_fitter.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/cvx_fit.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/gateset_fitter.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/lstsq_fit.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/process_fitter.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/tomography/fitters/state_fitter.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/topological_codes/__init__.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/topological_codes/circuits.py (100%) rename {qiskit/ignis => qiskit_ignis}/verification/topological_codes/fitters.py (100%) rename {qiskit/ignis => qiskit_ignis}/version.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 9197d86b3..f3b3b4566 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -include qiskit/ignis/VERSION.txt +include qiskit_ignis/VERSION.txt include README.md diff --git a/qiskit/ignis/VERSION.txt b/qiskit_ignis/VERSION.txt similarity index 100% rename from qiskit/ignis/VERSION.txt rename to qiskit_ignis/VERSION.txt diff --git a/qiskit/ignis/__init__.py b/qiskit_ignis/__init__.py similarity index 100% rename from qiskit/ignis/__init__.py rename to qiskit_ignis/__init__.py diff --git a/qiskit/ignis/characterization/__init__.py b/qiskit_ignis/characterization/__init__.py similarity index 100% rename from qiskit/ignis/characterization/__init__.py rename to qiskit_ignis/characterization/__init__.py diff --git a/qiskit/ignis/characterization/calibrations/__init__.py b/qiskit_ignis/characterization/calibrations/__init__.py similarity index 100% rename from qiskit/ignis/characterization/calibrations/__init__.py rename to qiskit_ignis/characterization/calibrations/__init__.py diff --git a/qiskit/ignis/characterization/calibrations/fitters.py b/qiskit_ignis/characterization/calibrations/fitters.py similarity index 100% rename from qiskit/ignis/characterization/calibrations/fitters.py rename to qiskit_ignis/characterization/calibrations/fitters.py diff --git a/qiskit/ignis/characterization/calibrations/ibmq_utils.py b/qiskit_ignis/characterization/calibrations/ibmq_utils.py similarity index 100% rename from qiskit/ignis/characterization/calibrations/ibmq_utils.py rename to qiskit_ignis/characterization/calibrations/ibmq_utils.py diff --git a/qiskit/ignis/characterization/calibrations/pulse_schedules.py b/qiskit_ignis/characterization/calibrations/pulse_schedules.py similarity index 100% rename from qiskit/ignis/characterization/calibrations/pulse_schedules.py rename to qiskit_ignis/characterization/calibrations/pulse_schedules.py diff --git a/qiskit/ignis/characterization/characterization_utils.py b/qiskit_ignis/characterization/characterization_utils.py similarity index 100% rename from qiskit/ignis/characterization/characterization_utils.py rename to qiskit_ignis/characterization/characterization_utils.py diff --git a/qiskit/ignis/characterization/coherence/__init__.py b/qiskit_ignis/characterization/coherence/__init__.py similarity index 100% rename from qiskit/ignis/characterization/coherence/__init__.py rename to qiskit_ignis/characterization/coherence/__init__.py diff --git a/qiskit/ignis/characterization/coherence/circuits.py b/qiskit_ignis/characterization/coherence/circuits.py similarity index 100% rename from qiskit/ignis/characterization/coherence/circuits.py rename to qiskit_ignis/characterization/coherence/circuits.py diff --git a/qiskit/ignis/characterization/coherence/fitters.py b/qiskit_ignis/characterization/coherence/fitters.py similarity index 100% rename from qiskit/ignis/characterization/coherence/fitters.py rename to qiskit_ignis/characterization/coherence/fitters.py diff --git a/qiskit/ignis/characterization/fitters.py b/qiskit_ignis/characterization/fitters.py similarity index 100% rename from qiskit/ignis/characterization/fitters.py rename to qiskit_ignis/characterization/fitters.py diff --git a/qiskit/ignis/characterization/gates/__init__.py b/qiskit_ignis/characterization/gates/__init__.py similarity index 100% rename from qiskit/ignis/characterization/gates/__init__.py rename to qiskit_ignis/characterization/gates/__init__.py diff --git a/qiskit/ignis/characterization/gates/circuits.py b/qiskit_ignis/characterization/gates/circuits.py similarity index 100% rename from qiskit/ignis/characterization/gates/circuits.py rename to qiskit_ignis/characterization/gates/circuits.py diff --git a/qiskit/ignis/characterization/gates/fitters.py b/qiskit_ignis/characterization/gates/fitters.py similarity index 100% rename from qiskit/ignis/characterization/gates/fitters.py rename to qiskit_ignis/characterization/gates/fitters.py diff --git a/qiskit/ignis/characterization/hamiltonian/__init__.py b/qiskit_ignis/characterization/hamiltonian/__init__.py similarity index 100% rename from qiskit/ignis/characterization/hamiltonian/__init__.py rename to qiskit_ignis/characterization/hamiltonian/__init__.py diff --git a/qiskit/ignis/characterization/hamiltonian/circuits.py b/qiskit_ignis/characterization/hamiltonian/circuits.py similarity index 100% rename from qiskit/ignis/characterization/hamiltonian/circuits.py rename to qiskit_ignis/characterization/hamiltonian/circuits.py diff --git a/qiskit/ignis/characterization/hamiltonian/fitters.py b/qiskit_ignis/characterization/hamiltonian/fitters.py similarity index 100% rename from qiskit/ignis/characterization/hamiltonian/fitters.py rename to qiskit_ignis/characterization/hamiltonian/fitters.py diff --git a/qiskit/ignis/logging/__init__.py b/qiskit_ignis/logging/__init__.py similarity index 100% rename from qiskit/ignis/logging/__init__.py rename to qiskit_ignis/logging/__init__.py diff --git a/qiskit/ignis/logging/ignis_logging.py b/qiskit_ignis/logging/ignis_logging.py similarity index 100% rename from qiskit/ignis/logging/ignis_logging.py rename to qiskit_ignis/logging/ignis_logging.py diff --git a/qiskit/ignis/logging/logging.yaml b/qiskit_ignis/logging/logging.yaml similarity index 100% rename from qiskit/ignis/logging/logging.yaml rename to qiskit_ignis/logging/logging.yaml diff --git a/qiskit/ignis/measurement/__init__.py b/qiskit_ignis/measurement/__init__.py similarity index 100% rename from qiskit/ignis/measurement/__init__.py rename to qiskit_ignis/measurement/__init__.py diff --git a/qiskit/ignis/measurement/discriminator/__init__.py b/qiskit_ignis/measurement/discriminator/__init__.py similarity index 100% rename from qiskit/ignis/measurement/discriminator/__init__.py rename to qiskit_ignis/measurement/discriminator/__init__.py diff --git a/qiskit/ignis/measurement/discriminator/discriminators.py b/qiskit_ignis/measurement/discriminator/discriminators.py similarity index 100% rename from qiskit/ignis/measurement/discriminator/discriminators.py rename to qiskit_ignis/measurement/discriminator/discriminators.py diff --git a/qiskit/ignis/measurement/discriminator/filters.py b/qiskit_ignis/measurement/discriminator/filters.py similarity index 100% rename from qiskit/ignis/measurement/discriminator/filters.py rename to qiskit_ignis/measurement/discriminator/filters.py diff --git a/qiskit/ignis/measurement/discriminator/iq_discriminators.py b/qiskit_ignis/measurement/discriminator/iq_discriminators.py similarity index 100% rename from qiskit/ignis/measurement/discriminator/iq_discriminators.py rename to qiskit_ignis/measurement/discriminator/iq_discriminators.py diff --git a/qiskit/ignis/mitigation/__init__.py b/qiskit_ignis/mitigation/__init__.py similarity index 100% rename from qiskit/ignis/mitigation/__init__.py rename to qiskit_ignis/mitigation/__init__.py diff --git a/qiskit/ignis/mitigation/measurement/__init__.py b/qiskit_ignis/mitigation/measurement/__init__.py similarity index 100% rename from qiskit/ignis/mitigation/measurement/__init__.py rename to qiskit_ignis/mitigation/measurement/__init__.py diff --git a/qiskit/ignis/mitigation/measurement/circuits.py b/qiskit_ignis/mitigation/measurement/circuits.py similarity index 100% rename from qiskit/ignis/mitigation/measurement/circuits.py rename to qiskit_ignis/mitigation/measurement/circuits.py diff --git a/qiskit/ignis/mitigation/measurement/filters.py b/qiskit_ignis/mitigation/measurement/filters.py similarity index 100% rename from qiskit/ignis/mitigation/measurement/filters.py rename to qiskit_ignis/mitigation/measurement/filters.py diff --git a/qiskit/ignis/mitigation/measurement/fitters.py b/qiskit_ignis/mitigation/measurement/fitters.py similarity index 100% rename from qiskit/ignis/mitigation/measurement/fitters.py rename to qiskit_ignis/mitigation/measurement/fitters.py diff --git a/qiskit/ignis/utils.py b/qiskit_ignis/utils.py similarity index 100% rename from qiskit/ignis/utils.py rename to qiskit_ignis/utils.py diff --git a/qiskit/ignis/verification/__init__.py b/qiskit_ignis/verification/__init__.py similarity index 100% rename from qiskit/ignis/verification/__init__.py rename to qiskit_ignis/verification/__init__.py diff --git a/qiskit/ignis/verification/accreditation/__init__.py b/qiskit_ignis/verification/accreditation/__init__.py similarity index 100% rename from qiskit/ignis/verification/accreditation/__init__.py rename to qiskit_ignis/verification/accreditation/__init__.py diff --git a/qiskit/ignis/verification/accreditation/circuits.py b/qiskit_ignis/verification/accreditation/circuits.py similarity index 100% rename from qiskit/ignis/verification/accreditation/circuits.py rename to qiskit_ignis/verification/accreditation/circuits.py diff --git a/qiskit/ignis/verification/accreditation/fitters.py b/qiskit_ignis/verification/accreditation/fitters.py similarity index 100% rename from qiskit/ignis/verification/accreditation/fitters.py rename to qiskit_ignis/verification/accreditation/fitters.py diff --git a/qiskit/ignis/verification/accreditation/qotp.py b/qiskit_ignis/verification/accreditation/qotp.py similarity index 100% rename from qiskit/ignis/verification/accreditation/qotp.py rename to qiskit_ignis/verification/accreditation/qotp.py diff --git a/qiskit/ignis/verification/entanglement/__init__.py b/qiskit_ignis/verification/entanglement/__init__.py similarity index 100% rename from qiskit/ignis/verification/entanglement/__init__.py rename to qiskit_ignis/verification/entanglement/__init__.py diff --git a/qiskit/ignis/verification/entanglement/analysis.py b/qiskit_ignis/verification/entanglement/analysis.py similarity index 100% rename from qiskit/ignis/verification/entanglement/analysis.py rename to qiskit_ignis/verification/entanglement/analysis.py diff --git a/qiskit/ignis/verification/entanglement/linear.py b/qiskit_ignis/verification/entanglement/linear.py similarity index 100% rename from qiskit/ignis/verification/entanglement/linear.py rename to qiskit_ignis/verification/entanglement/linear.py diff --git a/qiskit/ignis/verification/entanglement/parallelize.py b/qiskit_ignis/verification/entanglement/parallelize.py similarity index 100% rename from qiskit/ignis/verification/entanglement/parallelize.py rename to qiskit_ignis/verification/entanglement/parallelize.py diff --git a/qiskit/ignis/verification/quantum_volume/__init__.py b/qiskit_ignis/verification/quantum_volume/__init__.py similarity index 100% rename from qiskit/ignis/verification/quantum_volume/__init__.py rename to qiskit_ignis/verification/quantum_volume/__init__.py diff --git a/qiskit/ignis/verification/quantum_volume/circuits.py b/qiskit_ignis/verification/quantum_volume/circuits.py similarity index 100% rename from qiskit/ignis/verification/quantum_volume/circuits.py rename to qiskit_ignis/verification/quantum_volume/circuits.py diff --git a/qiskit/ignis/verification/quantum_volume/fitters.py b/qiskit_ignis/verification/quantum_volume/fitters.py similarity index 100% rename from qiskit/ignis/verification/quantum_volume/fitters.py rename to qiskit_ignis/verification/quantum_volume/fitters.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/__init__.py b/qiskit_ignis/verification/randomized_benchmarking/__init__.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/__init__.py rename to qiskit_ignis/verification/randomized_benchmarking/__init__.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/circuits.py b/qiskit_ignis/verification/randomized_benchmarking/circuits.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/circuits.py rename to qiskit_ignis/verification/randomized_benchmarking/circuits.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/dihedral.py b/qiskit_ignis/verification/randomized_benchmarking/dihedral.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/dihedral.py rename to qiskit_ignis/verification/randomized_benchmarking/dihedral.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/fitters.py b/qiskit_ignis/verification/randomized_benchmarking/fitters.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/fitters.py rename to qiskit_ignis/verification/randomized_benchmarking/fitters.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/rb_groups.py b/qiskit_ignis/verification/randomized_benchmarking/rb_groups.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/rb_groups.py rename to qiskit_ignis/verification/randomized_benchmarking/rb_groups.py diff --git a/qiskit/ignis/verification/randomized_benchmarking/rb_utils.py b/qiskit_ignis/verification/randomized_benchmarking/rb_utils.py similarity index 100% rename from qiskit/ignis/verification/randomized_benchmarking/rb_utils.py rename to qiskit_ignis/verification/randomized_benchmarking/rb_utils.py diff --git a/qiskit/ignis/verification/tomography/__init__.py b/qiskit_ignis/verification/tomography/__init__.py similarity index 100% rename from qiskit/ignis/verification/tomography/__init__.py rename to qiskit_ignis/verification/tomography/__init__.py diff --git a/qiskit/ignis/verification/tomography/basis/__init__.py b/qiskit_ignis/verification/tomography/basis/__init__.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/__init__.py rename to qiskit_ignis/verification/tomography/basis/__init__.py diff --git a/qiskit/ignis/verification/tomography/basis/circuits.py b/qiskit_ignis/verification/tomography/basis/circuits.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/circuits.py rename to qiskit_ignis/verification/tomography/basis/circuits.py diff --git a/qiskit/ignis/verification/tomography/basis/gatesetbasis.py b/qiskit_ignis/verification/tomography/basis/gatesetbasis.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/gatesetbasis.py rename to qiskit_ignis/verification/tomography/basis/gatesetbasis.py diff --git a/qiskit/ignis/verification/tomography/basis/paulibasis.py b/qiskit_ignis/verification/tomography/basis/paulibasis.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/paulibasis.py rename to qiskit_ignis/verification/tomography/basis/paulibasis.py diff --git a/qiskit/ignis/verification/tomography/basis/sicbasis.py b/qiskit_ignis/verification/tomography/basis/sicbasis.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/sicbasis.py rename to qiskit_ignis/verification/tomography/basis/sicbasis.py diff --git a/qiskit/ignis/verification/tomography/basis/tomographybasis.py b/qiskit_ignis/verification/tomography/basis/tomographybasis.py similarity index 100% rename from qiskit/ignis/verification/tomography/basis/tomographybasis.py rename to qiskit_ignis/verification/tomography/basis/tomographybasis.py diff --git a/qiskit/ignis/verification/tomography/data.py b/qiskit_ignis/verification/tomography/data.py similarity index 100% rename from qiskit/ignis/verification/tomography/data.py rename to qiskit_ignis/verification/tomography/data.py diff --git a/qiskit/ignis/verification/tomography/fitters/__init__.py b/qiskit_ignis/verification/tomography/fitters/__init__.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/__init__.py rename to qiskit_ignis/verification/tomography/fitters/__init__.py diff --git a/qiskit/ignis/verification/tomography/fitters/base_fitter.py b/qiskit_ignis/verification/tomography/fitters/base_fitter.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/base_fitter.py rename to qiskit_ignis/verification/tomography/fitters/base_fitter.py diff --git a/qiskit/ignis/verification/tomography/fitters/cvx_fit.py b/qiskit_ignis/verification/tomography/fitters/cvx_fit.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/cvx_fit.py rename to qiskit_ignis/verification/tomography/fitters/cvx_fit.py diff --git a/qiskit/ignis/verification/tomography/fitters/gateset_fitter.py b/qiskit_ignis/verification/tomography/fitters/gateset_fitter.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/gateset_fitter.py rename to qiskit_ignis/verification/tomography/fitters/gateset_fitter.py diff --git a/qiskit/ignis/verification/tomography/fitters/lstsq_fit.py b/qiskit_ignis/verification/tomography/fitters/lstsq_fit.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/lstsq_fit.py rename to qiskit_ignis/verification/tomography/fitters/lstsq_fit.py diff --git a/qiskit/ignis/verification/tomography/fitters/process_fitter.py b/qiskit_ignis/verification/tomography/fitters/process_fitter.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/process_fitter.py rename to qiskit_ignis/verification/tomography/fitters/process_fitter.py diff --git a/qiskit/ignis/verification/tomography/fitters/state_fitter.py b/qiskit_ignis/verification/tomography/fitters/state_fitter.py similarity index 100% rename from qiskit/ignis/verification/tomography/fitters/state_fitter.py rename to qiskit_ignis/verification/tomography/fitters/state_fitter.py diff --git a/qiskit/ignis/verification/topological_codes/__init__.py b/qiskit_ignis/verification/topological_codes/__init__.py similarity index 100% rename from qiskit/ignis/verification/topological_codes/__init__.py rename to qiskit_ignis/verification/topological_codes/__init__.py diff --git a/qiskit/ignis/verification/topological_codes/circuits.py b/qiskit_ignis/verification/topological_codes/circuits.py similarity index 100% rename from qiskit/ignis/verification/topological_codes/circuits.py rename to qiskit_ignis/verification/topological_codes/circuits.py diff --git a/qiskit/ignis/verification/topological_codes/fitters.py b/qiskit_ignis/verification/topological_codes/fitters.py similarity index 100% rename from qiskit/ignis/verification/topological_codes/fitters.py rename to qiskit_ignis/verification/topological_codes/fitters.py diff --git a/qiskit/ignis/version.py b/qiskit_ignis/version.py similarity index 100% rename from qiskit/ignis/version.py rename to qiskit_ignis/version.py diff --git a/setup.py b/setup.py index fec7c9de5..583f1271d 100644 --- a/setup.py +++ b/setup.py @@ -37,10 +37,8 @@ version_path = os.path.abspath( - os.path.join( - os.path.join( - os.path.join(os.path.dirname(__file__), 'qiskit'), 'ignis'), - 'VERSION.txt')) + os.path.join(os.path.dirname(__file__), 'qiskit_ignis', + 'VERSION.txt')) with open(version_path, 'r') as fd: version = fd.read().rstrip() @@ -76,7 +74,7 @@ "Topic :: Scientific/Engineering", ], keywords="qiskit sdk quantum", - packages=setuptools.find_namespace_packages(exclude=['test*']), + packages=setuptools.find_packages(exclude=['test*']), extras_require={ 'visualization': ['matplotlib>=2.1'], 'cvx': ['cvxpy>=1.0.15'], From 797bf24b22c96266d441bfcd3c0fb059656104c4 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 31 Aug 2020 15:28:24 -0400 Subject: [PATCH 2/4] Fix linter paths --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 5d12b44d5..69b05f8f1 100644 --- a/tox.ini +++ b/tox.ini @@ -43,8 +43,8 @@ deps = setuptools>=40.1.0 pyfakefs commands = - pycodestyle qiskit/ignis test/ - pylint -rn -j 0 --rcfile={toxinidir}/.pylintrc qiskit/ignis test/ + pycodestyle qiskit_ignis test/ + pylint -rn -j 0 --rcfile={toxinidir}/.pylintrc qiskit_ignis test/ [testenv:docs] basepython = python3 From 1bf9b72a1b9c0a8fc2774e6af96ae07d9ea82058 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 31 Aug 2020 15:43:17 -0400 Subject: [PATCH 3/4] Exclude namespaced module from pylint typecheck --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index 7626bcf45..9952c5e9c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -295,7 +295,7 @@ ignore-mixin-members=yes # (useful for modules/projects where namespaces are manipulated during runtime # and thus existing member attributes cannot be deduced by static analysis. It # supports qualified module names, as well as Unix pattern matching. -ignored-modules=matplotlib.cm,numpy.random,retworkx +ignored-modules=matplotlib.cm,numpy.random,retworkx,qiskit.ignis # List of class names for which member attributes should not be checked (useful # for classes with dynamically set attributes). This supports the use of From 1c3f4d7579cab8a106ed0ffb73927aec8641baf4 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 31 Aug 2020 15:55:27 -0400 Subject: [PATCH 4/4] Exclude all of qiskit.* namespace --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index 9952c5e9c..785c3a0ec 100644 --- a/.pylintrc +++ b/.pylintrc @@ -295,7 +295,7 @@ ignore-mixin-members=yes # (useful for modules/projects where namespaces are manipulated during runtime # and thus existing member attributes cannot be deduced by static analysis. It # supports qualified module names, as well as Unix pattern matching. -ignored-modules=matplotlib.cm,numpy.random,retworkx,qiskit.ignis +ignored-modules=matplotlib.cm,numpy.random,retworkx,qiskit # List of class names for which member attributes should not be checked (useful # for classes with dynamically set attributes). This supports the use of