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

Use .content rather than .project_hdf5 #1509

Merged
merged 7 commits into from
Aug 1, 2024
Merged

Use .content rather than .project_hdf5 #1509

merged 7 commits into from
Aug 1, 2024

Conversation

pmrv
Copy link
Contributor

@pmrv pmrv commented Jul 28, 2024

This allows .output to work with Sphinx jobs that use strange output format.

This allows .output to work with Sphinx jobs that use strange output format.
@pmrv pmrv added the bug Something isn't working label Jul 28, 2024
@jan-janssen
Copy link
Member

This allows .output to work with Sphinx jobs that use strange output format.

Does this break LAMMPS and VASP?

pmrv added 2 commits July 28, 2024 21:33
Catch KeyError as well as ValueError.  Previously we used project_hdf5 to access the storage in
GenericOutput, which raises ValueError on missing keys. Now using content we have to check
KeyError as well, as that is raised by HDF5Content.
@pmrv pmrv added integration Start the notebook integration tests for this PR format_black reformat the code using the black standard labels Jul 29, 2024
@coveralls
Copy link

coveralls commented Jul 29, 2024

Pull Request Test Coverage Report for Build 10143456330

Details

  • 36 of 57 (63.16%) changed or added relevant lines in 2 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.01%) to 70.921%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pyiron_atomistics/atomistics/job/atomistic.py 13 20 65.0%
pyiron_atomistics/table/funct.py 23 37 62.16%
Files with Coverage Reduction New Missed Lines %
pyiron_atomistics/table/funct.py 1 61.15%
Totals Coverage Status
Change from base Build 10106288863: 0.01%
Covered Lines: 10707
Relevant Lines: 15097

💛 - Coveralls

@pmrv pmrv marked this pull request as ready for review July 29, 2024 08:43
@pmrv
Copy link
Contributor Author

pmrv commented Jul 29, 2024

This allows .output to work with Sphinx jobs that use strange output format.

Does this break LAMMPS and VASP?

The only difference between .content and .project_hdf5 is that the former tries to to_object() any DataContainers it finds, but otherwise returns the same, so I can't see why it would make problems. Technically .content raises KeyErrors instead of ValueErrors which is what caused the test failures on the weekend, but since .output anyway always silenced those to None, no outside code should depend on this.

@samwaseda Can you add a test case for #1508?

@jan-janssen jan-janssen added format_black reformat the code using the black standard and removed format_black reformat the code using the black standard labels Jul 29, 2024
@jan-janssen
Copy link
Member

@pmrv Should we adjust the pyiron table to also use content rather than output ?

@pmrv
Copy link
Contributor Author

pmrv commented Jul 29, 2024

@pmrv Should we adjust the pyiron table to also use content rather than output ?

You mean the predefined datamining functions? Yes, that would make sense.

Copy link
Member

@jan-janssen jan-janssen left a comment

Choose a reason for hiding this comment

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

Looks good to me. Once @samwaseda confirms it fixes his issues, I guess we should merge this and a release a new minor version.

@jan-janssen
Copy link
Member

@samwaseda Can you confirm this is working for SPHInx? I would like to release a new pyiron_atomistics version today.

Copy link
Member

@samwaseda samwaseda left a comment

Choose a reason for hiding this comment

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

I guess it's fine.

@jan-janssen jan-janssen merged commit 5c89a73 into main Aug 1, 2024
24 checks passed
@jan-janssen jan-janssen deleted the content branch August 1, 2024 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working format_black reformat the code using the black standard integration Start the notebook integration tests for this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants