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

Upgrade pydantic version and update corresponding fsapi code #1330

Merged
merged 7 commits into from
Mar 22, 2024

Conversation

MichaelPesce
Copy link
Contributor

Fixes/Resolves:

#1273

Summary/Motivation:

Other packages are reliant on pydantic having version >= 2.0.0

Changes proposed in this PR:

  • remove the requirement that watertap package has pydantic < 2
  • add requirement that watertap has pydantic >= 2
  • migrate pydantic code to use v2 syntax

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.

Copy link

codecov bot commented Mar 19, 2024

Codecov Report

Attention: Patch coverage is 97.87234% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 94.25%. Comparing base (1849b8a) to head (a2c2f85).

Files Patch % Lines
watertap/ui/fsapi.py 97.87% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1330      +/-   ##
==========================================
- Coverage   94.25%   94.25%   -0.01%     
==========================================
  Files         370      370              
  Lines       37952    37951       -1     
==========================================
- Hits        35770    35769       -1     
  Misses       2182     2182              

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

@ksbeattie ksbeattie added the Priority:Normal Normal Priority Issue or PR label Mar 21, 2024
@ksbeattie ksbeattie marked this pull request as ready for review March 21, 2024 20:12
setup.py Outdated Show resolved Hide resolved
Co-authored-by: Ludovico Bianchi <lbianchi@lbl.gov>
@lbianchi-lbl lbianchi-lbl self-requested a review March 21, 2024 23:17
Copy link
Contributor

@lbianchi-lbl lbianchi-lbl left a comment

Choose a reason for hiding this comment

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

Thanks for taking care of this @MichaelPesce!

@lbianchi-lbl lbianchi-lbl merged commit 492e8db into watertap-org:main Mar 22, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:Normal Normal Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants