Skip to content

fix: properly sort components based on all properties - #599

Merged
jkowalleck merged 19 commits into
mainfrom
fix/issue598
Apr 26, 2024
Merged

fix: properly sort components based on all properties#599
jkowalleck merged 19 commits into
mainfrom
fix/issue598

Conversation

@jkowalleck

@jkowalleck jkowalleck commented Apr 25, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

reverts #587 - as this one introduced errors
fixes #598
fixes #586

jkowalleck added 10 commits April 25, 2024 13:38
@jkowalleck
test model
ee5e8b6 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
impl
e8f92a1 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
dict
a7dc327 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
test res
2f26241 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
test fix
5bac91e 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
test fix
c96412a 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
additional tests
eb4ca72 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
tidy
7165279 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
7403557 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
f1fe9c4 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck jkowalleck added the bug Something isn't working label Apr 25, 2024
@jkowalleck
jkowalleck requested a review from a team as a code owner April 25, 2024 12:54
@jkowalleck

jkowalleck commented Apr 25, 2024

Copy link
Copy Markdown
Member Author

after this one is releaed, the release 7.3.1 SHOULD be yanked, as it introduced bugs

@jkowalleck
typing backwards compat
91277a0 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
typing backwards compat
606e751 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
jkowalleck marked this pull request as draft April 25, 2024 13:05
@jkowalleck jkowalleck changed the title fix: properly sort components based on all properties [wip] fix: properly sort components based on all properties Apr 25, 2024
@jkowalleck
fixes
a08419b 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
82ec5e1 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
f1036a5 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
f8ed58e 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
2f93232 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fixes
5edc940 
Signed-off-by: Jan Kowalleck <[email protected]>
jkowalleck
jkowalleck commented Apr 25, 2024
View reviewed changes
Comment thread cyclonedx/model/component.py Resolved
@jkowalleck
jkowalleck marked this pull request as ready for review April 25, 2024 14:07
@jkowalleck

jkowalleck commented Apr 25, 2024

Copy link
Copy Markdown
Member Author

@madpah please review

@madpah

madpah commented Apr 25, 2024

Copy link
Copy Markdown
Collaborator

Code looks good @jkowalleck - but some tests failing to run - seems to be GitHub related??

@madpah

madpah commented Apr 25, 2024

Copy link
Copy Markdown
Collaborator 
Error: dyld[3646]: Library not loaded: /usr/local/opt/gettext/lib/libintl.8.dylib
    Referenced from: <09857011-94D0-3FBA-9F9D-9FCE0E7366FF> /Users/runner/hostedtoolcache/Python/3.10.14/x64/bin/python3.10
    Reason: tried: '/usr/local/opt/gettext/lib/libintl.8.dylib' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/usr/local/opt/gettext/lib/libintl.8.dylib' (no such file), '/usr/local/opt/gettext/lib/libintl.8.dylib' (no such file), '/usr/local/lib/libintl.8.dylib' (no such file), '/usr/lib/
  Error: libintl.8.dylib' (no such file, not in dyld cache)
  ./setup.sh: line 52:  3646 Abort trap: 6           ./python -m ensurepip
  Error: The process '/bin/bash' failed with exit code 134

@madpah

madpah commented Apr 25, 2024 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Looks to be related to GitHub having changed the version of MacOSX associated with macos-latest OS that we refer to.

Previously this pointed to:

Current runner version: '2.315.0'
Operating System: macOS 12.7.4 21H1123
Image: macos-12

Now it points to:

Current runner version: '2.316.0'
Operating System: macOS 14.4.1 23E224
Image: macos-14-arm64

And the new runner image only has support for Python 3.11 & 3.12 - see here for macos-14-arm64 compared with here for macos-12

@madpah
chore(ci): Specifiy OS runner for MacOS to avoid latest (version 14) …
ab2a899 
…which only has support for Python 3.11 and Python 3.12

Signed-off-by: Paul Horton <[email protected]>
@codacy-production

codacy-production Bot commented Apr 25, 2024

Copy link
Copy Markdown

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for 25ea6111 ❌ 75.00% (target: 80.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (25ea611) Report Missing Report Missing Report Missing
Head commit (ab2a899) 4472 4153 92.87%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#599) 20 15 75.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy will stop sending the deprecated coverage status from June 5th, 2024. Learn more

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct. ↩

@madpah

madpah commented Apr 25, 2024

Copy link
Copy Markdown
Collaborator

CI running for MacOSX now @jkowalleck - but Codacy has an alert

@jkowalleck

jkowalleck commented Apr 26, 2024

Copy link
Copy Markdown
Member Author

@madpah thank you so much for the macOS CI fix. 🥇

@jkowalleck jkowalleck changed the title [wip] fix: properly sort components based on all properties fix: properly sort components based on all properties Apr 26, 2024
@jkowalleck
jkowalleck merged commit 8df488c into main Apr 26, 2024
@jkowalleck
jkowalleck deleted the fix/issue598 branch April 26, 2024 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@madpah madpah madpah approved these changes

Assignees

No one assigned

Labels

bug Something isn't working

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

BUG: arbitrary dict comparison causes issues The Component __lt__ function can result in invalid components SortedSet

2 participants

@jkowalleck @madpah