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.

Sign up for GitHub

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

Jump to bottom

Remove [include_]system_hdf5_netcdf #198

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Remove [include_]system_hdf5_netcdf #198

merged 1 commit into from
Sep 30, 2024

Conversation

altheaden
Copy link
Collaborator

@altheaden altheaden commented Sep 27, 2024 •
edited
Loading

This PR removes the deprecated include_system_hdf5_netcdf and system_hdf5_netcdf from Spack files and machine config files.

Checklist

  • Testing comment in the PR documents testing used to verify the changes

@altheaden altheaden added clean-up Cleanup or maintenance of code that does not alter behavior or functionality spack Changes relate to creating conda and Spack environments, and creating a load script labels Sep 27, 2024
xylar
xylar reviewed Sep 28, 2024
View reviewed changes
Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

@altheaden, this looks great! There are just some descriptions of the now-removed parameters in the docstrings that also need to be removed.

mache/spack/__init__.py Outdated
Comment on lines 194 to 196
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove the rest of the docstring entry as well:

Suggested change
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Whoops, I didn't notice that, I'll go ahead and change this in all files. Thanks for pointing that out!

mache/spack/__init__.py Outdated
Comment on lines 56 to 58
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove the rest of the docstring entry:

Suggested change
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

mache/spack/__init__.py Outdated
Comment on lines 298 to 300
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Again, remove the rest of the dostring entry:

Suggested change
Whether to include the system hdf5, netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)

@xylar
Copy link
Collaborator

xylar commented Sep 28, 2024

I don't think we need any testing other than CI for now.

@altheaden altheaden force-pushed the remove-system-hdf5-netcdf branch from 7a5071c to a208401 Compare September 30, 2024 15:41
@altheaden
Copy link
Collaborator Author

@xylar Fixed those docs :)

xylar
xylar reviewed Sep 30, 2024
View reviewed changes
Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

It still looks like there are 2 places with leftover docstrings. Not sure if I missed these in my last review or what happened.

mache/spack/__init__.py Outdated
Comment on lines 194 to 195
Whether to include the netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)
Copy link
Collaborator

Choose a reason for hiding this comment

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

@altheaden, these 2 lines still need to be removed.

mache/spack/__init__.py Outdated
Comment on lines 298 to 299
Whether to include the netcdf-c, netcdf-fortran and
pnetcdf (not necessarily the same as E3SM)
Copy link
Collaborator

Choose a reason for hiding this comment

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

As do these 2.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh, sorry, I thought I was just supposed to remove the references to hdf5. I see the issue now, that was my mistake, I didn't look at the whole context. Will fix that now.

@altheaden altheaden force-pushed the remove-system-hdf5-netcdf branch from a208401 to 59ff742 Compare September 30, 2024 17:52
@altheaden
Copy link
Collaborator Author

@xylar now it should be fixed... sorry about that.

xylar
xylar approved these changes Sep 30, 2024
View reviewed changes
Copy link
Collaborator

@xylar xylar left a comment

Choose a reason for hiding this comment

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

Okay, great! It looks perfect now!

@xylar xylar merged commit 80bc008 into E3SM-Project:main Sep 30, 2024
5 checks passed
@xylar xylar deleted the remove-system-hdf5-netcdf branch September 30, 2024 17:54
xylar added a commit to xylar/mache that referenced this pull request Jan 18, 2025
@xylar
Add back use_e3sm_hdf5_netcdf config option
d818a06 
This was removed rather than renamed in E3SM-Project#198
@xylar xylar mentioned this pull request Jan 18, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xylar xylar xylar approved these changes

Assignees
No one assigned
Labels
clean-up Cleanup or maintenance of code that does not alter behavior or functionality spack Changes relate to creating conda and Spack environments, and creating a load script
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@altheaden @xylar