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

Redefine variants in neptune-env virtual package #1265

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Aug 21, 2024

Summary

This PR defines three variants in the neptune-env virtual package: espc, python, xnrl. In the unified environment and in the skylab environment, the variants espc and xnrl are off, the python variant is on. This is so that py-fortranformat is available in those environments (required by pyiri-jedi). In the neptune standalone environment, all three variants are on. Note that the xnrl variant requires the python variant.

We can debate if we should move some of the Python packages from the python variant to the xnrl variant, but since these are in the unified environment anyway (because some other package needs them), it doesn't really matter.

Testing

I concretize the neptune standalone environment and the unified environment on my laptop and verified that there are no duplicate packages or conflicts. I also tested that specifying +xnrl ~python throws an error. Further testing will be done in CI (see below).

Applications affected

There are no changes to the neptune standalone environment, only to the unified environment and the skylab environment (if that is still used).

Systems affected

n/a

Dependencies

n/a

Issue(s) addressed

Need py-fortranformat in unified environment.

Checklist

  • This PR addresses one issue/problem/enhancement, or has a very good reason for not doing so.
  • These changes have been tested on the affected systems and applications.
  • All dependency PRs/issues have been resolved and this PR can be merged.

…stack/packages/neptune-env/package.py and update {configs/templates/neptune-dev,skylab-dev,unified-dev} accordingly
@climbfuji climbfuji requested a review from eap August 21, 2024 20:11
@climbfuji climbfuji marked this pull request as ready for review August 21, 2024 20:11
@climbfuji climbfuji requested a review from areinecke August 21, 2024 20:11
@climbfuji climbfuji self-assigned this Aug 21, 2024
@climbfuji climbfuji added INFRA JEDI Infrastructure NAVY United States Naval Research Lab labels Aug 21, 2024
Copy link
Collaborator

@eap eap left a comment

Choose a reason for hiding this comment

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

Thanks for this. Good idea to define this as a variant rather than splitting the package.

@climbfuji climbfuji enabled auto-merge (squash) August 22, 2024 02:32
@climbfuji climbfuji merged commit 3b22b34 into JCSDA:develop Aug 22, 2024
8 checks passed
@climbfuji climbfuji deleted the feature/three_variants_for_neptune_env branch August 22, 2024 10:57
climbfuji added a commit that referenced this pull request Aug 23, 2024
…ev, skylab-dev, unified-dev (#1268)

This is a bug fix PR: Configure neptune-env variants in three templates: neptune-dev, skylab-dev, unified-dev. This commit must have gotten lost in #1265.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
INFRA JEDI Infrastructure NAVY United States Naval Research Lab
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants