From f14b597e2d34200d419994be5dfea51c956ab892 Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 10 Sep 2024 16:50:24 -0400 Subject: [PATCH 1/3] Iterating through bumps MultiFitProblem.models now returns the Fitness object. Update to match the new functionality --- src/sas/sascalc/fit/BumpsFitting.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sas/sascalc/fit/BumpsFitting.py b/src/sas/sascalc/fit/BumpsFitting.py index 77f6b2f63d..985cff3f15 100644 --- a/src/sas/sascalc/fit/BumpsFitting.py +++ b/src/sas/sascalc/fit/BumpsFitting.py @@ -316,8 +316,7 @@ def fit(self, msg_q=None, # Check if uncertainty is missing for any parameter uncertainty_warning = False - for fitting_module in problem.models: - fitness = fitting_module.fitness + for fitness in problem.models: pars = fitness.fitted_pars + fitness.computed_pars par_names = fitness.fitted_par_names + fitness.computed_par_names From 824d7824ebb171b50be37cd010f96009d3b1e3f9 Mon Sep 17 00:00:00 2001 From: krzywon Date: Wed, 11 Sep 2024 10:35:35 -0400 Subject: [PATCH 2/3] Remove all calls to setup.py to help future-proof the build process --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b55a1ae6b..e90d8f9fc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,8 +119,6 @@ jobs: cd ../sasdata rm -rf build rm -rf dist - python setup.py clean - python setup.py build mv build/lib/sasdata/example_data/* ../sasview/src/sas/example_data/ python -m pip install --no-deps . @@ -129,8 +127,6 @@ jobs: cd ../sasmodels rm -rf build rm -rf dist - python setup.py clean - python setup.py build python -m pip install --no-deps . - name: Build and install bumps @@ -138,8 +134,6 @@ jobs: cd ../bumps rm -rf build rm -rf dist - python setup.py clean - python setup.py build python -m pip install --no-deps . ### Document the build environment @@ -156,8 +150,6 @@ jobs: githash=$( git rev-parse HEAD ) sed -i.bak s/GIT_COMMIT/$githash/g src/sas/sasview/__init__.py # BUILD SASVIEW - python setup.py clean - python setup.py build python -m pip install --no-deps . ### Run tests (if enabled) From f95ee9a47cde41053921835286ecc238693590df Mon Sep 17 00:00:00 2001 From: krzywon Date: Wed, 11 Sep 2024 10:46:33 -0400 Subject: [PATCH 3/3] Move example data from base sasdata package instead of built package --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e90d8f9fc8..b961885ede 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,7 +119,7 @@ jobs: cd ../sasdata rm -rf build rm -rf dist - mv build/lib/sasdata/example_data/* ../sasview/src/sas/example_data/ + mv sasdata/example_data/* ../sasview/src/sas/example_data/ python -m pip install --no-deps . - name: Build and install sasmodels