Merge boututils into boutdata
#67
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NOTE: The files are in synch with boutproject/BOUT-dev@50e3b46
`mayavi` is not required for all the `boututils` to work, so make it an 'extra' requirement.
0.1.2 -> 0.1.3
Make mayavi an optional dependency
6 build failing
Updated website info
Co-authored-by: Michael Løiten <michael.l.magnussen@gmail.com>
Support FieldPerp in DataFile
This closes #9
Ensure to always write int32
Add basic xarray support
Fix bug in computation of derivative with DFT
- Use ruff instead of flake8 - Auto-apply black and isort on commits to master - Bump CI action versions - Drop support for Python 3.7 - Test on Python 3.8, 3.11 - Don't run cron jobs Fixes #39
Closes #29
Use PyPA's new "Trusted Publisher" thing: https://docs.pypi.org/trusted-publishers/ Fixes #49
We now only support Python 3.8+
Modernise packaging and CI
BOUT++ 4.3.0 was released a while ago xBOUT depends on this, so I doubt it is going to replace it anytime soon. Whether it will ever happen is a different story ...
|
I was just about to make an issue about possibly merging these two repos when I found this PR again. Any objections to me reviving this and pressing ahead? |
Update README.md
Do not compare types, use `isinstance()`
* master: (59 commits) restart.resize: Disable multiprocessing if maxProc=1 Allow simplified user access via python -m Apply black changes Fix creating restart files for BOUT++ 5 restart.create: Remove empty except restart.create: Ensure that hist_hi is a scalar restart.resize: nz doesn't need to be a power of 2 Remove unneeded setup.py CI: Fix publish workflow Remove cron job Apply black changes Apply black changes set _file0 early to avoid error in destructor prefer removeprefix Bump required python to 3.9 prefer removesuffix Run black prefer to not explicitly check for None requirements.txt is not used CI: Test against py 3.11 ...
* utils/master: (21 commits) black Do not compare types, use `isinstance()` Update README.md Remove imports from `builtin` Replace most common uses of string concatenation with f-strings Apply black Remove fallback backport of importlib.metadata CI: Update publishing workflow Fix bare `except` Refactor CI Move to pyproject.toml package config black format Auto update pre-commit-config CI: Update flake8 to github repo Add basic xarray support Ensure to always write int32 Fix bug in computation of derivative with DFT Do ignore file we shouldn't track Move the definition of all bout_types of BoutArray to BoutArray Update requirements.txt ...
ZedThree
force-pushed
the
merge-boututils
branch
from
cfdf96b to
3d737da
Compare
|
Remembered about this PR again. Updated to both package's I think the separation between the two packages is mostly artificial at this point, and there's a lot of cruft in |
|
I'm going to use admin privileges to merge this and tidy things up a bit in another PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Keeps history from the standalone repo. Also imports the most commonly used bits of
boututilsintoboutdataat the top level.I haven't made any attempt at cleaning up the repo. Do we want to try and keep the history of boututils from the main BOUT++ repo?