Skip to content

Fix rule_url to use aboutcode-org instead of nexB #4848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Harsh-svg988 wants to merge 1 commit into
base: develop
Choose a base branch
from
+7,379 −7,379
Open

Fix rule_url to use aboutcode-org instead of nexB #4848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions src/scancode/api.py
View file
Open in desktop
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.
#
from itertools import islice
Expand Down Expand Up @@ -142,7 +142,7 @@ def get_urls(location, threshold=50, **kwargs):
SPDX_LICENSE_URL = 'https://spdx.org/licenses/{}'
DEJACODE_LICENSE_URL = 'https://enterprise.dejacode.com/urn/urn:dje:license:{}'
SCANCODE_LICENSEDB_URL = 'https://scancode-licensedb.aboutcode.org/{}'
SCANCODE_DATA_BASE_URL = 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data'
SCANCODE_DATA_BASE_URL = 'https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data'
SCANCODE_LICENSE_URL = f'{SCANCODE_DATA_BASE_URL}/licenses/{{}}.LICENSE'
SCANCODE_RULE_URL = f'{SCANCODE_DATA_BASE_URL}/rules/{{}}'

Expand Down
4 changes: 2 additions & 2 deletions tests/cluecode/data/plugin_filter_clues/filtered-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "apache-1.1_63.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
}
]
}
Expand Down Expand Up @@ -63,7 +63,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "apache-1.1_63.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
}
],
"identifier": "apache_1_1-1712efcb-d696-b5e4-214d-b2ab69680c2a"
Expand Down
4 changes: 2 additions & 2 deletions tests/cluecode/data/plugin_filter_clues/filtered-expected2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "pygres-2.2_2.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
}
]
}
Expand Down Expand Up @@ -63,7 +63,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "pygres-2.2_2.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
}
],
"identifier": "pygres_2_2-04f085e8-3db1-f9e2-8dde-7ba8a7ba619a"
Expand Down
4 changes: 2 additions & 2 deletions tests/cluecode/data/plugin_filter_clues/filtered-expected3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "pcre.LICENSE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
}
]
}
Expand Down Expand Up @@ -63,7 +63,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "pcre.LICENSE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
}
],
"identifier": "pcre-c61d8210-7748-d787-5e3e-fd64c6cd6b6a"
Expand Down
36 changes: 18 additions & 18 deletions tests/cluecode/data/plugin_filter_clues/filtered-expected4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0-plus_or_artistic-1.0_2.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_2.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_2.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -32,7 +32,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0_10.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_10.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_10.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -46,7 +46,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0_37.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_37.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_37.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -60,7 +60,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0.LICENSE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gpl-1.0.LICENSE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gpl-1.0.LICENSE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -74,7 +74,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_9.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_9.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_9.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -88,7 +88,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_7.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_7.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_7.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -102,7 +102,7 @@
"match_coverage": 100.0,
"rule_relevance": 90,
"rule_identifier": "artistic-1.0_11.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -116,7 +116,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_4.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_4.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_4.RULE"
},
{
"license_expression": "warranty-disclaimer",
Expand All @@ -130,7 +130,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "warranty-disclaimer_72.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_72.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_72.RULE"
}
]
}
Expand Down Expand Up @@ -175,7 +175,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0-plus_or_artistic-1.0_2.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_2.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_or_artistic-1.0_2.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -189,7 +189,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0_10.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_10.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_10.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -203,7 +203,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0_37.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_37.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0_37.RULE"
},
{
"license_expression": "gpl-1.0",
Expand All @@ -217,7 +217,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "gpl-1.0.LICENSE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gpl-1.0.LICENSE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/gpl-1.0.LICENSE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -231,7 +231,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_9.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_9.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_9.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -245,7 +245,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_7.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_7.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_7.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -259,7 +259,7 @@
"match_coverage": 100.0,
"rule_relevance": 90,
"rule_identifier": "artistic-1.0_11.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_11.RULE"
},
{
"license_expression": "artistic-1.0",
Expand All @@ -273,7 +273,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "artistic-1.0_4.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_4.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-1.0_4.RULE"
},
{
"license_expression": "warranty-disclaimer",
Expand All @@ -287,7 +287,7 @@
"match_coverage": 100.0,
"rule_relevance": 100,
"rule_identifier": "warranty-disclaimer_72.RULE",
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_72.RULE"
"rule_url": "https://github.com/aboutcode-org/scancode-toolkit/tree/develop/src/licensedcode/data/rules/warranty-disclaimer_72.RULE"
}
],
"identifier": "gpl_1_0_plus_or_artistic_1_0__and_gpl_1_0_and_artistic_1_0_and_warranty_disclaimer-a1de207d-6b62-18b8-f372-e9820f733de3"
Expand Down
Loading
Loading