diff --git a/.pylintrc b/.pylintrc index 7626bcf45..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 +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 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'], 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