From 264c173b2581cf004f4c8c99b657b5dba3571bb1 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 25 Feb 2025 13:13:17 -0800 Subject: [PATCH 1/2] Update ScanAndFingerprintPackage pipeline * Use fingerprint_codebase method from FingerprintCodebase pipeline Signed-off-by: Jono Yang --- .../pipelines/scan_and_fingerprint_package.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py b/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py index 705e4c1..4292b93 100644 --- a/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py +++ b/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py @@ -23,8 +23,10 @@ from scanpipe.pipelines.scan_single_package import ScanSinglePackage from scanpipe.pipes import matchcode +from matchcode_toolkit.pipelines.fingerprint_codebase import FingerprintCodebase -class ScanAndFingerprintPackage(ScanSinglePackage): + +class ScanAndFingerprintPackage(FingerprintCodebase, ScanSinglePackage): """ Scan a single package file or package archive with ScanCode-toolkit, then calculate the directory fingerprints of the codebase. @@ -55,9 +57,3 @@ def steps(cls): "--classify", "--summary", ] - - def fingerprint_codebase(self): - """ - Compute directory fingerprints for matching purposes - """ - matchcode.fingerprint_codebase_directories(self.project) From f765dae63252936552f92c62fc4be7ad37010bff Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 25 Feb 2025 13:14:34 -0800 Subject: [PATCH 2/2] Update CHANGELOG.rst Signed-off-by: Jono Yang --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f0fb84c..877de55 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +v7.2.1 +------ + +*2025-02-25* -- Update ScanAndFingerprintPackage pipeline to use the ``fingerprint_codebase`` step from the FingerprintCodebase pipeline. + v7.2.0 ------