Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEAT: move imports to top in notebooks #392

Merged
merged 4 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/compwa_policy/check_dev_files/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def main(argv: Sequence[str] | None = None) -> int:
do(pytest.main)
do(pyupgrade.main, precommit_config, args.no_ruff)
if not args.no_ruff:
do(ruff.main, precommit_config, has_notebooks)
do(ruff.main, precommit_config, has_notebooks, args.imports_on_top)
if args.pin_requirements != "no":
do(
update_pip_constraints.main,
Expand Down Expand Up @@ -197,11 +197,17 @@ def _create_argparse() -> ArgumentParser:
action="store_true",
default=False,
)
parser.add_argument(
"--imports-on-top",
action="store_true",
default=False,
help="Sort notebook imports on the top",
)
parser.add_argument(
"--outsource-pixi-to-tox",
action="store_true",
default=False,
help="Run ",
help="Run tox command through pixi",
)
parser.add_argument(
"--no-cspell-update",
Expand Down
56 changes: 51 additions & 5 deletions src/compwa_policy/check_dev_files/ruff.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
from compwa_policy.utilities.precommit import ModifiablePrecommit


def main(precommit: ModifiablePrecommit, has_notebooks: bool) -> None:
def main(
precommit: ModifiablePrecommit,
has_notebooks: bool,
imports_on_top: bool,
) -> None:
with Executor() as do, ModifiablePyproject.load() as pyproject:
do(
add_badge,
Expand All @@ -36,10 +40,12 @@ def main(precommit: ModifiablePrecommit, has_notebooks: bool) -> None:
do(pyproject.remove_dependency, "radon")
do(_remove_black, precommit, pyproject)
do(_remove_flake8, precommit, pyproject)
do(_remove_isort, precommit, pyproject)
do(_remove_isort, precommit, pyproject, imports_on_top)
do(_remove_pydocstyle, precommit, pyproject)
do(_remove_pylint, precommit, pyproject)
do(_move_ruff_lint_config, pyproject)
if has_notebooks and imports_on_top:
do(_sort_imports_on_top, precommit, pyproject)
do(_update_ruff_config, precommit, pyproject, has_notebooks)
do(_update_precommit_hook, precommit, has_notebooks)
do(_update_lint_dependencies, pyproject)
Expand Down Expand Up @@ -87,14 +93,16 @@ def _remove_flake8(
def _remove_isort(
precommit: ModifiablePrecommit,
pyproject: ModifiablePyproject,
imports_on_top: bool,
) -> None:
with Executor() as do:
do(__remove_nbqa_option, pyproject, "black")
do(__remove_nbqa_option, pyproject, "isort")
do(__remove_tool_table, pyproject, "isort")
do(vscode.remove_extension_recommendation, "ms-python.isort", unwanted=True)
do(precommit.remove_hook, "isort")
do(precommit.remove_hook, "nbqa-isort")
if not imports_on_top:
do(__remove_tool_table, pyproject, "isort")
do(__remove_nbqa_option, pyproject, "isort")
do(precommit.remove_hook, "nbqa-isort")
do(vscode.remove_settings, ["isort.check", "isort.importStrategy"])
do(remove_badge, r".*https://img\.shields\.io/badge/%20imports\-isort")

Expand Down Expand Up @@ -574,6 +582,44 @@ def _update_precommit_hook(precommit: ModifiablePrecommit, has_notebooks: bool)
precommit.update_single_hook_repo(expected_repo)


def _sort_imports_on_top(
precommit: ModifiablePrecommit, pyproject: ModifiablePyproject
) -> None:
__add_isort_configuration(pyproject)
__add_nbqa_isort_pre_commit(precommit)


def __add_isort_configuration(pyproject: ModifiablePyproject) -> None:
isort_settings = pyproject.get_table("tool.isort", create=True)
minimal_settings = dict(
profile="black",
)
if not complies_with_subset(isort_settings, minimal_settings):
isort_settings.update(minimal_settings)
msg = "Made isort configuration compatible with Ruff"
pyproject.changelog.append(msg)


def __add_nbqa_isort_pre_commit(precommit: ModifiablePrecommit) -> None:
existing_repo = precommit.find_repo("https://github.com/nbQA-dev/nbQA")
excludes = None
if existing_repo is not None and existing_repo.get("hooks"):
nbqa_hook_candidates = [
h for h in existing_repo["hooks"] if h["id"] == "nbqa-isort"
]
if nbqa_hook_candidates:
nbqa_hook = nbqa_hook_candidates[0]
excludes = nbqa_hook.get("exclude")
expected_repo = Repo(
repo="https://github.com/nbQA-dev/nbQA",
rev="1.9.0",
hooks=[Hook(id="nbqa-isort", args=YAML(typ="rt").load("[--float-to-top]"))],
redeboer marked this conversation as resolved.
Show resolved Hide resolved
)
if excludes is not None:
expected_repo["hooks"][0]["exclude"] = excludes
precommit.update_single_hook_repo(expected_repo)


def _update_lint_dependencies(pyproject: ModifiablePyproject) -> None:
if get_build_system() is None:
return
Expand Down
Loading