Skip to content

Prototype SPDX 3.0 #550

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

Jump to bottom
Merged
merged 180 commits into from
Jun 7, 2023
Merged

Prototype SPDX 3.0 #550

merged 180 commits into from
Jun 7, 2023

Conversation

armintaenzertng
Copy link
Collaborator

This is the PR for the branch that we try to keep up-to-date with the current development in https://github.com/spdx/spdx-3-model.
Features the model and migration methods to convert SPDX documents from 2.2/2.3 to 3.0

@meretp meretp force-pushed the prototype-spdx-3.0 branch from 650b59f to 02a6572 Compare April 19, 2023 09:02
@armintaenzertng armintaenzertng force-pushed the prototype-spdx-3.0 branch 3 times, most recently from ecb2a55 to a3dc429 Compare April 25, 2023 10:15
@HarshvMahawar
Copy link
Contributor

@armintaenzertng I think the best option is to remove the commit which is causing problem, because as the pr was merged I can't modify the changes(even so will require rebasing which may cause serious issues)
Can it be done?

@armintaenzertng
Copy link
Collaborator Author

@HarshvMahawar, I dropped the offending commit (that added the AIPackage fixture). Feel free to open a new PR that adds it back in again! :)

meretp added 19 commits June 5, 2023 09:23
@meretp @armintaenzertng
[spdx3.0] add basic implementation for file class
cf54eda 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add package class
61de83f 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] move core class to model level
8442e75 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add snippet class
de6cb15 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add Collection, Bundle, Bom, Sbom, SpdxDocument, ExternalMa…
ab80118 
…p, NamespaceMap

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add tests for data model and fix initialization for inherit…
572e0ec 
…ed classes

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[reformat] creation_information.py
8e9bf9c 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add tests for classes in software module and fix initializa…
4769114 
…tion for inherited classes

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add tests for CreationInformation, NamespaceMap and Externa…
1a819e0 
…lMap

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] rename spdx.element.Collection.import_element to imports
50b3ba2 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] fix: add elements and root_elements to Collection and chang…
cef158e 
…e name according to md-file

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] make elements and root_elements required for collections an…
e45ec58 
…d all inherited classes

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add relationship
a90f2b9 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] use __dataclass_fields__ to also set inherited fields in ch…
957ed64 
…eck_types_and_set_values

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] refactor: use method instead of private variable to iterate…
406e9b8 
… through the fields of a dataclass and add license header

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] use mocks for element in test as check_types_and_set_values…
b305352 
… no longer uses them

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[spdx3.0] add IntegrityMethod
84f797b 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[refactor] move each class in a separate file
d94c68f 
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
@meretp @armintaenzertng
[review] shorten comment about pycharm warning, add comment for abstr…
192a247 
…act classes

Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
fholger and others added 11 commits June 5, 2023 09:23
@fholger @armintaenzertng
Properly add all namespaces from OWL to json-ld context
260d223 
Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
Update json-ld context
c7a4b66 
Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
Properly represent byte_range and line_range with explicit PositiveIn…
a8456b5 
…tegerRange type

Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
fixme: licenseText is not optional in SPDX3, and an empty string is o…
444e0ca 
…mitted in serialization

Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
Fix broken references during bump so that the written test json valid…
4c6d827 
…ates properly against the shacl model. Also fill in required root elements for document.

Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
Update model and json-ld context with spdxId references removed
cd37e76 
Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@fholger @armintaenzertng
If in doubt, prefer core properties in jsonld context
a09c0d7 
Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>
@armintaenzertng
fix tests and formatting
43cabc4 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng
add spdx2 document comment to spdx3 document instead of creation info
10c6f49 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@HarshvMahawar @armintaenzertng
Add fixture dict. for ai_package profile
0bffc5c 
Signed-off-by: HarshvMahawar <hv062727@gmail.com>
@armintaenzertng
[issue-680] debug writer: account for creation info being optional
51a87b0 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
willarmiros and others added 5 commits June 5, 2023 12:14
@willarmiros @armintaenzertng
fix dataset sensor property
7278567 
Signed-off-by: William Armiros <william@protectai.com>
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@willarmiros @armintaenzertng
corrected dataset header in writer
72808ca 
Signed-off-by: William Armiros <william@protectai.com>
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng
[issue-673] adapt tests after replacing typeguard with beartype in SP…
63292b0 
…DX3 prototype

Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng
[issue-432] use software fixtures in tests
7fdeab5 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng
[issue-432] use Build, AIPackage and Dataset fixtures in tests
b48d7f3 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng armintaenzertng marked this pull request as ready for review June 5, 2023 10:18
@armintaenzertng
[issue-432] adapt license header
e6e832a 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
maxhbr
maxhbr previously approved these changes Jun 6, 2023
View reviewed changes
Copy link
Member

@maxhbr maxhbr left a comment

Choose a reason for hiding this comment

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

LGTM, especially as it is basically already reviewed by the PR workflow, that created it.

@armintaenzertng
include basic documentation on the SPDX 3 part of the library
08f0056 
Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>
@armintaenzertng armintaenzertng requested a review from maxhbr June 6, 2023 08:41
maxhbr
maxhbr approved these changes Jun 7, 2023
View reviewed changes
Copy link
Member

@maxhbr maxhbr left a comment

Choose a reason for hiding this comment

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

LGTM

@armintaenzertng armintaenzertng merged commit 7881f7e into main Jun 7, 2023
@armintaenzertng armintaenzertng deleted the prototype-spdx-3.0 branch June 7, 2023 08:05
@armintaenzertng
Copy link
Collaborator Author

@willarmiros: In case you missed it, we merged the spdx3 prototype branch into main and will continue to develop it there :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxhbr maxhbr maxhbr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@armintaenzertng @HarshvMahawar @maxhbr @meretp @fholger @willarmiros