Skip source-inspector installation on darwin arm64 (not compatible) (#1205)

Signed-off-by: tdruez <[email protected]>

Author: tdruez

scanpipe/pipes/symbols.py

@@ -23,8 +23,6 @@
 from django.db.models import Q
 
 from source_inspector import symbols_ctags
-from source_inspector import symbols_pygments
-from source_inspector import symbols_tree_sitter
 
 from scanpipe.pipes import LoopProgress
 
@@ -98,6 +96,8 @@ def _collect_and_store_pygments_symbols_and_strings(resource):
     Collect symbols, strings and comments from a resource using pygments and store
     them in the extra data field.
     """
+    from source_inspector import symbols_pygments
+
     result = symbols_pygments.get_pygments_symbols(resource.location)
     resource.update_extra_data(
         {
@@ -113,6 +113,8 @@ def collect_and_store_tree_sitter_symbols_and_strings(project, logger=None):
     Collect symbols from codebase files using tree-sitter and store
     them in the extra data field.
     """
+    from source_inspector import symbols_tree_sitter
+
     project_files = project.codebaseresources.files()
 
     language_qs = Q()
@@ -137,9 +139,11 @@ def collect_and_store_tree_sitter_symbols_and_strings(project, logger=None):
 
 def _collect_and_store_tree_sitter_symbols_and_strings(resource):
     """
-    Collect symbols ans string from a resource using tree-sitter and store
+    Collect symbols and string from a resource using tree-sitter and store
     them in the extra data field.
     """
+    from source_inspector import symbols_tree_sitter
+
     result = symbols_tree_sitter.get_treesitter_symbols(resource.location)
     resource.update_extra_data(
         {

scanpipe/tests/pipes/test_symbols.py

@@ -33,13 +33,13 @@
 from scanpipe.pipes.input import copy_input
 
 
+@skipIf(sys.platform == "darwin", "Not supported on macOS")
 class ScanPipeSymbolsPipesTest(TestCase):
     data_location = Path(__file__).parent.parent / "data"
 
     def setUp(self):
         self.project1 = Project.objects.create(name="Analysis")
 
-    @skipIf(sys.platform == "darwin", "Not supported on macOS")
     def test_scanpipe_pipes_symbols_collect_and_store_resource_symbols(self):
         dir = self.project1.codebase_path / "codefile"
         dir.mkdir(parents=True)

scanpipe/tests/test_pipelines.py

@@ -1278,6 +1278,7 @@ def test_scanpipe_collect_source_strings_pipeline_integration(self):
         ]
         self.assertCountEqual(expected_extra_data_strings, result_extra_data_strings)
 
+    @skipIf(sys.platform == "darwin", "Not supported on macOS")
     def test_scanpipe_collect_pygments_symbols_pipeline_integration(self):
         pipeline_name = "collect_pygments_symbols"
         project1 = Project.objects.create(name="Analysis")
@@ -1308,6 +1309,7 @@ def test_scanpipe_collect_pygments_symbols_pipeline_integration(self):
 
         self.assertDictEqual(expected_extra_data, result_extra_data)
 
+    @skipIf(sys.platform == "darwin", "Not supported on macOS")
     def test_scanpipe_collect_tree_sitter_symbols_pipeline_integration(self):
         pipeline_name = "collect_tree_sitter_symbols"
         project1 = Project.objects.create(name="Analysis")

setup.cfg

@@ -64,9 +64,9 @@ install_requires =
     # wait_for_database Django management command
     django-probes==1.7.0
     # Task queue
-    rq==1.16.1
+    rq==1.16.2
     django-rq==2.10.2
-    redis==5.0.3
+    redis==5.0.4
     # WSGI server
     gunicorn==22.0.0
     # Docker
@@ -81,7 +81,7 @@ install_requires =
     elf-inspector==0.0.1
     go-inspector==0.2.2
     python-inspector==0.12.0
-    source-inspector==0.5.0
+    source-inspector==0.5.0; sys_platform != "darwin" and platform_machine != "arm64"
     aboutcode-toolkit==10.1.0
     # Utilities
     XlsxWriter==3.2.0
@@ -91,8 +91,8 @@ install_requires =
     # Profiling
     pyinstrument==4.6.2
     # CycloneDX
-    cyclonedx-python-lib==7.3.0
-    jsonschema==4.21.1
+    cyclonedx-python-lib==7.3.2
+    jsonschema==4.22.0
     # Font Awesome
     fontawesomefree==6.5.1
     # MatchCode-toolkit
@@ -107,7 +107,7 @@ install_requires =
 dev =
     # Validation
     flake8==7.0.0
-    black==24.4.0
+    black==24.4.2
     isort==5.13.2
     doc8==1.1.1
     pydocstyle==6.3.0