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

Support aiida-quantumespresso plugin to 4.5.0 #601

Merged
merged 4 commits into from
Mar 22, 2024

Conversation

unkcpz
Copy link
Member

@unkcpz unkcpz commented Jan 25, 2024

No description provided.

@unkcpz unkcpz marked this pull request as draft January 25, 2024 09:37
@unkcpz unkcpz added this to the v2024.4.0 milestone Jan 25, 2024
@AndresOrtegaGuerrero
Copy link
Member

For the #577 , we should wait until aiidateam/aiida-quantumespresso#1007 is merged. Also is covenient for #512

@danielhollas
Copy link
Contributor

@unkcpz @superstar54 FYI this update is needed for aiida-core~=2.5 since earlier version of aiida-quantumespresso depend on pydantic v1.

This is a bit unfortunate, since you're going to have a hard breaking change in the next release --- older releases will only work on older images, while the new v2.5 image will only support the latest release.

@unkcpz
Copy link
Member Author

unkcpz commented Mar 18, 2024

I think pinning to the minor version will do the trick, if the aiida-core in the docker stack < 2.5, the aiida-quantumespresso==4.4 will be installed, otherwise with install aiida-quantumespresso==4.5 with pydantic v2.

@unkcpz
Copy link
Member Author

unkcpz commented Mar 19, 2024

Hi @superstar54, can you check why the unit test failed? I don't understand why the max_iteration is in the reference test data of data-regression output.

@superstar54
Copy link
Member

@unkcpz this is introduced in this commit from latest aiida-quantumespresso. I think you can update the reference data to include it.

@danielhollas
Copy link
Contributor

I think pinning to the minor version will do the trick, if the aiida-core in the docker stack < 2.5, the aiida-quantumespresso==4.4 will be installed, otherwise with install aiida-quantumespresso==4.5 with pydantic v2.

Sounds reasonable, I did a couple of quick tests locally to verify different combinations work, e.g.

uv pip install -e . aiida-core==2.5
uv pip install -e . aiida-core==2.4 pydantic~=1.0   # This one installes 4.4 version
uv pip install -e . aiida-core==2.4

@danielhollas
Copy link
Contributor

Hi @superstar54, can you check why the unit test failed? I don't understand why the max_iteration is in the reference test data of data-regression output.

Hmm, perhaps to prevent potential breakages in the future, you might want to do

aiida-quantumespresso~=4.4,<4.6

@unkcpz
Copy link
Member Author

unkcpz commented Mar 19, 2024

I think you can update the reference data to include it.

No, I don't think this will solve the problem. We want our test pass for no matter which aiida-quantumespresso version is used. Ideally, we need in the qeapp to have test run on oldest and latest version of aiida-quantumespresso supported as well.

aiida-quantumespresso~=4.4,<4.6

I think this is the workaround for the moment. The max_iteration is a new thing in 4.5.0, so put <4.6 won't help.

@unkcpz
Copy link
Member Author

unkcpz commented Mar 19, 2024

Blocked by #638

Copy link

codecov bot commented Mar 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.85%. Comparing base (a6f3517) to head (17a43e2).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #601   +/-   ##
=======================================
  Coverage   75.85%   75.85%           
=======================================
  Files          60       60           
  Lines        4312     4312           
=======================================
  Hits         3271     3271           
  Misses       1041     1041           
Flag Coverage Δ
python-3.10 75.85% <ø> (ø)
python-3.9 75.88% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@superstar54 superstar54 marked this pull request as ready for review March 21, 2024 17:23
@superstar54
Copy link
Member

@danielhollas @unkcpz ready to go!

@unkcpz
Copy link
Member Author

unkcpz commented Mar 21, 2024

Thanks @superstar54 for the work, but I try not too much optimistic. I bump the aiida-core version in CI to 2.5, hope it passed. Please also check the comment on #644, I think the workflow data-regression test can not simply being removed but should be moved (decoupled for the workchain only).

@unkcpz
Copy link
Member Author

unkcpz commented Mar 21, 2024

Nice, tests still all passed after bump aiida-core version in CI matrix. Good to go! This is my PR so I can not approve. @danielhollas can you give it a final check that we didn't miss anything else.

@unkcpz unkcpz merged commit 15abd2b into aiidalab:main Mar 22, 2024
15 checks passed
@unkcpz unkcpz deleted the bump/qe-plugin branch March 22, 2024 09:08
@unkcpz unkcpz changed the title Bump quantumespresso plugin to 4.5.0 Support aiida-quantumespresso plugin to 4.5.0 Mar 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants