Require pre-commit; fix lint issues; update dependencies

.github/workflows/run-test.yml

@@ -31,7 +31,7 @@ jobs:
         id: run-test
         run: |
           python3 -m venv env
-          . env/bin/activate && pip install poetry setuptools pip --upgrade && poetry install && make test
+          . env/bin/activate && pip install poetry setuptools pip --upgrade && poetry install && pre-commit run -a && make test
       - name: Upload coverage reports to Codecov
         if: ${{ github.repository == 'noqdev/iambic' }}
         uses: codecov/codecov-action@v3

.pre-commit-config.yaml

@@ -3,24 +3,21 @@ default_language_version:
     python: python3.10
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0 # Use the ref you want to point at
+  rev: v4.1.0
   hooks:
     - id: trailing-whitespace
     - id: check-ast
     - id: check-case-conflict
     - id: debug-statements
     - id: check-yaml
       args: [--allow-multiple-documents, --unsafe]
+- repo: https://github.com/timothycrosley/isort
+  rev: "5.12.0"
+  hooks:
+    - id: isort
+      pass_filenames: true
 - repo: local
   hooks:
-  - id: isort
-    name: isort
-    stages: [commit]
-    language: system
-    entry: poetry run isort
-    types: [python]
-    args: ["--profile", "black", "-p", "iambic"]
-
   - id: black
     name: black
     stages: [commit]

functional_tests/aws/group/test_update_template.py

@@ -4,9 +4,9 @@
 from unittest import IsolatedAsyncioTestCase
 
 import dateparser
+
 from functional_tests.aws.group.utils import generate_group_template_from_base
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.output.text import screen_render_resource_changes
 from iambic.plugins.v0_1_0.aws.iam.group.models import AwsIamGroupTemplate
 from iambic.plugins.v0_1_0.aws.iam.group.utils import get_group_across_accounts

functional_tests/aws/managed_policy/test_update_template.py

@@ -7,7 +7,6 @@
     generate_managed_policy_template_from_base,
 )
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.core import noq_json as json
 from iambic.output.text import screen_render_resource_changes
 from iambic.plugins.v0_1_0.aws.models import Tag

functional_tests/aws/managed_policy/utils.py

@@ -4,7 +4,6 @@
 import uuid
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.core.iambic_enum import Command
 from iambic.core.logger import log
 from iambic.core.models import ExecutionMessage

functional_tests/aws/permission_set/test_create_template.py

@@ -8,7 +8,6 @@
     generate_permission_set_template_from_base,
 )
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.output.text import screen_render_resource_changes
 
 

functional_tests/aws/role/test_template_generation.py

@@ -8,7 +8,6 @@
     role_full_import,
 )
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.plugins.v0_1_0.aws.event_bridge.models import RoleMessageDetails
 from iambic.plugins.v0_1_0.aws.iam.role.models import AwsIamRoleTemplate
 

functional_tests/aws/user/test_create_template.py

@@ -4,7 +4,6 @@
 
 from functional_tests.aws.user.utils import generate_user_template_from_base
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.plugins.v0_1_0.aws.iam.user.utils import get_user_across_accounts
 
 

functional_tests/azure_ad/base_test_case.py

@@ -5,7 +5,6 @@
 from unittest import IsolatedAsyncioTestCase
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.plugins.v0_1_0.azure_ad.group.models import GroupTemplateProperties
 from iambic.plugins.v0_1_0.azure_ad.group.utils import list_groups
 from iambic.plugins.v0_1_0.azure_ad.user.models import UserTemplateProperties

functional_tests/azure_ad/group/utils.py

@@ -5,7 +5,6 @@
 import uuid
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.core.iambic_enum import Command
 from iambic.core.models import ExecutionMessage
 from iambic.plugins.v0_1_0.azure_ad.group.models import (

functional_tests/azure_ad/user/utils.py

@@ -4,7 +4,6 @@
 import random
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.plugins.v0_1_0.azure_ad.user.models import AzureActiveDirectoryUserTemplate
 
 

functional_tests/okta/group/test_okta_group.py

@@ -4,7 +4,6 @@
 import os
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.core.iambic_enum import IambicManaged
 from iambic.core.parser import load_templates
 from iambic.main import run_apply

functional_tests/test_config_discovery.py

@@ -4,7 +4,6 @@
 from unittest import IsolatedAsyncioTestCase
 
 from functional_tests.conftest import IAMBIC_TEST_DETAILS
-
 from iambic.config.dynamic_config import load_config
 from iambic.core.iambic_enum import Command
 from iambic.core.models import ExecutionMessage

functional_tests/test_wizard.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import random
 import tempfile

iambic/plugins/v0_1_0/aws/pyproject.toml

@@ -11,8 +11,13 @@ readme = "README.md"
 exclude = ["build_util/*"]
 
 [tool.isort]
+known_first_party = ["iambic"]
+src_paths = ["iambic","test","functional_tests","build_utils"]
+known_third_party = ["_pytest", "okta", "github", "pydantic", "rich"]
 profile = "black"
-add_imports = "from __future__ import annotations"
+add_imports = ["from __future__ import annotations"]
+skip_gitignore = true
+line_length = 88
 
 [tool.poetry.dependencies]
 python = "^3.10"

iambic/plugins/v0_1_0/aws/template_generation.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Union
 
 from iambic.core.template_generation import (

iambic/plugins/v0_1_0/google_workspace/pyproject.toml

@@ -11,8 +11,13 @@ readme = "README.md"
 exclude = ["build_util/*"]
 
 [tool.isort]
+known_first_party = ["iambic"]
+src_paths = ["iambic","test","functional_tests","build_utils"]
+known_third_party = ["_pytest", "okta", "github", "pydantic", "rich"]
 profile = "black"
-add_imports = "from __future__ import annotations"
+add_imports = ["from __future__ import annotations"]
+skip_gitignore = true
+line_length = 88
 
 [tool.poetry.dependencies]
 python = "^3.10"

iambic/plugins/v0_1_0/okta/pyproject.toml

@@ -11,8 +11,13 @@ readme = "README.md"
 exclude = ["build_util/*"]
 
 [tool.isort]
+known_first_party = ["iambic"]
+src_paths = ["iambic","test","functional_tests","build_utils"]
+known_third_party = ["_pytest", "okta", "github", "pydantic", "rich"]
 profile = "black"
-add_imports = "from __future__ import annotations"
+add_imports = ["from __future__ import annotations"]
+skip_gitignore = true
+line_length = 88
 
 [tool.poetry.dependencies]
 python = "^3.10"

iambic/vendor/lambda_multiprocessing/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from iambic.vendor.lambda_multiprocessing.main import AsyncResult, Pool, TimeoutError
 
 __all__ = ["Pool", "TimeoutError", "AsyncResult"]