Skip to content

hotfix 1.9.1 - #444

Open
rozyczko wants to merge 56 commits into
masterfrom
develop
Open

rozyczko wants to merge 56 commits into
masterfrom
develop

Conversation

@rozyczko

Copy link
Copy Markdown
Member
  • Updated the GitHub Actions workflow (.github/workflows/pypi-test.yml) to explicitly require macOS 14 in the pixi.toml file during CI setup. The correct pre-built wheels (such as for scipp) are now being used, avoiding source build failures on newer macOS runners.

Development Dependencies:

  • Added jupyterlab to the dev dependencies in pyproject.toml to provide a full-featured Jupyter notebook environment for development.

rozyczko and others added 30 commits March 23, 2026 11:18
* assure refl1d actually runs from the GUI

* don't fail on codecov upload
* initial implementation

* set `disable` status on relevant sub/super-phase parameters

* fixed tests

* fixes after CR

* fixed tests
* initial implementation of the mighell algorithm for data with zero variances

* don't fail on codecov upload

* fixed chi2 reporting, added MD file with description

* unit test update

* added docs about Mighell

* updated easyscience branch, deleted script

* chi -> chi2

* use develop for core
* backmerge after 1.6.0 release
* initial commit up to and including `pixi run check` step

* fixes

* updates to pyproject.toml

* remade __init__.py

* minor fix

* a few more fixes

* Apply templates with docstrings fixes

* Add missing favicon and update SVG assets

* moved docs for mkdocs

* make "pixi run mkdocs build" and "pixi run nonpy-format-check" work
together

* try using absolute paths for the wheel

* minor fixes

* refactor md file headers for docs

* minor CR changes

* linting

* code review fixes

* CR fixes

* proper globbing

* remove __version__

---------

Co-authored-by: Andrew Sazonov <andrew.sazonov@icloud.com>
* initial commit

* PR review

* more tests
* initial commit with examples

* ruff format

* refactor core modifications to live in reflectometry lib only

* modified the notebook a bit

* refactored MCMC sampling to easyscience module

* added pass-through for cancellation and total number of calculations

* silly typo

* yet another linting

* moved the notebook to the correct location and fixed the formatting

* added more initial arguments to sample. Added unit tests

* prettify charts. Updated notebook

* fixed issue with the notebook

* move file fetch to reflectometry/data

* PR review fixes

* be careful with small chains

* ruff

* try to use explicit dtype for Ubuntu

* another attempt at fixing failing test

* better corner and distribution plots

* updates to the Bayesian API after changes to core

* use bayesian_extend

* minor fixes

* fix failing test

* test against develop, so we can merge the PR

* use mcmc_sample

* fixed tests

* minor notebook fix
* initial commit with examples

* ruff format

* refactor core modifications to live in reflectometry lib only

* modified the notebook a bit

* refactored MCMC sampling to easyscience module

* added pass-through for cancellation and total number of calculations

* silly typo

* yet another linting

* moved the notebook to the correct location and fixed the formatting

* added more initial arguments to sample. Added unit tests

* prettify charts. Updated notebook

* fixed issue with the notebook

* move file fetch to reflectometry/data

* PR review fixes

* be careful with small chains

* ruff

* try to use explicit dtype for Ubuntu

* another attempt at fixing failing test

* better corner and distribution plots

* updated poitwise logic/notebook
* addressing #381

* minor docstring update
* moved to Sampler class from Core

* reparent branch

* fixed issue #367 (#382)

* fixed issue #367

* disable automatic parallelization for windows

* Changes after code review

* added test

* arviz fix

* try to fix prettier issues

* updated notebook

* linting

* fixing #370 (#388)

* reparent to develop

* Core fixes pointwise (#387)

* fixed pointwise treatment on file load

* more tests
* try to fix failing test

* another attempt
* initial version

* added magnetic SLD profile

* added magnetic parameters

* code review comments addressed

* code review fixes for Phase 2, added notebook

* PR code review comments

* fixed polarized file load issue

* enable magnetic layers

* new LayerMagnetism component

* ruff

* ruff on notebooks

* bind calculator to model for performance

* attempt at fixing package testing

* package tests only on master

* don't run ruff twice

* code review fixes

* added polarized fitting example/notebook

* fixed default sample generation

* improved wording in the magnetic fitting notebook

* move the most expensive test to integration
* initial version

* added magnetic SLD profile

* added magnetic parameters

* ruff

* code review comments addressed

* code review fixes for Phase 2, added notebook

* ruff

* PR code review comments

* fixed polarized file load issue

* enable magnetic layers

* new LayerMagnetism component

* ruff

* ruff on notebooks

* bind calculator to model for performance

* attempt at fixing package testing

* package tests only on master

* don't run ruff twice

* code review fixes

* added polarized fitting example/notebook

* fixed default sample generation

* improved wording in the magnetic fitting notebook

* move the most expensive test to integration

* Improved constraints (#395)

* improved handling of constraints

* ruff

* wording

* additional cell in a notebook to showcase the new way of doing
constraints

* fixed notebook

* initial checkin

* .bounds -> min, max

* updates so the code is self-contained and doesn't depend on changes to
core

* Code review comments addressed

* Updated docs (#398)

* move everything to MKDocs
minor updates/fixes after code review

* ruff fix for notebook

* Fix broken conflict resolutions from develop merge

The merge of develop (2042778) left two files with damaged conflict
resolutions: magnetism.ipynb gained a corrupt hybrid cell (invalid
notebook JSON, duplicate cell id) and project.py gained a duplicated
copy of the spin-asymmetry method block with an orphaned method body.
Both files are restored to the branch-side version, which already
contained everything develop had for them.

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

* code review issues addressed

* removed explicit EasyCore constraints factory reliance

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
* initial commit

* code review fixes

* more unit tests for orso functionality
* enable SLD dependence on material data

* extending methods for use in ERA

* code review issues addressed

* ruff

* make molecular weight a descriptor
* Improvements to the state tracking #401

* PR issues addressed

* minor ruff NOQA

* reparent to develop of core and fixed the functionality
rozyczko and others added 25 commits September 14, 2026 09:35
* Removed DataStore

* ruff on CHANGELOG

* ruff
* fix the multi-column load #376
Resolved entirely in favour of develop ('ours' strategy). Master's only
unique content is the legacy Sphinx docs tree and the bornagain calculator,
both deliberately removed on develop; every feature from master (Mighell
transform, release prep) is already present here.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
* correct units for scattering lengths #377

* improved help and tests
* minor fixes required for the updated GUI

* PR review fixes #1

* PR review fixes
* Added volume fraction profile calculation and display. #281

* fixed CHANGELOG
* variable resolution fitting, initial commit

* PR review fixes
* fixed unique_name reuse for uncollected models #426

* added missing test
* added fit configuration owner #427

* PR review fixes
* Multiple contrasts implementation improved. #425 issue #2

* PR review fixes

* another round of reviews

* added docs and notebook for multiple contrasts

* added multiple contrast docs and notebook

* fixed docs
* Variable resolution fitting fixes from #425 p.3

* code review fixes
* updated README.md

* slight modifications of README
* implemented fixes to the magnetism feature. #425, point 3.

* code review fixes
Back-merge of the v1.8.0 squash commit (identical tree to e7e3693) so that
develop can be merged into master without conflicts.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
* Require macOS 14 in the PyPI package test project

The PyPI test workflow creates a fresh pixi project, which assumes macOS
13.0 on osx-arm64. scipp only ships macosx_14_0 wheels, so pixi fell back
to the sdist, and scipp 26.9.0 fails to compile against a 13.0 target
('to_chars' is unavailable: introduced in macOS 13.3). Match the macOS
minimum already set in the repository's pixi.toml.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Add jupyterlab to the dev extras

pixi.toml already installs it from conda; listing it in the dev extra
makes it part of pip install 'easyreflectometry[dev]' too.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@rozyczko rozyczko added [scope] bug Bug report or fix (major.minor.PATCH) bugfix Fix to known bug [priority] highest Urgent. Needs attention ASAP labels Oct 20, 2026
@codecov

codecov Bot commented Oct 20, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.69%. Comparing base (41c1c5f) to head (9b5cb2b).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #444      +/-   ##
==========================================
+ Coverage   87.49%   95.69%   +8.20%     
==========================================
  Files          46       60      +14     
  Lines        2790     7294    +4504     
  Branches      339        0     -339     
==========================================
+ Hits         2441     6980    +4539     
- Misses        263      314      +51     
+ Partials       86        0      -86     
Flag Coverage Δ
integration 38.93% <ø> (?)
unittests 95.69% <ø> (+8.20%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 43 files with indirect coverage changes

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

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix Fix to known bug [priority] highest Urgent. Needs attention ASAP [scope] bug Bug report or fix (major.minor.PATCH)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant