Skip to content

Vendor attrs to avoid unpickle issues #3179 #3192 - #3193

Merged
pombredanne merged 7 commits into
developfrom
v31.2.3-branch-hotfix
Jan 17, 2023
Merged

Vendor attrs to avoid unpickle issues #3179 #3192#3193
pombredanne merged 7 commits into
developfrom
v31.2.3-branch-hotfix

Conversation

@pombredanne

@pombredanne pombredanne commented Jan 9, 2023

Copy link
Copy Markdown
Member

We have vendored attrs only for its use in licensedcode.models. With this, we avoid updates to the attrs library that would make unpickling the license index fail.

Reported-by: Soim @soimkim
Reference: #3192
Reference: #3179
Signed-off-by: Philippe Ombredanne pombredanne@nexb.com

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁

We have vendored attrs only for its use in licensedcode.models.
With this, we avoid updates to the attrs library that would make
unpickling the license index fail.

Reported-by: Soim @soimkim
Reference: #3192
Reference: #3179
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne

Copy link
Copy Markdown
Member Author

Note: this PR is for a hot fix release and not designed to be merged as-is in develop. It will need some backporting and resolution of conflicts, or can be reapplied by hand.

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This was restored with the introduction of packvers

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This fixes #3179 and we already have a release out with that.

I've merged develop into this to make this PR merge ready, but there is #3195 btw but it's not crashing the install so we can probably handle that in v32? or do we have to backport that fix too?

some CIs are failing because scancode checkout is taking an hour fsr, probably a fluke?

@AyanSinhaMahapatra AyanSinhaMahapatra added this to the v32.0 milestone Jan 12, 2023

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

LGTM! thank you.

@pombredanne
pombredanne merged commit 2124157 into develop Jan 17, 2023
@pombredanne
pombredanne deleted the v31.2.3-branch-hotfix branch January 17, 2023 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants