Upgrade dependencies to latest versions (#1557)

tdruez · web-flow · commit ec2ca285ef09 · 2025-01-22T17:04:31.000+09:00
* Upgrade dependencies to latest versions

Signed-off-by: tdruez &lt;tdruez@nexb.com&gt;

* Run Ruff linter validation

Signed-off-by: tdruez &lt;tdruez@nexb.com&gt;

---------

Signed-off-by: tdruez &lt;tdruez@nexb.com&gt;
diff --git a/scanpipe/management/commands/__init__.py b/scanpipe/management/commands/__init__.py
@@ -427,7 +427,7 @@ def execute_project(project, run_async=False, command=None):  # noqa: C901
         msg = f"Error during {run.pipeline_name} execution:\n{run.task_output}"
         raise CommandError(msg)
     elif verbosity > 0:
-        msg = f"{run.pipeline_name} successfully executed on " f"project {project}"
+        msg = f"{run.pipeline_name} successfully executed on project {project}"
         command.stdout.write(msg, command.style.SUCCESS)
 
 
diff --git a/scanpipe/management/commands/check-compliance.py b/scanpipe/management/commands/check-compliance.py
@@ -61,8 +61,7 @@ def handle(self, *args, **options):
 
         if self.verbosity > 0:
             msg = [
-                f"{compliance_alerts_count} compliance issues detected on "
-                f"this project."
+                f"{compliance_alerts_count} compliance issues detected on this project."
             ]
             for label, issues in compliance_alerts.items():
                 msg.append(f"[{label}]")
diff --git a/scanpipe/management/commands/output.py b/scanpipe/management/commands/output.py
@@ -73,8 +73,7 @@ def handle_output(self, output_format):
             output_format, version = output_format.split(":", maxsplit=1)
             if output_format != "cyclonedx":
                 raise CommandError(
-                    'The ":" version syntax is only supported for the cyclonedx '
-                    "format."
+                    'The ":" version syntax is only supported for the cyclonedx format.'
                 )
             output_kwargs["version"] = version
 
diff --git a/scanpipe/pipelines/publish_to_federatedcode.py b/scanpipe/pipelines/publish_to_federatedcode.py
@@ -88,8 +88,7 @@ def commit_and_push_changes(self):
             logger=self.log,
         )
         self.log(
-            f"Scan result for '{self.project.purl}' "
-            f"pushed to '{self.package_git_repo}'"
+            f"Scan result for '{self.project.purl}' pushed to '{self.package_git_repo}'"
         )
 
     def delete_local_clone(self):
diff --git a/scanpipe/pipes/d2d.py b/scanpipe/pipes/d2d.py
@@ -1721,9 +1721,7 @@ def map_paths_resource(
             f"{', '.join(map_types)} for: {to_resource.path!r}"
         )
     else:
-        logger(
-            f"No mappings using {', '.join(map_types)} for: " f"{to_resource.path!r}"
-        )
+        logger(f"No mappings using {', '.join(map_types)} for: {to_resource.path!r}")
 
 
 def process_paths_in_binary(
diff --git a/scanpipe/pipes/federatedcode.py b/scanpipe/pipes/federatedcode.py
@@ -73,7 +73,7 @@ def get_package_repository(project_purl, logger=None):
     """Return the Git repository URL and scan path for a given package."""
     project_package_url = PackageURL.from_string(project_purl)
 
-    git_account_url = f'{settings.FEDERATEDCODE_GIT_ACCOUNT_URL.rstrip("/")}/'
+    git_account_url = f"{settings.FEDERATEDCODE_GIT_ACCOUNT_URL.rstrip('/')}/"
     package_base_dir = hashid.get_package_base_dir(purl=project_purl)
     package_repo_name = package_base_dir.parts[0]
 
diff --git a/scanpipe/pipes/matchcode.py b/scanpipe/pipes/matchcode.py
@@ -50,7 +50,7 @@ class MatchCodeIOException(Exception):
 MATCHCODEIO_API_URL = None
 MATCHCODEIO_URL = settings.MATCHCODEIO_URL
 if MATCHCODEIO_URL:
-    MATCHCODEIO_API_URL = f'{MATCHCODEIO_URL.rstrip("/")}/api/'
+    MATCHCODEIO_API_URL = f"{MATCHCODEIO_URL.rstrip('/')}/api/"
 
 # Basic Authentication
 MATCHCODEIO_USER = settings.MATCHCODEIO_USER
diff --git a/scanpipe/pipes/purldb.py b/scanpipe/pipes/purldb.py
@@ -50,7 +50,7 @@ class PurlDBException(Exception):
 PURLDB_API_URL = None
 PURLDB_URL = settings.PURLDB_URL
 if PURLDB_URL:
-    PURLDB_API_URL = f'{PURLDB_URL.rstrip("/")}/api/'
+    PURLDB_API_URL = f"{PURLDB_URL.rstrip('/')}/api/"
 
 # Basic Authentication
 PURLDB_USER = settings.PURLDB_USER
@@ -368,9 +368,7 @@ def populate_purldb_with_discovered_dependencies(project, logger=logger.info):
     """Add DiscoveredDependency to PurlDB."""
     packages = [{"purl": purl} for purl in get_unique_resolved_purls(project)]
 
-    logger(
-        f"Populating PurlDB with {len(packages):,d} " "PURLs from DiscoveredDependency"
-    )
+    logger(f"Populating PurlDB with {len(packages):,d} PURLs from DiscoveredDependency")
     feed_purldb(
         packages=packages,
         chunk_size=100,
diff --git a/scanpipe/pipes/symbolmap.py b/scanpipe/pipes/symbolmap.py
@@ -90,7 +90,7 @@ def map_resources_with_symbols(
             )
 
     elif logger:
-        logger(f"No mappings using {map_type} for: " f"{to_resource.path!r}")
+        logger(f"No mappings using {map_type} for: {to_resource.path!r}")
 
 
 def match_source_symbols_to_binary(source_symbols, binary_symbols):
diff --git a/scanpipe/pipes/vulnerablecode.py b/scanpipe/pipes/vulnerablecode.py
@@ -35,7 +35,7 @@
 VULNERABLECODE_API_URL = None
 VULNERABLECODE_URL = settings.VULNERABLECODE_URL
 if VULNERABLECODE_URL:
-    VULNERABLECODE_API_URL = f'{VULNERABLECODE_URL.rstrip("/")}/api/'
+    VULNERABLECODE_API_URL = f"{VULNERABLECODE_URL.rstrip('/')}/api/"
 
 # Basic Authentication
 VULNERABLECODE_USER = settings.VULNERABLECODE_USER
diff --git a/scanpipe/tests/pipes/test_codebase.py b/scanpipe/tests/pipes/test_codebase.py
@@ -173,8 +173,7 @@ def test_scanpipe_pipes_codebase_get_basic_virtual_codebase(self):
             "virtual_root/asgiref-3.3.0-py3-none-any.whl",
             "virtual_root/asgiref-3.3.0-py3-none-any.whl-extract",
             "virtual_root/asgiref-3.3.0-py3-none-any.whl-extract/asgiref",
-            "virtual_root/"
-            "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
+            "virtual_root/asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
             "virtual_root/"
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
             "virtual_root/"
diff --git a/scanpipe/tests/pipes/test_d2d.py b/scanpipe/tests/pipes/test_d2d.py
@@ -222,7 +222,7 @@ def test_scanpipe_pipes_d2d_match_purldb_directories(self, mock_request_get):
         )
 
         expected = (
-            "Matching 1 directory from to/ in PurlDB" "1 directory matched in PurlDB"
+            "Matching 1 directory from to/ in PurlDB1 directory matched in PurlDB"
         )
         self.assertEqual(expected, buffer.getvalue())
 
@@ -1454,7 +1454,7 @@ def test_scanpipe_pipes_d2d_match_purldb_resources_post_process(self):
             logger=buffer.write,
         )
         expected = (
-            "Refining matching for 1 " f"{flag.MATCHED_TO_PURLDB_RESOURCE} archives."
+            f"Refining matching for 1 {flag.MATCHED_TO_PURLDB_RESOURCE} archives."
         )
         self.assertIn(expected, buffer.getvalue())
 
diff --git a/scanpipe/tests/test_models.py b/scanpipe/tests/test_models.py
@@ -1817,8 +1817,7 @@ def test_scanpipe_codebase_resource_descendants(self):
         expected = [
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/__init__.py",
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/compatibility.py",
-            "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/"
-            "current_thread_executor.py",
+            "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/current_thread_executor.py",
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/local.py",
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/server.py",
             "asgiref-3.3.0-py3-none-any.whl-extract/asgiref/sync.py",
diff --git a/setup.cfg b/setup.cfg
@@ -49,22 +49,22 @@ packages=find:
 include_package_data = true
 zip_safe = false
 install_requires =
-    importlib-metadata==8.5.0
+    importlib-metadata==8.6.1
     setuptools==75.6.0
     # Django related
-    Django==5.1.4
-    django-environ==0.11.2
+    Django==5.1.5
+    django-environ==0.12.0
     django-crispy-forms==2.3
     crispy-bootstrap3==2024.1
     django-filter==24.3
     djangorestframework==3.15.2
     django-taggit==6.1.0
     # Database
-    psycopg[binary]==3.2.3
+    psycopg[binary]==3.2.4
     # wait_for_database Django management command
     django-probes==1.7.0
     # Task queue
-    rq==2.0.0
+    rq==2.1.0
     django-rq==3.0.0
     redis==5.2.1
     # WSGI server
@@ -89,7 +89,7 @@ install_requires =
     XlsxWriter==3.2.0
     openpyxl==3.1.5
     requests==2.32.3
-    gitpython==3.1.43
+    GitPython==3.1.44
     # Profiling
     pyinstrument==5.0.0
     # CycloneDX
@@ -112,10 +112,10 @@ install_requires =
 [options.extras_require]
 dev =
     # Validation
-    ruff==0.8.2
+    ruff==0.9.2
     doc8==1.1.2
     # Debug
-    django-debug-toolbar==4.4.6
+    django-debug-toolbar==5.0.1
     # Documentation
     Sphinx==8.1.3
     sphinx-rtd-theme==3.0.2

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ def handle(self, args, *options):`
`61`	`61`
`62`	`62`	`if self.verbosity > 0:`
`63`	`63`	`msg = [`
`64`		`- f"{compliance_alerts_count} compliance issues detected on "`
`65`		`- f"this project."`
	`64`	`+ f"{compliance_alerts_count} compliance issues detected on this project."`
`66`	`65`	`]`
`67`	`66`	`for label, issues in compliance_alerts.items():`
`68`	`67`	`msg.append(f"[{label}]")`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ def handle_output(self, output_format):`
`73`	`73`	`output_format, version = output_format.split(":", maxsplit=1)`
`74`	`74`	`if output_format != "cyclonedx":`
`75`	`75`	`raise CommandError(`
`76`		`- 'The ":" version syntax is only supported for the cyclonedx '`
`77`		`- "format."`
	`76`	`+ 'The ":" version syntax is only supported for the cyclonedx format.'`
`78`	`77`	`)`
`79`	`78`	`output_kwargs["version"] = version`
`80`	`79`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ def commit_and_push_changes(self):`
`88`	`88`	`logger=self.log,`
`89`	`89`	`)`
`90`	`90`	`self.log(`
`91`		`- f"Scan result for '{self.project.purl}' "`
`92`		`- f"pushed to '{self.package_git_repo}'"`
	`91`	`+ f"Scan result for '{self.project.purl}' pushed to '{self.package_git_repo}'"`
`93`	`92`	`)`
`94`	`93`
`95`	`94`	`def delete_local_clone(self):`
Original file line number	Diff line number	Diff line change
`@@ -1721,9 +1721,7 @@ def map_paths_resource(`
`1721`	`1721`	`f"{', '.join(map_types)} for: {to_resource.path!r}"`
`1722`	`1722`	`)`
`1723`	`1723`	`else:`
`1724`		`- logger(`
`1725`		`- f"No mappings using {', '.join(map_types)} for: " f"{to_resource.path!r}"`
`1726`		`- )`
	`1724`	`+ logger(f"No mappings using {', '.join(map_types)} for: {to_resource.path!r}")`
`1727`	`1725`
`1728`	`1726`
`1729`	`1727`	`def process_paths_in_binary(`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def map_resources_with_symbols(`
`90`	`90`	`)`
`91`	`91`
`92`	`92`	`elif logger:`
`93`		`- logger(f"No mappings using {map_type} for: " f"{to_resource.path!r}")`
	`93`	`+ logger(f"No mappings using {map_type} for: {to_resource.path!r}")`
`94`	`94`
`95`	`95`
`96`	`96`	`def match_source_symbols_to_binary(source_symbols, binary_symbols):`