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

Copy changes from boututils/boutdata #2101

Merged
merged 3 commits into from
Sep 23, 2020
Merged

Copy changes from boututils/boutdata #2101

merged 3 commits into from
Sep 23, 2020

Conversation

dschwoerer
Copy link
Contributor

boutdata/data.py not merged, as there are too many conflicts

boutdata/data.py not merged, as there are too many conflicts
ZedThree
ZedThree previously approved these changes Sep 22, 2020
@johnomotani
Copy link
Contributor

I can add the data.py changes to this. I merged them in the boutdata PR.

PS nudge for replacing tools/pylib/boutdata and tools/pylib/boututils with submodules to avoid these cross-merges.

Need to use __contains__() method of CaseInsensitiveDict from _keys and
_sections instead of list returned by .keys().
@ZedThree
Copy link
Member

Yes submodules is a good idea. I should have another attempt at using xBOUT, as I'd prefer we just used that if we can.

@ZedThree ZedThree merged commit 7c76976 into next Sep 23, 2020
@ZedThree ZedThree deleted the pylib_merge branch September 23, 2020 15:24
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.

None yet

3 participants