From de4a9e9ea59058d6def581ea52e4c090181f1a4b Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Wed, 7 May 2025 10:09:37 +0200 Subject: [PATCH 1/6] remove uv from dev dependencies --- dev-requirements.txt | 2 -- pyproject.toml | 1 - src/pynxtools/definitions | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 682758aa3..8756972b9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -229,8 +229,6 @@ urllib3==2.3.0 # via # requests # types-requests -uv==0.6.13 - # via pynxtools (pyproject.toml) virtualenv==20.30.0 # via pre-commit watchdog==6.0.0 diff --git a/pyproject.toml b/pyproject.toml index 9a446fb5d..9e1389c8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,6 @@ dev = [ "types-pyyaml", "types-pytz", "types-requests", - "uv", "pre-commit", ] convert = [ diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions index c7ee2df46..06c677c6e 160000 --- a/src/pynxtools/definitions +++ b/src/pynxtools/definitions @@ -1 +1 @@ -Subproject commit c7ee2df461f3862e2bebe40a1ff3ff988d4b9dca +Subproject commit 06c677c6e6d3496668a2a0905faadae88a7c59d0 From 772d1b60380a6dcf9e45ff6c0e679d44cee3488d Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Wed, 7 May 2025 10:11:55 +0200 Subject: [PATCH 2/6] update definitions --- src/pynxtools/definitions | 2 +- src/pynxtools/nexus-version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions index 06c677c6e..60eb3449d 160000 --- a/src/pynxtools/definitions +++ b/src/pynxtools/definitions @@ -1 +1 @@ -Subproject commit 06c677c6e6d3496668a2a0905faadae88a7c59d0 +Subproject commit 60eb3449d8aa1025a42ee652c8b85b0b684931ec diff --git a/src/pynxtools/nexus-version.txt b/src/pynxtools/nexus-version.txt index a062d6283..995f26d93 100644 --- a/src/pynxtools/nexus-version.txt +++ b/src/pynxtools/nexus-version.txt @@ -1 +1 @@ -v2024.02-1963-gc7ee2df4 \ No newline at end of file +v2024.02-1974-g60eb3449 \ No newline at end of file From 41cc8c0251cad28a914017b1b3e34497f7f05f8d Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Wed, 7 May 2025 14:11:14 +0200 Subject: [PATCH 3/6] temporarily use different plugin branches --- .github/workflows/plugin_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index 5a8654912..729a85d38 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -24,7 +24,7 @@ jobs: branch: main tests_to_run: tests/. - plugin: pynxtools-ellips - branch: main + branch: update-example-and-ci tests_to_run: tests/. - plugin: pynxtools-em branch: main @@ -36,7 +36,7 @@ jobs: branch: main tests_to_run: tests/. - plugin: pynxtools-raman - branch: main + branch: update-example-and-ci tests_to_run: tests/. - plugin: pynxtools-spm branch: main From 84e7437d9e56b5546334f48fe51b65d2a5d842bf Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Thu, 15 May 2025 15:00:06 +0200 Subject: [PATCH 4/6] update definitions --- src/pynxtools/definitions | 2 +- src/pynxtools/nexus-version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pynxtools/definitions b/src/pynxtools/definitions index 60eb3449d..a14acdde2 160000 --- a/src/pynxtools/definitions +++ b/src/pynxtools/definitions @@ -1 +1 @@ -Subproject commit 60eb3449d8aa1025a42ee652c8b85b0b684931ec +Subproject commit a14acdde2b9880acfc3f967e21ab83f37beadf13 diff --git a/src/pynxtools/nexus-version.txt b/src/pynxtools/nexus-version.txt index 995f26d93..02c850407 100644 --- a/src/pynxtools/nexus-version.txt +++ b/src/pynxtools/nexus-version.txt @@ -1 +1 @@ -v2024.02-1974-g60eb3449 \ No newline at end of file +v2024.02-1983-ga14acdde \ No newline at end of file From 4815b2c3b4ced92350c6516836202113c6f584e7 Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Thu, 15 May 2025 15:02:49 +0200 Subject: [PATCH 5/6] raise lower bounds of pynxtools plugins --- pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9e1389c8e..08bc0ed10 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,7 +73,7 @@ apm = [ "pynxtools-apm>=0.2.3", ] ellips = [ - "pynxtools-ellips>=0.0.8", + "pynxtools-ellips>=0.0.9", ] em = [ "pynxtools-em>=0.3.2", @@ -82,16 +82,16 @@ igor = [ "pynxtools-igor>=0.1.1", ] mpes = [ - "pynxtools-mpes>=0.2.2", + "pynxtools-mpes>=0.2.3", ] raman = [ - "pynxtools-raman>=0.0.9", + "pynxtools-raman>=0.0.10", ] spm = [ - "pynxtools-spm>=0.0.8", + "pynxtools-spm>=0.1.1", ] xps = [ - "pynxtools-xps>=0.5.0", + "pynxtools-xps>=0.5.1", ] xrd = [ "pynxtools-xrd>=0.0.3", From 209e87cdffe63d557ade1eaf8e967a237aa5fa91 Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Thu, 15 May 2025 16:36:34 +0200 Subject: [PATCH 6/6] reuse main branches from plugins --- .github/workflows/plugin_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml index 729a85d38..5a8654912 100644 --- a/.github/workflows/plugin_test.yaml +++ b/.github/workflows/plugin_test.yaml @@ -24,7 +24,7 @@ jobs: branch: main tests_to_run: tests/. - plugin: pynxtools-ellips - branch: update-example-and-ci + branch: main tests_to_run: tests/. - plugin: pynxtools-em branch: main @@ -36,7 +36,7 @@ jobs: branch: main tests_to_run: tests/. - plugin: pynxtools-raman - branch: update-example-and-ci + branch: main tests_to_run: tests/. - plugin: pynxtools-spm branch: main