Skip to content

Add unpackaged files - #2

Merged
bjamesv merged 1 commit into
mainfrom
add-unpackaged-files-spdx1
Jun 13, 2022
Merged

bjamesv merged 1 commit into
mainfrom
add-unpackaged-files-spdx1

Conversation

@bjamesv

@bjamesv bjamesv commented Jun 13, 2022

Copy link
Copy Markdown

Add Files without associated packages, as allowed by the spec but not currently supported in Document class.

  • unpackaged Files data model
  • tag/value Writer, Parser & tests
  • RDF Writer, Parser & tests
  • JSON-yaml-XML Writer, Parser & tests

Also leverages the unpackaged Files data model, to fix rdf parser bug where every referencesFile are incorrectly added to the last-listed Package.

Resolves spdx/tools-python #181

Signed-off-by: Brandon J. Van Vaerenbergh brandon@finitestate.io

@bjamesv bjamesv added the enhancement New feature or request label Jun 13, 2022
@bjamesv bjamesv mentioned this pull request Jun 13, 2022
4 tasks done

@njv299 njv299 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@bjamesv
bjamesv force-pushed the add-unpackaged-files-spdx1 branch from 84e46ff to 60bf7e6 Compare June 13, 2022 22:08
commit c450e9d
Author: bjv <bjv@ip-192-168-2-156.ec2.internal>
Date:   Mon Jun 13 13:41:15 2022 -0700

    change var names & comparison order, for clarity

commit 441301e
Author: bjv <bjv@ip-192-168-2-156.ec2.internal>
Date:   Mon Jun 13 13:18:13 2022 -0700

    docs & whitespace cleanup

commit 2794f0f
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Mon Jun 13 09:18:04 2022 -0700

    add unpackaged Files tag/value separator

commit b65966a
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Mon Jun 13 09:12:28 2022 -0700

    DRY out parser builders, a bit

commit a7a5e6e
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Mon Jun 13 08:20:30 2022 -0700

    work around spdx#149

commit f5050b2
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Mon Jun 13 07:54:02 2022 -0700

    fix more test RDF data

commit 850d525
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Wed Jun 8 10:10:05 2022 -0700

parse rdf package hasFile refs, to distribute doc referencesFile
among packages

commit ca3588f
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Fri Jun 3 15:17:13 2022 -0700

(Breaks many tests!) Add unpackaged RDF referencesFile to document
unpackaged_files

    Test assume builder always adds File to the last RDF Package? Seems
    wrong

commit 773ecad
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Thu Jun 2 16:44:15 2022 -0700

    Use filetype 'other' for test

commit 6799c30
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Thu Jun 2 16:43:50 2022 -0700

    Cleanup hanging licenseref

commit a2c506b
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Thu Jun 2 16:07:08 2022 -0700

    Render unpackaged files, for test

commit 83d7b89
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Thu Jun 2 15:49:42 2022 -0700

    Cleaned up rdf test

commit 0c633f8
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Tue May 31 14:35:02 2022 -0700

    Add rdf parser (partial commit)

commit 9072617
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Wed May 25 15:54:05 2022 -0700

    cleanup

commit 11b4502
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Wed May 25 15:52:46 2022 -0700

    drop unused flag

commit 6128dea
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Wed May 25 15:34:36 2022 -0700

    nicer unpackaged_file validator var name + docs

commit 3acc3dc
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Wed May 25 14:52:03 2022 -0700

add unpackaged files to tag/value parser, tests & json-yaml-xml
writer

commit 9314f27
Author: bjv <bjv@bjvs-MBP.lan>
Date:   Mon May 23 16:11:30 2022 -0700

    Add unpackaged file info + tag/value writer

Signed-off-by: Brandon J. Van Vaerenbergh <brandon@finitestate.io>
@bjamesv
bjamesv force-pushed the add-unpackaged-files-spdx1 branch from 60bf7e6 to ba40678 Compare June 13, 2022 22:16
@bjamesv
bjamesv merged commit 66df09a into main Jun 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Files without an associated Package allowed by spec, but not supported in Document class

2 participants