Merge branch 'master' into 'master'

Master

See merge request !14
4 jobs for 1.0.6 in 5 minutes and 8 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Style
failed flake8 #30756
allowed to fail

00:00:13

 
  Test
passed pytest #30759

00:04:23

failed pytest #30757

00:04:52

 
  Fsl Ci Deploy
passed update-conda-recipe #30758
docker

00:00:30

 
Name Stage Failure
failed
flake8 Style
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:32:27: E226 missing whitespace around arithmetic operator
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:32:30: E226 missing whitespace around arithmetic operator
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:32:32: E226 missing whitespace around arithmetic operator
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:35:1: E302 expected 2 blank lines, found 1
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:35:16: E231 missing whitespace after ','
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:37:16: E226 missing whitespace around arithmetic operator
fsl_mrs/tests/testdata/dynamic/fmrs_sin_model.py:37:21: E226 missing whitespace around arithmetic operator
Cleaning up file based variables
ERROR: Job failed: exit code 1