-
Notifications
You must be signed in to change notification settings - Fork 15
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
aiida-core 2.x compatibility changes #48
Conversation
Removing the reentry command from the tests as it is not needed for aiida-2.x Removing the md_multi capability of reading the restart for each stage, as it is incompatible with aiida-2.x Fixing the last of the tests that was blocking the aiida-2.x adoption. Removing unnecessary tests and adding an older version of lammps for testing. Fixing an issue in which the lammps version could not be parsed properly when it was not only a datetime.
Codecov Report
@@ Coverage Diff @@
## develop #48 +/- ##
===========================================
- Coverage 81.88% 81.83% -0.05%
===========================================
Files 30 30
Lines 2335 2318 -17
===========================================
- Hits 1912 1897 -15
+ Misses 423 421 -2
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All looks good cheers! Just a minor change request
pyproject.toml
Outdated
@@ -23,7 +23,7 @@ classifiers = [ | |||
keywords = ["aiida", "workflows", "lammps"] | |||
requires-python = ">=3.8" | |||
dependencies = [ | |||
"aiida-core[atomic-tools]>=1.4.0,<2.0.0", | |||
"aiida-core[atomic-tools]>=2.0.0,<3.0.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the psycop2g-binary pinning can be removed here now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You want me to remove the psycopg2-binary<2.9
by psycopg2-binary
? It is just that the diff in the pyproject.toml
is showing a change in the version of aiida-core that already exists.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep, this was indeed fixed upstream for aiida-core 2.0: aiidateam/aiida-core#5104
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we don't really to explicitly set psycog-binary2
as a dependency right? as it is an aiida-core
dependency. The same for ase
as it is installed via aiida-core[atomic-tools]
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we don't really to explicitly set psycog-binary2 as a dependency right?
yeh this was only there before, to fix an upstream bug in aiida-core
1.x
The same for ase as it is installed via
aiida-core[atomic-tools]
.
yep, can remove that, since we don't use ase
anywhere in the actual aiida-lammps
code base
pyproject.toml
Outdated
"psycopg2-binary<2.9", | ||
"ase>=3.12.0,<4.0.0", | ||
"aiida-core[atomic-tools]>=2.0.0,<3.0.0", | ||
"psycopg2-binary", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be removed entirely
Removing the explicit ase dependency as it is installed via aiida-core[atomic_tools].
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All sorted!
Changing the code so that it is compatible with aiida-2.x. Fixes #40