Upgrade the scancode-action references to aboutcode-org

Signed-off-by: tdruez <tdruez@nexb.com>

Author: tdruez

.github/workflows/generate-sboms.yml

@@ -32,7 +32,7 @@ jobs:
           find scancodeio/ -type f -name "*.ABOUT" -exec cp {} "${{ env.INPUTS_PATH }}/about-files/" \;
 
       - name: Resolve the dependencies using ScanCode-action
-        uses: nexB/scancode-action@main
+        uses: aboutcode-org/scancode-action@main
         with:
           pipelines: "resolve_dependencies:DynamicResolver"
           inputs-path: ${{ env.INPUTS_PATH }}

docs/automation.rst

@@ -79,8 +79,8 @@ automation methods such as a cron job or a git hook::
 Seamlessly integrate ScanCode.io into your GitHub Workflows to enable automated scans
 as an integral part of your development process.
 
-Visit the `scancode-action repository <https://github.com/nexB/scancode-action>`_ to
-explore and learn more about the GitHub Action for ScanCode.io.
+Visit the `scancode-action repository <https://github.com/aboutcode-org/scancode-action>`_
+to explore and learn more about the GitHub Action for ScanCode.io.
 The repository provides detailed information, usage instructions,
 and configuration options to help you incorporate code scanning effortlessly into your
 workflows.

docs/faq.rst

@@ -202,7 +202,7 @@ How can I trigger a pipeline scan from a CI/CD, such as Jenkins, TeamCity or Azu
 You can refer to the :ref:`automation` to automate your projects management.
 
 Also, A new GitHub action is available at
-`scancode-action repository <https://github.com/nexB/scancode-action>`_
+`scancode-action repository <https://github.com/aboutcode-org/scancode-action>`_
 to run ScanCode.io pipelines from your GitHub Workflows.
 
 How can I get notified about my project progression?

scanpipe/models.py

@@ -585,7 +585,7 @@ class Project(UUIDPKModel, ExtraDataFieldMixin, UpdateMixin, models.Model):
     )
     notes = models.TextField(blank=True)
     settings = models.JSONField(default=dict, blank=True)
-<<<<<<< HEAD
+
     labels = TaggableManager(through=UUIDTaggedItem, ordering=["name"])
     purl = models.CharField(
         max_length=2048,
@@ -598,11 +598,10 @@ class Project(UUIDPKModel, ExtraDataFieldMixin, UpdateMixin, models.Model):
         ),
     )
 
-=======
+
     labels = TaggableManager(through=UUIDTaggedItem)
     use_local_storage = models.BooleanField(default=False,
                          help_text="Store packages locally if enabled.")
->>>>>>> 0cade5ed (add support to store packages/archives locally)
     objects = ProjectQuerySet.as_manager()
 
     class Meta:

scanpipe/pipelines/deploy_to_develop.py

@@ -20,11 +20,6 @@
 # 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,14 +20,7 @@
 # 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