Add required imports

Signed-off-by: Varsha U N <varshaun58@gmail.com>

Author: VarshaUN

scanpipe/pipelines/deploy_to_develop.py

@@ -20,6 +20,11 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/aboutcode-org/scancode.io for support and download.
 
+<<<<<<< HEAD
+=======
+import logging
+from pathlib import Path
+>>>>>>> c845a20f (Add required imports)
 from aboutcode.pipeline import optional_step
 from scanpipe import pipes
 from scanpipe.pipelines import Pipeline

scanpipe/pipelines/resolve_dependencies.py

@@ -20,7 +20,14 @@
 # ScanCode.io is a free software code scanning tool from nexB Inc. and others.
 # Visit https://github.com/aboutcode-org/scancode.io for support and download.
 
+<<<<<<< HEAD
 from aboutcode.pipeline import optional_step
+=======
+import logging
+from pathlib import Path
+from aboutcode.pipeline import optional_step
+from aboutcode.pipeline import group
+>>>>>>> c845a20f (Add required imports)
 from scanpipe.pipelines.scan_codebase import ScanCodebase
 from scanpipe.pipes import resolve
 from scanpipe.pipes import scancode

scanpipe/pipes/fetch.py

@@ -363,7 +363,6 @@ def fetch_git_repo(url, to=None):
     )
 
 
-<<<<<<< HEAD
 def store_package_archive(project, url=None, file_path=None):
     """
     Store a package in PackageArchive and link it to DownloadedPackage.
@@ -436,17 +435,6 @@ def store_package_archive(project, url=None, file_path=None):
     except Exception as e:
         logger.error(f"Error creating DownloadedPackage: {e}")
         return None
-=======
-def fetch_package_url(url):
-    # Ensure the provided Package URL is valid, or raise a ValueError.
-    PackageURL.from_string(url)
-
-    # Resolve a Download URL using purl2url.
-    if download_url := purl2url.get_download_url(url):
-        return fetch_http(download_url)
-
-    raise ValueError(f"Could not resolve a download URL for {url}.")
->>>>>>> 5d3601a5 (Add support for using Package URL (purl) as project input. (#1686))
 
 
 SCHEME_TO_FETCHER_MAPPING = {