Skip to content

Commit

Permalink
#517 - Update link references of ownership from nexB to aboutcode-org…
Browse files Browse the repository at this point in the history
… and version

Signed-off-by: Chin Yeung Li <tli@nexb.com>
  • Loading branch information
chinyeungli committed Aug 9, 2024
1 parent 6018577 commit 94a3bb0
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 39 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ Next Release
https://github.com/aboutcode-org/purldb/issues/504


v5.0.1
---------

- Update link references of ownership from nexB to aboutcode-org

v5.0.0
---------

Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) nexB Inc. and others. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
# See https://github.com/nexB/ for support or download.
# See https://github.com/aboutcode-org/ for support or download.
# See https://aboutcode.org for more information about nexB OSS projects.
#

Expand Down
16 changes: 8 additions & 8 deletions docs/source/how-to-guides/deploy_to_devel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ Then run a d2d subcommand
3. run the d2d for a pair of URLs::

purlcli d2d \
--purl https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip \
--purl https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip \
--purl https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip \
--purl https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip \
--output - \
--purldb-api-url http://127.0.0.1:8001/api/ \
--matchcode-api-url http://127.0.0.1:8002/api/
Expand Down Expand Up @@ -286,9 +286,9 @@ Make a request to the local URL for the /api/d2d endpoint and enter Input URLs

For example these two:

- https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip#from
- https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip#from

- https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip#to
- https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip#to


.. image:: images/d2d-images/da526ca9-6a8c-4883-951e-26e92597ce0d.png
Expand Down Expand Up @@ -352,9 +352,9 @@ To test the feature:

- Add these two `Download URLs` exactly as below using these zip examples:

- source: https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip#from
- source: https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/from-data.zip#from

- binary: https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip#to
- binary: https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-elfs/to-data.zip#to

- Select and execute the "map_deploy_to_develop" pipeline, and then click on the "Elf" option

Expand Down Expand Up @@ -390,9 +390,9 @@ To test the feature:

- Add these two `Download URLs` exactly as below using these webpacked examples:

- source: https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-go/from-data.zip#from
- source: https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-go/from-data.zip#from

- binary: https://github.com/nexB/scancode.io/raw/main/scanpipe/tests/data/d2d-go/to-data.zip#to
- binary: https://github.com/aboutcode-org/scancode.io/raw/main/scanpipe/tests/data/d2d-go/to-data.zip#to

- Select and execute the "map_deploy_to_develop" pipeline, clicking on the Go option

Expand Down
6 changes: 3 additions & 3 deletions docs/source/how-to-guides/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PurlDB

.. code-block:: console
git clone https://github.com/nexB/scancode.io.git && cd scancode.io
git clone https://github.com/aboutcode-org/scancode.io.git && cd scancode.io
make envfile
docker compose build
Expand Down Expand Up @@ -71,7 +71,7 @@ Package Scan Worker
- This should be installed on another machine, if possible.

- Download the latest release of ScanCode.io at
https://github.com/nexB/scancode.io/releases and follow the Docker
https://github.com/aboutcode-org/scancode.io/releases and follow the Docker
installation instructions at
https://scancodeio.readthedocs.io/en/latest/installation.html

Expand Down Expand Up @@ -111,7 +111,7 @@ MatchCode.io

.. code-block:: console
git clone https://github.com/nexB/scancode.io.git && cd scancode.io
git clone https://github.com/aboutcode-org/scancode.io.git && cd scancode.io
make envfile
docker compose -f docker-compose.matchcodeio.yml build
Expand Down
2 changes: 1 addition & 1 deletion docs/source/purldb/symbol_and_string_collection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ See the detailed tutorial on :ref:`symbols_and_strings` in PurlDB.
`Symbol and String Collection <https://scancodeio.readthedocs.io/en/latest/tutorial_web_ui_symbol_and_string_collection.html>`_.

For more details on these plugins refer to
`source-inspector <https://github.com/nexB/source-inspector/blob/main/README.rst>`_.
`source-inspector <https://github.com/aboutcode-org/source-inspector/blob/main/README.rst>`_.
6 changes: 3 additions & 3 deletions matchcode-toolkit/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ MatchCode toolkit
=================

MatchCode toolkit is a Python library that provides the directory fingerprinting
functionality for `ScanCode toolkit <https://github.com/nexB/scancode-toolkit>`_
and `ScanCode.io <https://github.com/nexB/scancode.io>`_ by implementing the
functionality for `ScanCode toolkit <https://github.com/aboutcode-org/scancode-toolkit>`_
and `ScanCode.io <https://github.com/aboutcode-org/scancode.io>`_ by implementing the
HaloHash algorithm and using it in ScanCode toolkit and ScanCode.io plugins and
pipelines.

Expand Down Expand Up @@ -53,5 +53,5 @@ added step of computing fingerprints for directories.

.. note::

MatchCode toolkit has moved to its own repo at https://github.com/nexB/matchcode-toolkit
MatchCode toolkit has moved to its own repo at https://github.com/aboutcode-org/matchcode-toolkit
from its previous location https://github.com/aboutcode-org/purldb/tree/main/matchcode-toolkit
4 changes: 2 additions & 2 deletions matchcode_pipeline/pipelines/matching.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
#
# http://nexb.com and https://github.com/nexB/scancode.io
# http://nexb.com and https://github.com/aboutcode-org/scancode.io
# The ScanCode.io software is licensed under the Apache License version 2.0.
# Data generated with ScanCode.io is provided as-is without warranties.
# ScanCode is a trademark of nexB Inc.
Expand All @@ -18,7 +18,7 @@
# for any legal advice.
#
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/nexB/scancode.io for support and download.
# Visit https://github.com/aboutcode-org/scancode.io for support and download.

from scanpipe.pipelines.load_inventory import LoadInventory
from scanpipe.pipelines.scan_codebase import ScanCodebase
Expand Down
4 changes: 2 additions & 2 deletions matchcode_pipeline/pipes/matching.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
#
# http://nexb.com and https://github.com/nexB/scancode.io
# http://nexb.com and https://github.com/aboutcode-org/scancode.io
# The ScanCode.io software is licensed under the Apache License version 2.0.
# Data generated with ScanCode.io is provided as-is without warranties.
# ScanCode is a trademark of nexB Inc.
Expand All @@ -18,7 +18,7 @@
# for any legal advice.
#
# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/nexB/scancode.io for support and download.
# Visit https://github.com/aboutcode-org/scancode.io for support and download.

from collections import defaultdict

Expand Down
2 changes: 1 addition & 1 deletion minecode/model_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def merge_packages(existing_package, new_package_data, replace=False):
existing_mapping.pop('purl')

# FIXME REMOVE this workaround when a ScanCode bug fixed with
# https://github.com/nexB/scancode-toolkit/commit/9b687e6f9bbb695a10030a81be7b93c8b1d816c2
# https://github.com/aboutcode-org/scancode-toolkit/commit/9b687e6f9bbb695a10030a81be7b93c8b1d816c2
qualifiers = new_package_data.get('qualifiers')
if isinstance(qualifiers, dict):
# somehow we get an dict on the new value instead of a string
Expand Down
4 changes: 2 additions & 2 deletions minecode/visitors/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def map_fetchcode_supported_package(package_url, pipelines, priority=0):

package_data = packages[0].to_dict()

# Remove obsolete Package fields see https://github.com/nexB/fetchcode/issues/108
# Remove obsolete Package fields see https://github.com/aboutcode-org/fetchcode/issues/108
package = packagedata_from_dict(package_data)

db_package, _, _, error = merge_or_create_package(package, visit_level=0)
Expand Down Expand Up @@ -178,7 +178,7 @@ def process_request_fetchcode_generic(purl_str, **kwargs):
supported by fetchcode.
This involves obtaining Package information for the PURL using
https://github.com/nexB/fetchcode and using it to create a new
https://github.com/aboutcode-org/fetchcode and using it to create a new
PackageDB entry. The package is then added to the scan queue afterwards.
"""
from minecode.model_utils import DEFAULT_PIPELINES
Expand Down
2 changes: 1 addition & 1 deletion minecode/visitors/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def process_request_dir_listed(purl_str, **kwargs):
Process `priority_resource_uri` containing a GitHub Package URL (PURL).
This involves obtaining Package information for the PURL using
https://github.com/nexB/fetchcode and using it to create a new
https://github.com/aboutcode-org/fetchcode and using it to create a new
PackageDB entry. The package is then added to the scan queue afterwards.
"""
from minecode.model_utils import DEFAULT_PIPELINES
Expand Down
2 changes: 1 addition & 1 deletion minecode/visitors/gnu.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def process_request(purl_str, **kwargs):
URI.
This involves obtaining Package information for the PURL using
https://github.com/nexB/fetchcode and using it to create a new
https://github.com/aboutcode-org/fetchcode and using it to create a new
PackageDB entry. The package is then added to the scan queue afterwards.
"""
from minecode.model_utils import DEFAULT_PIPELINES
Expand Down
4 changes: 2 additions & 2 deletions minecode/visitors/openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def process_request_dir_listed(purl_str, **kwargs):
supported by fetchcode.
This involves obtaining Package information for the PURL using
https://github.com/nexB/fetchcode and using it to create a new
https://github.com/aboutcode-org/fetchcode and using it to create a new
PackageDB entry. The package is then added to the scan queue afterwards.
"""
from minecode.model_utils import DEFAULT_PIPELINES
Expand All @@ -119,4 +119,4 @@ def process_request_dir_listed(purl_str, **kwargs):
error_msg = map_fetchcode_supported_package(package_url, pipelines, priority)

if error_msg:
return error_msg
return error_msg
2 changes: 1 addition & 1 deletion packagedb/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from django.core.exceptions import FieldError
from django.db.models import Q

# The function and Classes in this file are from https://github.com/nexB/scancode.io/blob/main/scanpipe/filters.py
# The function and Classes in this file are from https://github.com/aboutcode-org/scancode.io/blob/main/scanpipe/filters.py


def parse_query_string_to_lookups(query_string, default_lookup_expr, default_field):
Expand Down
4 changes: 2 additions & 2 deletions packagedb/package_managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# VulnerableCode is a trademark of nexB Inc.
# SPDX-License-Identifier: Apache-2.0
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
# See https://github.com/nexB/vulnerablecode for support or download.
# See https://github.com/aboutcode-org/vulnerablecode for support or download.
# See https://aboutcode.org for more information about nexB OSS projects.
#

Expand Down Expand Up @@ -202,7 +202,7 @@ def fetch(self, pkg):
release_date = self.get_latest_date(download_items)
yield PackageVersion(
value=version,
#
#
release_date=release_date,
)

Expand Down
17 changes: 11 additions & 6 deletions purldb-toolkit/src/purldb_toolkit/cli_test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ScanCode is a trademark of nexB Inc.
# SPDX-License-Identifier: Apache-2.0
# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
# See https://github.com/nexB/scancode-toolkit for support or download.
# See https://github.com/aboutcode-org/scancode-toolkit for support or download.
# See https://aboutcode.org for more information about nexB OSS projects.
#

Expand All @@ -18,7 +18,8 @@
from scancode_config import scancode_root_dir


REGEN_TEST_FIXTURES = os.environ.get("PURLDB_TOOLKIT_TEST_FIXTURES_REGEN", False)
REGEN_TEST_FIXTURES = os.environ.get(
"PURLDB_TOOLKIT_TEST_FIXTURES_REGEN", False)


def run_scan_plain(
Expand Down Expand Up @@ -125,14 +126,16 @@ def run_scan_click(

runner = CliRunner()

result = runner.invoke(cli.scancode, options, catch_exceptions=False, env=env)
result = runner.invoke(cli.scancode, options,
catch_exceptions=False, env=env)
if retry and result.exit_code != expected_rc:
if on_windows:
# wait and rerun in verbose mode to get more in the output
time.sleep(1)
if "--verbose" not in options:
options.append("--verbose")
result = runner.invoke(cli.scancode, options, catch_exceptions=False, env=env)
result = runner.invoke(cli.scancode, options,
catch_exceptions=False, env=env)

if result.exit_code != expected_rc:
output = result.output
Expand Down Expand Up @@ -196,7 +199,8 @@ def check_json_scan(
If `remove_uuid` is True, removes UUID from Package and Dependency.
and if also `regen` is True then regenerate expected file with old UUIDs present already.
"""
results = load_json_result(location=result_file, remove_file_date=remove_file_date)
results = load_json_result(
location=result_file, remove_file_date=remove_file_date)
if remove_uuid:
results = remove_uuid_from_scan(results)

Expand Down Expand Up @@ -242,7 +246,8 @@ def remove_uuid_from_scan(results):

for_package_uid = dependency.get("for_package_uid")
if for_package_uid:
dependency["for_package_uid"] = purl_with_fake_uuid(for_package_uid)
dependency["for_package_uid"] = purl_with_fake_uuid(
for_package_uid)

for resource in results.get("files") or []:
for_packages = []
Expand Down
2 changes: 1 addition & 1 deletion purldb_project/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import os
import sys

__version__ = "5.0.0"
__version__ = "5.0.1"


def command_line():
Expand Down
2 changes: 1 addition & 1 deletion purldb_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
'EXCEPTION_HANDLER': 'packagedb.throttling.throttled_exception_handler',
'DEFAULT_PAGINATION_CLASS': 'packagedb.api_custom.PageSizePagination',
'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
# Limit the load on the Database returning a small number of records by default. https://github.com/nexB/vulnerablecode/issues/819
# Limit the load on the Database returning a small number of records by default. https://github.com/aboutcode-org/vulnerablecode/issues/819
"PAGE_SIZE": 20,
}

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = purldb
version = 5.0.0
version = 5.0.1
license_files =
LICENSE
AUTHORS.rst
Expand Down

0 comments on commit 94a3bb0

Please sign in to comment.