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

Replace zoidberg code with submodule #2214

Closed
wants to merge 3 commits into from
Closed

Conversation

johnomotani
Copy link
Contributor

@johnomotani johnomotani commented Jan 18, 2021

zoidberg now exists in the repo https://github.com/boutproject/zoidberg . Import this as a submodule instead of having zoidberg code in BOUT-dev.

I assume the code in the repo is the same as or more up to date than the current zoidberg code in next - it's hard to check quickly because the repo seems to have had black run on it, so there were lots of whitespace/newline changes.

zoidberg now exists in the repo github.com/boutproject/zoidberg. Import
this as a submodule instead of having zoidberg code in BOUT-dev.
@johnomotani
Copy link
Contributor Author

PS not sure if the symlink in tools/pylib is necessary for zoidberg. It was useful for boutdata/boututils to avoid changing the config and people's existing environments. I've included it here in case it is, but if you'd rather import directly from externalpackages/zoidberg/zoidberg then we could remove it?

@ZedThree
Copy link
Member

Ah, I think it needs to wait till 3D metrics goes in -- there's a PR over there with at least some of the changes from that branch.

@johnomotani johnomotani marked this pull request as draft January 18, 2021 15:22
@johnomotani
Copy link
Contributor Author

Whenever it's time to go, just need to go into externalpackages/zoidberg/, do a git pull to update the master branch and commit the change.

@dschwoerer
Copy link
Contributor

https://pypi.org/project/zoidberg/ is available (again) 🎉

@ZedThree
Copy link
Member

There's some conflicts in boutproject/zoidberg#2 that need fixing before this can be updated.

I also struggled to merge next into this branch manually, hopefully Github will have better luck

@dschwoerer dschwoerer self-assigned this Dec 6, 2021
@dschwoerer dschwoerer marked this pull request as ready for review December 8, 2021 16:10
@dschwoerer dschwoerer mentioned this pull request Feb 23, 2022
@dschwoerer
Copy link
Contributor

Replaced by #2505

@dschwoerer dschwoerer closed this Feb 25, 2022
@dschwoerer dschwoerer deleted the zoidberg-submodule branch February 24, 2023 07:56
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.

3 participants