Skip to content

Release: merge develop into master#115

Merged
AndrewSazonov merged 10 commits intomasterfrom
develop
Mar 5, 2026
Merged

Release: merge develop into master#115
AndrewSazonov merged 10 commits intomasterfrom
develop

Conversation

@easyscience
Copy link
Copy Markdown

@easyscience easyscience Bot commented Mar 5, 2026

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 10 commits January 29, 2026 09:15
* initial experiment.py, with pixi fix

* Add example data, fix some tests

* Update .toml

* add some tests

* Update docs

* Update docs/docs/tutorials/index.md

Co-authored-by: Andrew Sazonov <AndrewSazonov@users.noreply.github.com>

* respond to PR comments

* update notebooks

* reset notebooks

---------

Co-authored-by: Andrew Sazonov <AndrewSazonov@users.noreply.github.com>
* initial instrument model

* first draft of analysis

* add test of model base

* small changes

* tests

* clear notebook

* respond to PR comments

* Update resolution_model docstring for clarity
* jump diffusion model

* fix notebook

* fix weakref?

* fix weakref?

* fix weakref???

* ...

* weakref...

* claude fixed it?

* respond to PR comments

* Move scale test to base model and add some formatting

* fix typo

* small fix
* Update pixi.lock

* Reapply templates from v0.4.0

* pixi run fix-all

* Switch to manual pre-commit and simplify tasks

* Enable PyPI Trusted Publishing via OIDC

* Reorder imports and widget magic in notebooks

* Normalize notebook cell IDs
* initial analysis class

* make analysis_base

* test things in notebook

* reintroduce energy_offset in convolution. It's needed.

* Progress on Analysis

* multiple parameters with same unique_name?????

* fitting and plotting for multiple Q

* analysis MWP

* Add plotting of parameters and examples

* Update failing tests

* Instrument model (#94)

* initial instrument model

* first draft of analysis

* add test of model base

* small changes

* tests

* clear notebook

* respond to PR comments

* Update resolution_model docstring for clarity

* initial analysis class

* fix merge conflict

* Remove notebook

* Update notebook, remove unused file

* pixi run fix

* add missing tests

* More missing tests

* test analysis_base

* 100% coverage of base

* Test analysis1d

* Another test

* More analysis1d tests

* linting

* update component_collection among other things

* Add a few more tests

* fix failing test

* Update analyis example

* analysis tests

* Minor fixes and tests

* one more test

* more tests

* Update docstrings for AnalysisBase

* pixi run fix

* pixi run fix

* more docstring for analysis1d

* finish analysis1d docstring

* react to PR comments

* Update analysis.py docstrings

* Handle changes to experiment etc in analysis

* fix updaters

* More tests and response to PR comments

* minor PR comments

* fix test
* Update docstrings of ModelComponent

* Update DHO and delta function docstring

* More docstrings

* gaussian docstring

* Update ModelComponent docstrings and add a few tests

* Update detailed balance

* add DHO test

* Change test to use the weakref fix fixture

* Try to fix equations in docs

* Update doc strings to have proper equations

* fix DHO

* respond the PR comments
* initial analysis class

* make analysis_base

* test things in notebook

* reintroduce energy_offset in convolution. It's needed.

* Progress on Analysis

* multiple parameters with same unique_name?????

* fitting and plotting for multiple Q

* analysis MWP

* Add plotting of parameters and examples

* Update failing tests

* Instrument model (#94)

* initial instrument model

* first draft of analysis

* add test of model base

* small changes

* tests

* clear notebook

* respond to PR comments

* Update resolution_model docstring for clarity

* initial analysis class

* fix merge conflict

* Remove notebook

* Update notebook, remove unused file

* pixi run fix

* add missing tests

* More missing tests

* test analysis_base

* 100% coverage of base

* Test analysis1d

* Another test

* More analysis1d tests

* linting

* update component_collection among other things

* Add a few more tests

* fix failing test

* Update analyis example

* analysis tests

* Minor fixes and tests

* one more test

* more tests

* Update docstrings for AnalysisBase

* pixi run fix

* pixi run fix

* more docstring for analysis1d

* finish analysis1d docstring

* react to PR comments

* Update analysis.py docstrings

* Handle changes to experiment etc in analysis

* fix updaters

* More tests and response to PR comments

* More docstrings

* fix merge conflicts properly

* make math render properly

* minor update

* minor update

* update conftest

* Delete conftest content since weakref bug has been fixed
* Update convolution

* Fix most docstrings

* pixi formatting

* change gaussian a bit

* Update analysis docstrings

* docstrings for convolution

* docstrings for experiment

* Update sample models

* Update diffusion models

* Updatae components

* Update utils

* linting

* more linting
* Update pixi lock

* Apply new templates

* Switch easyscience dep to PyPI

* Apply linting and formatting

* Add spdx-headers package

* Update SPDX headers

* Apply new templates

* Switch easyscience to develop

* Apply updated templates

* Fix docstring formatting

* Fix API docs links; add analysis to nav

* Add instrument model and analysis tutorials

* Add experiment API reference page

* Switch easyscience to PyPI dependency

* Apply templates 0.10.0. Fix spdx headers

* Apply formatting
@easyscience easyscience Bot added the [bot] release Automated release PR. Excluded from changelog/versioning label Mar 5, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 5, 2026

Codecov Report

❌ Patch coverage is 97.04082% with 29 lines in your changes missing coverage. Please review.
✅ Project coverage is 97.68%. Comparing base (7263881) to head (12c957c).
⚠️ Report is 12 commits behind head on master.

Files with missing lines Patch % Lines
src/easydynamics/analysis/analysis.py 93.63% 5 Missing and 5 partials ⚠️
.../easydynamics/sample_model/component_collection.py 79.59% 9 Missing and 1 partial ⚠️
src/easydynamics/analysis/analysis_base.py 96.46% 2 Missing and 2 partials ⚠️
src/easydynamics/experiment/experiment.py 96.94% 2 Missing and 2 partials ⚠️
src/easydynamics/analysis/analysis1d.py 99.28% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #115      +/-   ##
==========================================
+ Coverage   97.66%   97.68%   +0.01%     
==========================================
  Files          28       36       +8     
  Lines        1458     2328     +870     
  Branches      237      388     +151     
==========================================
+ Hits         1424     2274     +850     
- Misses         19       33      +14     
- Partials       15       21       +6     
Flag Coverage Δ
integration 0.00% <0.00%> (ø)
unittests 97.68% <97.04%> (+0.01%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@AndrewSazonov AndrewSazonov merged commit a7c5212 into master Mar 5, 2026
43 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.

2 participants