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

aiida-core 2.x compatibility changes #48

Merged
merged 4 commits into from
Aug 19, 2022

Conversation

JPchico
Copy link
Collaborator

@JPchico JPchico commented Aug 19, 2022

Changing the code so that it is compatible with aiida-2.x. Fixes #40

Jonathan Chico added 3 commits August 5, 2022 13:30
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
Copy link

codecov bot commented Aug 19, 2022

Codecov Report

Merging #48 (7914049) into develop (c612773) will decrease coverage by 0.04%.
The diff coverage is 72.28%.

@@             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     
Flag Coverage Δ
pytests 81.83% <72.28%> (-0.05%) ⬇️

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

Impacted Files Coverage Δ
aiida_lammps/calculations/lammps/__init__.py 67.20% <0.00%> (-0.52%) ⬇️
aiida_lammps/common/utils.py 94.59% <ø> (ø)
aiida_lammps/parsers/lammps/lammps_parser.py 0.00% <0.00%> (ø)
aiida_lammps/data/lammps_potential.py 79.21% <27.27%> (ø)
aiida_lammps/data/trajectory.py 90.74% <86.36%> (+1.26%) ⬆️
aiida_lammps/data/potential.py 93.75% <94.11%> (ø)
aiida_lammps/calculations/lammps/force.py 98.18% <100.00%> (ø)
aiida_lammps/calculations/lammps/md.py 96.90% <100.00%> (+0.03%) ⬆️
aiida_lammps/calculations/lammps/md_multi.py 86.77% <100.00%> (+0.07%) ⬆️
aiida_lammps/calculations/lammps/optimize.py 95.06% <100.00%> (+0.06%) ⬆️
... and 6 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@chrisjsewell chrisjsewell left a 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",
Copy link
Member

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?

Copy link
Collaborator Author

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.

Copy link
Member

@chrisjsewell chrisjsewell Aug 19, 2022

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

Copy link
Collaborator Author

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].

Copy link
Member

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",
Copy link
Member

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].
Copy link
Member

@chrisjsewell chrisjsewell left a comment

Choose a reason for hiding this comment

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

All sorted!

@JPchico JPchico merged commit 36367d0 into aiidaplugins:develop Aug 19, 2022
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