Fix: Fix isort skipping

* fix: fix isort skipping

* chore: update code style of imports

* chore: fix import style in test folder

* fix: add exclude to pre commit for example test

* fix: fix import order to match isort

* fix: exclude run_pipeline from initial pre-commits

.pre-commit-config.yaml

@@ -16,8 +16,8 @@ repos:
     hooks:
       - id: isort
         name: isort - Sort Python imports (auto-fixes)
-        types: [ cython, pyi, python ]
         args: [ "--profile", "black", "--filter-files" ]
+        exclude: test_example_module.py|run_pipeline.py
   - repo: https://github.com/psf/black
     rev: 22.8.0 # Replace by any tag/version: https://github.com/psf/black/tags
     hooks:

tests/test_documentation_build.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+
 from sphinx.cmd.build import main
 
 

tests/test_env.py

@@ -1,7 +1,8 @@
-from dotenv import dotenv_values
 from pathlib import Path
 from typing import Dict, List
 
+from dotenv import dotenv_values
+
 # Define a path to the `govcookiecutter` template directory, and its `.env` file
 DIR_TEMPLATE = Path("{{ cookiecutter.repo_name }}")
 PATH_TEMPLATE_ENV = DIR_TEMPLATE.joinpath(".env")

tests/test_govcookiecutter_creation.py

@@ -1,7 +1,8 @@
-from sphinx.cmd.build import main
+import re
 from typing import Dict
+
 import pytest
-import re
+from sphinx.cmd.build import main
 
 
 @pytest.mark.parametrize("test_input_repository_hosting_platform", ["GitHub", "GitLab"])

tests/test_govcookiecutter_injected_variables.py

@@ -1,8 +1,8 @@
 from collections import Counter
 from pathlib import Path
 from typing import Dict, List, Union
-import pytest
 
+import pytest
 
 # Define the expected counts for each cookiecutter variable - any counts that deviate
 # because of other variables are listed at the end of each dictionary

tests/test_post_gen_project/conftest.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 from typing import List
+
 import pytest
 
 

tests/test_post_gen_project/test_delete_files_and_folders.py

@@ -1,9 +1,11 @@
-from hooks.post_gen_project import delete_files_and_folders
 from pathlib import Path
 from typing import List
 from unittest.mock import MagicMock, call
+
 import pytest
 
+from hooks.post_gen_project import delete_files_and_folders
+
 
 @pytest.fixture
 def patch_rmtree(mocker) -> MagicMock:

tests/test_post_gen_project/test_parse_features_json.py

@@ -1,10 +1,12 @@
+import json
 from collections import Counter
-from hooks.post_gen_project import parse_features_json
 from pathlib import Path
 from typing import Dict, List
-import json
+
 import pytest
 
+from hooks.post_gen_project import parse_features_json
+
 # Keys for the JSON file
 JSON_BASE_KEYS = ["name", "remove", "resources"]
 

tests/test_post_gen_project/test_set_aqa_framework.py

@@ -1,8 +1,10 @@
-from hooks.post_gen_project import delete_files_and_folders, set_aqa_framework
 from pathlib import Path
 from unittest.mock import MagicMock
+
 import pytest
 
+from hooks.post_gen_project import delete_files_and_folders, set_aqa_framework
+
 
 @pytest.fixture
 def patch_delete_files_and_folders(mocker) -> MagicMock:

tests/test_post_gen_project/test_set_request_template.py

@@ -1,7 +1,8 @@
-from hooks.post_gen_project import set_request_template
 from pathlib import Path
+
 import pytest
 
+from hooks.post_gen_project import set_request_template
 
 # Define test cases for the `TestSetRequestTemplate` test class
 args_test_set_request_template_valueerror_for_bad_repository_hosting_platform = [

tests/test_pre_gen_project/test_check_valid_email_address_format.py

@@ -1,6 +1,7 @@
-from hooks.pre_gen_project import check_valid_email_address_format
 import pytest
 
+from hooks.pre_gen_project import check_valid_email_address_format
+
 # Define test cases for the `TestCheckValidEmailAddressFormat` test class
 args_invalid_email_addresses = ["hello.world", "foo_bar"]
 args_valid_email_addresses = ["hello@world.com", "foo@bar"]

{{ cookiecutter.repo_name }}/.pre-commit-config.yaml

@@ -24,8 +24,15 @@ repos:
     rev: 5.12.0
     hooks:
       - id: isort
-        name: isort - Sort Python imports (auto-fixes)
-        types: [ cython, pyi, python ]
+        name: isort - Sort python imports (auto-fixes)
+        args: [ "--profile", "black", "--filter-files" ]
+      - id: isort
+        name: isort - Sort cython imports (auto-fixes)
+        types: [cython]
+        args: [ "--profile", "black", "--filter-files" ]
+      - id: isort
+        name: isort - Sort pyi imports (auto-fixes)
+        types: [pyi]
         args: [ "--profile", "black", "--filter-files" ]
   - repo: https://github.com/psf/black
     rev: 22.8.0 # Replace by any tag/version: https://github.com/psf/black/tags

{{ cookiecutter.repo_name }}/src/{{ cookiecutter.repo_name.lower().replace(' ', '_').replace('-', '_') }}/run_pipeline.py

@@ -2,8 +2,8 @@
 
 from {{ cookiecutter.repo_name.lower().replace(' ', '_').replace('-', '_') }}.example_modules.example_module import (
     hello_world,
-    print_string,
     print_favourite_number,
+    print_string,
 )
 
 

{{ cookiecutter.repo_name }}/tests/test_example_module.py

@@ -2,8 +2,8 @@
 
 from {{ cookiecutter.repo_name.lower().replace(' ', '_').replace('-', '_') }}.example_modules.example_module import (
     hello_world,
-    print_string,
     print_favourite_number,
+    print_string,
 )