From c8948ba0d013d35af07f1883f033f0681f262acd Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Mon, 20 Feb 2023 13:40:43 +0100 Subject: [PATCH 1/3] Remove --recursive from isort in pre-commit --- {{cookiecutter.directory_name}}/.githooks/pre-commit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.directory_name}}/.githooks/pre-commit b/{{cookiecutter.directory_name}}/.githooks/pre-commit index 31ca5c16..2e38f129 100755 --- a/{{cookiecutter.directory_name}}/.githooks/pre-commit +++ b/{{cookiecutter.directory_name}}/.githooks/pre-commit @@ -22,8 +22,8 @@ isort --recursive --check-only {{ cookiecutter.package_name }} if [ $? != "0" ]; then echo "Commit aborted." - echo " Run 'isort --recursive --check-only --diff {{ cookiecutter.package_name }}' to see what's wrong." - echo " Run 'isort --recursive {{ cookiecutter.package_name }}' to let isort fix problems automatically." + echo " Run 'isort --check-only --diff {{ cookiecutter.package_name }}' to see what's wrong." + echo " Run 'isort {{ cookiecutter.package_name }}' to let isort fix problems automatically." exit 1 fi From 01706ebeb0acf5deb1f98bb95c22f7844bf6dc59 Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Mon, 20 Feb 2023 14:12:21 +0100 Subject: [PATCH 2/3] Remove --recursive from isort in README.dev.md --- {{cookiecutter.directory_name}}/README.dev.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.directory_name}}/README.dev.md b/{{cookiecutter.directory_name}}/README.dev.md index a72ef3f3..6277b263 100644 --- a/{{cookiecutter.directory_name}}/README.dev.md +++ b/{{cookiecutter.directory_name}}/README.dev.md @@ -71,14 +71,14 @@ development tools installed. prospector # recursively check import style for the {{ cookiecutter.package_name }} module only -isort --recursive --check-only {{ cookiecutter.package_name }} +isort --check-only {{ cookiecutter.package_name }} # recursively check import style for the {{ cookiecutter.package_name }} module only and show # any proposed changes as a diff -isort --recursive --check-only --diff {{ cookiecutter.package_name }} +isort --check-only --diff {{ cookiecutter.package_name }} # recursively fix import style for the {{ cookiecutter.package_name }} module only -isort --recursive {{ cookiecutter.package_name }} +isort {{ cookiecutter.package_name }} ``` To fix readability of your code style you can use [yapf](https://github.com/google/yapf). From cd559dc507d2a6db4f35f7afff9bba874576501f Mon Sep 17 00:00:00 2001 From: Abel Soares Siqueira Date: Mon, 20 Feb 2023 14:14:06 +0100 Subject: [PATCH 3/3] Remove --recursive from isort in test_project.py --- tests/test_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_project.py b/tests/test_project.py index 181782fe..1c377bf6 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -156,7 +156,7 @@ def test_isort_check(baked_with_development_dependencies, project_env_bin_dir): project_dir = baked_with_development_dependencies bin_dir = project_env_bin_dir - result = run([f'{bin_dir}isort', '--recursive', '--check-only', 'my_python_package'], project_dir) + result = run([f'{bin_dir}isort', '--check-only', 'my_python_package'], project_dir) assert result.returncode == 0 assert '' in result.stdout