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

ENH: loosen header matching for Athena vtk files to allow compatibility with single variable 'vtk outputs' #3490

Merged
merged 1 commit into from
Aug 30, 2021

Conversation

neutrinoceros
Copy link
Member

PR Summary

this is a hotfix to #3424 that was merged slighlty before I could integrate this change required by @jzuhone

@neutrinoceros neutrinoceros added bug code frontends Things related to specific frontends labels Aug 29, 2021
@jzuhone
Copy link
Contributor

jzuhone commented Aug 30, 2021

I assume that the answer test failures are unrelated?

@neutrinoceros
Copy link
Member Author

Yes, they are the exact same that we've been seeing on daily runs for a couple days. See for instance today's logs https://tests.yt-project.org/job/yt_py38_latest_deps/346/

@jzuhone jzuhone merged commit 49dac7e into yt-project:main Aug 30, 2021
@neutrinoceros neutrinoceros deleted the validate_athena_single_var branch August 30, 2021 14:34
@neutrinoceros neutrinoceros mentioned this pull request Oct 12, 2021
42 tasks
@matthewturk
Copy link
Member

@meeseeksdev backport to yt-4.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 15, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout yt-4.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 49dac7e42d29b79d7747ed9741ce3aa616855be6
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #3490: ENH: loosen header matching for Athena vtk files to allow compatibility with single variable 'vtk outputs'"
  1. Push to a named branch :
git push YOURFORK yt-4.0.x:auto-backport-of-pr-3490-on-yt-4.0.x
  1. Create a PR against branch yt-4.0.x, I would have named this PR:

"Backport PR #3490 on branch yt-4.0.x (ENH: loosen header matching for Athena vtk files to allow compatibility with single variable 'vtk outputs')"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove Still Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free to suggest an improvement.

@neutrinoceros
Copy link
Member Author

@meeseeksdev backport to yt-4.0.x

meeseeksmachine pushed a commit to meeseeksmachine/yt that referenced this pull request Oct 16, 2021
…tk files to allow compatibility with single variable 'vtk outputs'
neutrinoceros added a commit that referenced this pull request Nov 1, 2021
…0-on-yt-4.0.x

Backport PR #3490 on branch yt-4.0.x (ENH: loosen header matching for Athena vtk files to allow compatibility with single variable 'vtk outputs')
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug code frontends Things related to specific frontends
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants