From d29c1cbf4e637077af52bd38da3738f5d6415711 Mon Sep 17 00:00:00 2001 From: rettigl Date: Fri, 23 May 2025 21:21:11 +0200 Subject: [PATCH 1/3] update pynxtools --- pyproject.toml | 2 +- tests/test_processor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 390ae825..0ee559df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ dependencies = [ "photutils<2.0", "psutil>=5.9.0", "pynxtools-mpes>=0.2.2", - "pynxtools>=0.10.6", + "pynxtools>=0.10.7", "pyyaml>=6.0.0", "scipy>=1.8.0", "symmetrize>=0.5.5", diff --git a/tests/test_processor.py b/tests/test_processor.py index cb3b50f5..3fbc4924 100644 --- a/tests/test_processor.py +++ b/tests/test_processor.py @@ -1236,7 +1236,7 @@ def test_save(caplog) -> None: ) assert ( caplog.messages[0] - == "WARNING: The data entry corresponding to /ENTRY[entry]/SAMPLE[sample]/name is " + == "ERROR: The data entry corresponding to /ENTRY[entry]/SAMPLE[sample]/name is " "required and hasn't been supplied by the reader." ) assert ( From dc5decd38de26e783c5d9ad0c4ee9d9a870d59d1 Mon Sep 17 00:00:00 2001 From: rettigl Date: Fri, 23 May 2025 21:22:44 +0200 Subject: [PATCH 2/3] remove python 3.13 from matrix test until numpy2 can be used --- .github/workflows/testing_multiversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing_multiversion.yml b/.github/workflows/testing_multiversion.yml index a095bf1d..7a9daab0 100644 --- a/.github/workflows/testing_multiversion.yml +++ b/.github/workflows/testing_multiversion.yml @@ -17,7 +17,7 @@ jobs: # Using matrix strategy strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: # Check out repo and set up Python From f2a0fb33448b888287e5439be6a11e7f2c1af1e1 Mon Sep 17 00:00:00 2001 From: rettigl Date: Mon, 14 Jul 2025 10:14:16 +0200 Subject: [PATCH 3/3] fix units and tests --- src/sed/config/flash_example_config.yaml | 4 ++-- src/sed/config/mpes_example_config.yaml | 4 ++-- tests/test_processor.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sed/config/flash_example_config.yaml b/src/sed/config/flash_example_config.yaml index b34becdd..9fa598c1 100644 --- a/src/sed/config/flash_example_config.yaml +++ b/src/sed/config/flash_example_config.yaml @@ -93,8 +93,8 @@ dataframe: timeStamp: 's' energy: 'eV' E: 'eV' - kx: '1/A' - ky: '1/A' + kx: '1/angstrom' + ky: '1/angstrom' # The channels to load from the raw data. The channels have the following structure: # channels have the following structure: diff --git a/src/sed/config/mpes_example_config.yaml b/src/sed/config/mpes_example_config.yaml index 43e7db5f..330086b5 100644 --- a/src/sed/config/mpes_example_config.yaml +++ b/src/sed/config/mpes_example_config.yaml @@ -56,8 +56,8 @@ dataframe: timeStamp: 's' energy: 'eV' E: 'eV' - kx: '1/A' - ky: '1/A' + kx: '1/angstrom' + ky: '1/angstrom' # dataframe channels and group names to read from the h5 files channels: diff --git a/tests/test_processor.py b/tests/test_processor.py index 3fbc4924..cb3b50f5 100644 --- a/tests/test_processor.py +++ b/tests/test_processor.py @@ -1236,7 +1236,7 @@ def test_save(caplog) -> None: ) assert ( caplog.messages[0] - == "ERROR: The data entry corresponding to /ENTRY[entry]/SAMPLE[sample]/name is " + == "WARNING: The data entry corresponding to /ENTRY[entry]/SAMPLE[sample]/name is " "required and hasn't been supplied by the reader." ) assert (