Skip to content

🎉 Release: merge develop into master - #236

Merged
henrikjacobsenfys merged 3 commits into
masterfrom
develop
Aug 11, 2026
Merged

🎉 Release: merge develop into master#236
henrikjacobsenfys merged 3 commits into
masterfrom
develop

Conversation

@easyscience

@easyscience easyscience Bot commented Aug 11, 2026

Copy link
Copy Markdown

This PR is created automatically to trigger the release pipeline. It merges the accumulated changes from develop into master.

⚠️ It is labeled [bot] release and is excluded from release notes and version bump logic.

easyscience[bot] and others added 3 commits August 10, 2026 09:52
* Fix units of model_base

* pixi update and pixi run fix and revert contributing.md change

* Propagate units through unit-unaware collection and model-array construction

- ModelBase._convert_axis_unit: convert the template collection as a whole so
  its own unit attribute updates; regenerated per-Q collections then carry the
  converted unit instead of the stale default.
- Analysis1d._to_scipp_array / Analysis._create_model_array: stamp the sample
  model y_unit on model arrays. Previously they were always dimensionless, so
  residuals and plots failed with a UnitError whenever the data had a real
  unit (e.g. counts), regardless of the models units.
- Analysis1d._build_convolution: pass the sample model units to Convolution.
- Convolution plan and ModelComponent wrapping: internal ComponentCollections
  now inherit units instead of silently defaulting to meV/dimensionless.

Add regression tests for all of the above.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
sc.bin cannot handle multi-dimensional dense data with bin-edge
coordinates, so convert them to bin centers before binning.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@easyscience easyscience Bot added the [bot] release Automated release PR. Excluded from changelog/versioning label Aug 11, 2026
@codecov

codecov Bot commented Aug 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.01%. Comparing base (c6b25f8) to head (19f68ab).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #236      +/-   ##
==========================================
+ Coverage   98.99%   99.01%   +0.02%     
==========================================
  Files          53       53              
  Lines        4060     4060              
  Branches      706      706              
==========================================
+ Hits         4019     4020       +1     
  Misses         19       19              
+ Partials       22       21       -1     
Flag Coverage Δ
unittests 99.01% <100.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
src/easydynamics/analysis/analysis.py 96.41% <100.00%> (ø)
src/easydynamics/analysis/analysis1d.py 99.09% <ø> (+0.45%) ⬆️
src/easydynamics/base_classes/easydynamics_list.py 100.00% <ø> (ø)
src/easydynamics/convolution/convolution.py 100.00% <100.00%> (ø)
src/easydynamics/convolution/convolution_base.py 100.00% <100.00%> (ø)
...dynamics/convolution/numerical_convolution_base.py 97.56% <100.00%> (ø)
src/easydynamics/experiment/experiment.py 98.88% <100.00%> (ø)
...cs/sample_model/components/expression_component.py 99.15% <100.00%> (ø)
...mics/sample_model/diffusion_model/delta_lorentz.py 97.73% <100.00%> (ø)
...mple_model/diffusion_model/diffusion_model_base.py 100.00% <ø> (ø)
... and 2 more
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@henrikjacobsenfys
henrikjacobsenfys merged commit 21da832 into master Aug 11, 2026
45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[bot] release Automated release PR. Excluded from changelog/versioning

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant