Skip to content

Merge main into devel after the squashed 0.2.0 release - #92

Merged
max-models merged 3 commits into
develfrom
merge-main-into-devel
Nov 8, 2026
Merged

max-models merged 3 commits into
develfrom
merge-main-into-devel

Conversation

@max-models

@max-models max-models commented Nov 8, 2026 •

Copy link
Copy Markdown
Owner

#74 (Version 0.2.0) was squash-merged into main, so main has a commit that is not in devel's history, and the next devel into main PR would conflict in 15 files. main's tree is identical to devel at a9fc26f (Fix docs build, #75), so devel already contains everything on main: this merge commit keeps devel's tree unchanged (no file differs) and only joins the histories.

Merge it with "Create a merge commit", not squash; the release PR into main after it should be merged the same way.

* Add a include_plotlyjs param to savefig (#69)

* Update README.qmd (#70)

* Update README.qmd

* Update README.md

* Added a matplotlib parser (#71)

* Added a matplotlib parser

* Extende matplotlib parsing coverage

* Extend matplotlib parsing

* formatting

* Fix bugs

* Xarray support (#72)

* Added xarray support

* small edits like adding titles and so on

* Added da.xarray accessor

* Added xarray to docs + bugfixes

* formatting

* Preparation for tikz support in plasma-plots (#73)

* Preparation for tikz support in plasma-plots

* Fix tests

* Fix tests

* Another fix

* Fix docs build (#75)
@max-models max-models mentioned this pull request Nov 8, 2026
@max-models
max-models merged commit f426d35 into devel Nov 8, 2026
32 checks passed
@max-models max-models mentioned this pull request Nov 8, 2026
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.

1 participant