diff --git a/pyproject.toml b/pyproject.toml index fa939ed5..b0a6b553 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,8 +93,8 @@ fail_under = 70 show_missing = true [tool.hatch.build.targets.wheel] -only-include = [ - "qiskit_addon_utils", +packages = [ + "src/qiskit_addon_utils", ] [tool.hatch.metadata] @@ -129,11 +129,11 @@ enable = [ ] [tool.pytest.ini_options] -testpaths = ["./qiskit_addon_utils/", "./test/"] +testpaths = ["./src/", "./test/"] [tool.ruff] line-length = 100 -src = ["qiskit_addon_utils", "test"] +src = ["src/qiskit_addon_utils", "test"] target-version = "py39" [tool.ruff.lint] diff --git a/qiskit_addon_utils/__init__.py b/src/qiskit_addon_utils/__init__.py similarity index 100% rename from qiskit_addon_utils/__init__.py rename to src/qiskit_addon_utils/__init__.py diff --git a/qiskit_addon_utils/coloring/__init__.py b/src/qiskit_addon_utils/coloring/__init__.py similarity index 100% rename from qiskit_addon_utils/coloring/__init__.py rename to src/qiskit_addon_utils/coloring/__init__.py diff --git a/qiskit_addon_utils/coloring/automatic_coloring.py b/src/qiskit_addon_utils/coloring/automatic_coloring.py similarity index 100% rename from qiskit_addon_utils/coloring/automatic_coloring.py rename to src/qiskit_addon_utils/coloring/automatic_coloring.py diff --git a/qiskit_addon_utils/coloring/validation.py b/src/qiskit_addon_utils/coloring/validation.py similarity index 100% rename from qiskit_addon_utils/coloring/validation.py rename to src/qiskit_addon_utils/coloring/validation.py diff --git a/qiskit_addon_utils/exp_vals/__init__.py b/src/qiskit_addon_utils/exp_vals/__init__.py similarity index 100% rename from qiskit_addon_utils/exp_vals/__init__.py rename to src/qiskit_addon_utils/exp_vals/__init__.py diff --git a/qiskit_addon_utils/exp_vals/expectation_values.py b/src/qiskit_addon_utils/exp_vals/expectation_values.py similarity index 100% rename from qiskit_addon_utils/exp_vals/expectation_values.py rename to src/qiskit_addon_utils/exp_vals/expectation_values.py diff --git a/qiskit_addon_utils/exp_vals/measurement_bases.py b/src/qiskit_addon_utils/exp_vals/measurement_bases.py similarity index 100% rename from qiskit_addon_utils/exp_vals/measurement_bases.py rename to src/qiskit_addon_utils/exp_vals/measurement_bases.py diff --git a/qiskit_addon_utils/exp_vals/observable_mappings.py b/src/qiskit_addon_utils/exp_vals/observable_mappings.py similarity index 100% rename from qiskit_addon_utils/exp_vals/observable_mappings.py rename to src/qiskit_addon_utils/exp_vals/observable_mappings.py diff --git a/qiskit_addon_utils/noise_management/__init__.py b/src/qiskit_addon_utils/noise_management/__init__.py similarity index 100% rename from qiskit_addon_utils/noise_management/__init__.py rename to src/qiskit_addon_utils/noise_management/__init__.py diff --git a/qiskit_addon_utils/noise_management/constants.py b/src/qiskit_addon_utils/noise_management/constants.py similarity index 100% rename from qiskit_addon_utils/noise_management/constants.py rename to src/qiskit_addon_utils/noise_management/constants.py diff --git a/qiskit_addon_utils/noise_management/gamma_factor.py b/src/qiskit_addon_utils/noise_management/gamma_factor.py similarity index 100% rename from qiskit_addon_utils/noise_management/gamma_factor.py rename to src/qiskit_addon_utils/noise_management/gamma_factor.py diff --git a/qiskit_addon_utils/noise_management/post_selection/__init__.py b/src/qiskit_addon_utils/noise_management/post_selection/__init__.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/__init__.py rename to src/qiskit_addon_utils/noise_management/post_selection/__init__.py diff --git a/qiskit_addon_utils/noise_management/post_selection/post_selection_summary.py b/src/qiskit_addon_utils/noise_management/post_selection/post_selection_summary.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/post_selection_summary.py rename to src/qiskit_addon_utils/noise_management/post_selection/post_selection_summary.py diff --git a/qiskit_addon_utils/noise_management/post_selection/post_selector.py b/src/qiskit_addon_utils/noise_management/post_selection/post_selector.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/post_selector.py rename to src/qiskit_addon_utils/noise_management/post_selection/post_selector.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/__init__.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/__init__.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/__init__.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/__init__.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/__init__.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/__init__.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/passes/__init__.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/__init__.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_post_selection_measures.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_post_selection_measures.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_post_selection_measures.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_post_selection_measures.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_spectator_measures.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_spectator_measures.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_spectator_measures.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/add_spectator_measures.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/utils.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/utils.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/passes/utils.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/utils.py diff --git a/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/xslow_gate.py b/src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/xslow_gate.py similarity index 100% rename from qiskit_addon_utils/noise_management/post_selection/transpiler/passes/xslow_gate.py rename to src/qiskit_addon_utils/noise_management/post_selection/transpiler/passes/xslow_gate.py diff --git a/qiskit_addon_utils/noise_management/trex_factors.py b/src/qiskit_addon_utils/noise_management/trex_factors.py similarity index 100% rename from qiskit_addon_utils/noise_management/trex_factors.py rename to src/qiskit_addon_utils/noise_management/trex_factors.py diff --git a/qiskit_addon_utils/problem_generators/__init__.py b/src/qiskit_addon_utils/problem_generators/__init__.py similarity index 100% rename from qiskit_addon_utils/problem_generators/__init__.py rename to src/qiskit_addon_utils/problem_generators/__init__.py diff --git a/qiskit_addon_utils/problem_generators/generate_time_evolution_circuit.py b/src/qiskit_addon_utils/problem_generators/generate_time_evolution_circuit.py similarity index 100% rename from qiskit_addon_utils/problem_generators/generate_time_evolution_circuit.py rename to src/qiskit_addon_utils/problem_generators/generate_time_evolution_circuit.py diff --git a/qiskit_addon_utils/problem_generators/generate_xyz_hamiltonian.py b/src/qiskit_addon_utils/problem_generators/generate_xyz_hamiltonian.py similarity index 100% rename from qiskit_addon_utils/problem_generators/generate_xyz_hamiltonian.py rename to src/qiskit_addon_utils/problem_generators/generate_xyz_hamiltonian.py diff --git a/qiskit_addon_utils/slicing/__init__.py b/src/qiskit_addon_utils/slicing/__init__.py similarity index 100% rename from qiskit_addon_utils/slicing/__init__.py rename to src/qiskit_addon_utils/slicing/__init__.py diff --git a/qiskit_addon_utils/slicing/combine_slices.py b/src/qiskit_addon_utils/slicing/combine_slices.py similarity index 100% rename from qiskit_addon_utils/slicing/combine_slices.py rename to src/qiskit_addon_utils/slicing/combine_slices.py diff --git a/qiskit_addon_utils/slicing/slice_by_barriers.py b/src/qiskit_addon_utils/slicing/slice_by_barriers.py similarity index 100% rename from qiskit_addon_utils/slicing/slice_by_barriers.py rename to src/qiskit_addon_utils/slicing/slice_by_barriers.py diff --git a/qiskit_addon_utils/slicing/slice_by_coloring.py b/src/qiskit_addon_utils/slicing/slice_by_coloring.py similarity index 100% rename from qiskit_addon_utils/slicing/slice_by_coloring.py rename to src/qiskit_addon_utils/slicing/slice_by_coloring.py diff --git a/qiskit_addon_utils/slicing/slice_by_depth.py b/src/qiskit_addon_utils/slicing/slice_by_depth.py similarity index 100% rename from qiskit_addon_utils/slicing/slice_by_depth.py rename to src/qiskit_addon_utils/slicing/slice_by_depth.py diff --git a/qiskit_addon_utils/slicing/slice_by_gate_types.py b/src/qiskit_addon_utils/slicing/slice_by_gate_types.py similarity index 100% rename from qiskit_addon_utils/slicing/slice_by_gate_types.py rename to src/qiskit_addon_utils/slicing/slice_by_gate_types.py diff --git a/qiskit_addon_utils/slicing/transpiler/__init__.py b/src/qiskit_addon_utils/slicing/transpiler/__init__.py similarity index 100% rename from qiskit_addon_utils/slicing/transpiler/__init__.py rename to src/qiskit_addon_utils/slicing/transpiler/__init__.py diff --git a/qiskit_addon_utils/slicing/transpiler/passes/__init__.py b/src/qiskit_addon_utils/slicing/transpiler/passes/__init__.py similarity index 100% rename from qiskit_addon_utils/slicing/transpiler/passes/__init__.py rename to src/qiskit_addon_utils/slicing/transpiler/passes/__init__.py diff --git a/qiskit_addon_utils/slicing/transpiler/passes/collect_op_color.py b/src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_color.py similarity index 100% rename from qiskit_addon_utils/slicing/transpiler/passes/collect_op_color.py rename to src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_color.py diff --git a/qiskit_addon_utils/slicing/transpiler/passes/collect_op_size.py b/src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_size.py similarity index 100% rename from qiskit_addon_utils/slicing/transpiler/passes/collect_op_size.py rename to src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_size.py diff --git a/qiskit_addon_utils/slicing/transpiler/passes/collect_op_type.py b/src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_type.py similarity index 100% rename from qiskit_addon_utils/slicing/transpiler/passes/collect_op_type.py rename to src/qiskit_addon_utils/slicing/transpiler/passes/collect_op_type.py diff --git a/tox.ini b/tox.ini index b87fbaaf..27025303 100644 --- a/tox.ini +++ b/tox.ini @@ -16,8 +16,8 @@ commands = extras = style commands = - ruff format qiskit_addon_utils/ docs/ test/ - ruff check --fix qiskit_addon_utils/ docs/ test/ + ruff format src/ docs/ test/ + ruff check --fix src/ docs/ test/ nbqa ruff --fix docs/ [testenv:lint] @@ -28,13 +28,13 @@ basepython = python3.10 extras = lint commands = - ruff format --check qiskit_addon_utils/ docs/ test/ - ruff check qiskit_addon_utils/ docs/ test/ - ruff check --preview --select CPY001 --exclude "*.ipynb" qiskit_addon_utils/ test/ + ruff format --check src/ docs/ test/ + ruff check src/ docs/ test/ + ruff check --preview --select CPY001 --exclude "*.ipynb" src/ test/ nbqa ruff docs/ - mypy qiskit_addon_utils/ - pylint -rn qiskit_addon_utils/ test/ - sphinx-alt-text-validator -f qiskit_addon_utils + mypy src/ + pylint -rn src/ test/ + sphinx-alt-text-validator -f src nbqa pylint -rn docs/ reno lint @@ -60,7 +60,7 @@ extras = test doctest commands = - pytest --doctest-modules --cov=qiskit_addon_utils/ + pytest --doctest-modules --cov=src/ [testenv:docs] basepython = python3.10