chore: resolve hang issue with running isort as pre-commit hook

Signed-off-by: Paul Horton <[email protected]>

Author: madpah

.isort.cfg

@@ -2,7 +2,7 @@
 ## read the docs: https://pycqa.github.io/isort/docs/configuration/options.html
 ## keep in sync with flake8 config - in `tox.ini` file
 known_first_party = cyclonedx
-skip_gitignore = true
+skip_gitignore = false
 skip_glob =
     build/*,dist/*,__pycache__,.eggs,*.egg-info*,
     *_cache,*.cache,
@@ -15,3 +15,6 @@ ensure_newline_before_comments = true
 include_trailing_comma = true
 line_length = 120
 multi_line_output = 3
+src_paths =
+    cyclonedx
+    tests

.pre-commit-config.yaml

@@ -7,13 +7,13 @@ repos:
         entry: poetry run tox -e mypy
         pass_filenames: false
         language: system
-#  - repo: local
-#    hooks:
-#      - id: system
-#        name: isort
-#        entry: poetry run isort
-#        pass_filenames: false
-#        language: system
+  - repo: local
+    hooks:
+      - id: system
+        name: isort
+        entry: poetry run isort -c .
+        pass_filenames: false
+        language: system
   - repo: local
     hooks:
       - id: system

tests/test_component.py

@@ -20,14 +20,13 @@
 from os.path import dirname, join
 from unittest import TestCase
 
-from data import get_component_setuptools_simple, get_component_setuptools_simple_no_version
-
 # See https://github.com/package-url/packageurl-python/issues/65
 from packageurl import PackageURL  # type: ignore
 
 from cyclonedx.model import sha1sum
 from cyclonedx.model.bom import Bom
 from cyclonedx.model.component import Component
+from data import get_component_setuptools_simple, get_component_setuptools_simple_no_version
 
 FIXTURES_DIRECTORY = 'fixtures/xml/1.4'
 

tests/test_model_component.py

@@ -22,17 +22,6 @@
 from unittest import TestCase
 from unittest.mock import Mock, patch
 
-from data import (
-    get_component_setuptools_simple,
-    get_component_setuptools_simple_no_version,
-    get_component_toml_with_hashes_with_references,
-    get_issue_1,
-    get_issue_2,
-    get_pedigree_1,
-    get_swid_1,
-    get_swid_2,
-)
-
 from cyclonedx.exception.model import NoPropertiesProvidedException
 from cyclonedx.model import (
     AttachedText,
@@ -55,6 +44,16 @@
     Pedigree,
 )
 from cyclonedx.model.issue import IssueClassification, IssueType
+from data import (
+    get_component_setuptools_simple,
+    get_component_setuptools_simple_no_version,
+    get_component_toml_with_hashes_with_references,
+    get_issue_1,
+    get_issue_2,
+    get_pedigree_1,
+    get_swid_1,
+    get_swid_2,
+)
 from tests.data import reorder
 
 

tests/test_model_issue.py

@@ -19,11 +19,10 @@
 
 from unittest import TestCase
 
-from data import get_issue_1, get_issue_2
-
 from cyclonedx.exception.model import NoPropertiesProvidedException
 from cyclonedx.model import XsUri
 from cyclonedx.model.issue import IssueClassification, IssueType, IssueTypeSource
+from data import get_issue_1, get_issue_2
 from tests.data import reorder
 
 

tests/test_output_json.py

@@ -20,6 +20,10 @@
 from os.path import dirname, join
 from unittest.mock import Mock, patch
 
+from cyclonedx.exception.model import UnknownComponentDependencyException
+from cyclonedx.exception.output import FormatNotSupportedException
+from cyclonedx.model.bom import Bom
+from cyclonedx.output import OutputFormat, SchemaVersion, get_instance
 from data import (
     MOCK_UUID_1,
     MOCK_UUID_2,
@@ -42,11 +46,6 @@
     get_bom_with_services_complex,
     get_bom_with_services_simple,
 )
-
-from cyclonedx.exception.model import UnknownComponentDependencyException
-from cyclonedx.exception.output import FormatNotSupportedException
-from cyclonedx.model.bom import Bom
-from cyclonedx.output import OutputFormat, SchemaVersion, get_instance
 from tests.base import BaseJsonTestCase
 from tests.data import get_bom_for_issue_275_components
 

tests/test_output_xml.py

@@ -20,6 +20,9 @@
 from os.path import dirname, join
 from unittest.mock import Mock, patch
 
+from cyclonedx.exception.model import UnknownComponentDependencyException
+from cyclonedx.model.bom import Bom
+from cyclonedx.output import SchemaVersion, get_instance
 from data import (
     MOCK_UUID_1,
     MOCK_UUID_2,
@@ -44,10 +47,6 @@
     get_bom_with_services_complex,
     get_bom_with_services_simple,
 )
-
-from cyclonedx.exception.model import UnknownComponentDependencyException
-from cyclonedx.model.bom import Bom
-from cyclonedx.output import SchemaVersion, get_instance
 from tests.base import BaseXmlTestCase
 from tests.data import get_bom_for_issue_275_components