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

add mepo, update py-pyyaml #447

Closed

Conversation

mathomp4
Copy link
Collaborator

@mathomp4 mathomp4 commented Jul 2, 2024

As spack#44879 seems to be weirdly unmergable (?), just in case, I'll make a PR here with the mepo update from spack#44879 and the py-pyyaml update from spack#44906.

I'll keep monitoring spack#44879 in case that does get in...

@climbfuji
Copy link
Collaborator

Since the spack PR was merged, do you want to update this PR so that we have the final version WITH the correct hash from the squashed merged from spack develop?

@mathomp4
Copy link
Collaborator Author

mathomp4 commented Jul 3, 2024

Since the spack PR was merged, do you want to update this PR so that we have the final version WITH the correct hash from the squashed merged from spack develop?

Hmm. Sure...but how would one do that? Always willing to learn new Git routines!

@climbfuji
Copy link
Collaborator

Start with spack-stack-dev, configure the spack (authoritative) remote, then cherry-pick the squashed-merge hash from the mepo PR. This will give you a lot of conflicts (because we already have a mepo package for v1). Then git checkout "theirs" (i.e. the spack develop version) so that mepo in spack-stack-dev is identical to that in spack develop. "git add", "git commit". That should do?

@mathomp4
Copy link
Collaborator Author

mathomp4 commented Jul 3, 2024

Superseded by #448

@climbfuji can you take a look at that?

@mathomp4 mathomp4 closed this Jul 3, 2024
@mathomp4 mathomp4 deleted the add-mepo-package branch July 3, 2024 22:59
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