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

Some recent maintenance fixes back into next from master #2812

Closed
wants to merge 6 commits into from
Closed

Conversation

ZedThree
Copy link
Member

No description provided.

dschwoerer and others added 6 commits October 18, 2023 12:04
master branch will be 5.1.1 not 5.2.0
- Don't pin pip and setuptools versions
- Bump netcdf4 and Cython
- Install boututils and boutdata
CI: Replace pip script with requirements.txt
Set oversubscribe flags for openmpi 5
@dschwoerer
Copy link
Contributor

Please do not merge.
05f25ba must not go in / must be reverted.

Should I rebase without that one, or do you prefer a revert commit? Revert would simplify future merges ...

@ZedThree
Copy link
Member Author

Probably easier to do that in a new branch, rather than merge master straight into next then

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