Skip to content
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.

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

Fix Pydantic 2 failures #1089

Merged
merged 2 commits into from
Aug 17, 2023
Merged

Conversation

lbianchi-lbl
Copy link
Contributor

Fixes/Resolves:

Failures due to breaking changes in Pydantic 2 (used by watertap.ui.fsapi).

Changes proposed in this PR:

  • Add <2 constraint to pydantic requirement

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@lbianchi-lbl lbianchi-lbl added Priority:High High Priority Issue or PR 🍒 Merge to rel Merge commit(s) from this PR to release branch labels Jul 20, 2023
@lbianchi-lbl lbianchi-lbl self-assigned this Jul 20, 2023
@lbianchi-lbl
Copy link
Contributor Author

It actually looks like that Pydantic is pinned to 1.10 by nbmake, which is effectively "shielding" (or "tricking", depending on your point of view) us from the failures. Since the failures only appear when nbmake is not installed, i.e. a consequence of #1088, I'm closing this one and add the version constraint there.

@lbianchi-lbl
Copy link
Contributor Author

EDIT: Pydantic 2.2 has more breaking changes, so I'm reopening this more targeted PR (as opposed to #1088) to be merged ASAP to resolve failures in e.g. #1038.

@lbianchi-lbl lbianchi-lbl removed the 🍒 Merge to rel Merge commit(s) from this PR to release branch label Aug 17, 2023
@lbianchi-lbl lbianchi-lbl marked this pull request as ready for review August 17, 2023 20:47
Copy link
Contributor

@ksbeattie ksbeattie left a comment

Choose a reason for hiding this comment

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

LGTM

@dangunter dangunter self-requested a review August 17, 2023 20:48
Copy link
Collaborator

@dangunter dangunter left a comment

Choose a reason for hiding this comment

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

LGTM

@lbianchi-lbl lbianchi-lbl enabled auto-merge (squash) August 17, 2023 21:31
@codecov
Copy link

codecov bot commented Aug 17, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.53%. Comparing base (8eb8bc2) to head (fd017c8).
Report is 258 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1089   +/-   ##
=======================================
  Coverage   95.53%   95.53%           
=======================================
  Files         325      325           
  Lines       31701    31701           
=======================================
  Hits        30287    30287           
  Misses       1414     1414           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lbianchi-lbl lbianchi-lbl merged commit a88303f into watertap-org:main Aug 17, 2023
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Priority:High High Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants