Skip to content

Sync upstream/nanobeam with upstream/dev so that @ehrhardtkm can push PDF#178

Merged
bobleesj merged 58 commits intonanobeamfrom
nanobeam-bob-pr-cleanup
Feb 20, 2026
Merged

Sync upstream/nanobeam with upstream/dev so that @ehrhardtkm can push PDF#178
bobleesj merged 58 commits intonanobeamfrom
nanobeam-bob-pr-cleanup

Conversation

@bobleesj
Copy link
Collaborator

What problem it solves

upstream/nanobeam is a decade old (a few months old) and contains merge conflicts with upstream/dev.

Now, @ehrhardtkm made commits on top of the upstream/nanobeam. Hence, the PR contains meaningless commits: #177

What this PR does

Sync upstream/nanobeam with upstream/dev so that @ehrhardtkm's PR only shows relevant commits pertained to PDF physics, while maintaining @cophus early prototype commits in upstream/nanobeam.

arthurmccray and others added 30 commits December 2, 2025 15:31
- Add docstring with examples to from_array()
- Add docstring with examples to from_shape()
- Use "Frame N" as default title (appropriate for time series/tomography)
- Add suptitle parameter with proper layout adjustment
bobleesj and others added 25 commits January 23, 2026 07:55
Removing streaming parallax implementation before release
`Dataset3d` support `show()` for image grid with sensible defaults.
adding workflow to regenerate lock on PR into main
headless matplotlib backend for windows tests
Fix type hints for modify_in_place overloads in Dataset
@bobleesj
Copy link
Collaborator Author

Since we are just syncing upstream/nanobeam pulling from upstream/dev w/o any side effects globally. I will self-review and merge it. @gvarnavi

@bobleesj bobleesj merged commit e358103 into nanobeam Feb 20, 2026
@bobleesj bobleesj deleted the nanobeam-bob-pr-cleanup branch February 20, 2026 04:56
@bobleesj
Copy link
Collaborator Author

@ehrhardtkm

It's now cleaned-up, showing your and @cophus commits only in #177:

Screenshot 2026-02-19 at 8 58 41 PM

Now, naturally, some files were modified in both places (from upstream/dev and your branch) and GitHub is confused (hence merge conflicts). let's chat tmr in-person how to resolve this effectively.

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.

6 participants