diff --git a/.github/workflows/compatibility_with_pynxtools_release.yaml b/.github/workflows/compatibility_with_pynxtools_release.yaml index 183e978..d806b34 100644 --- a/.github/workflows/compatibility_with_pynxtools_release.yaml +++ b/.github/workflows/compatibility_with_pynxtools_release.yaml @@ -6,6 +6,9 @@ on: pull_request: branches: [main] +env: + python-version: 3.12 + jobs: pynx_compatibility: runs-on: ubuntu-latest @@ -19,10 +22,10 @@ jobs: with: fetch-depth: 0 submodules: recursive - - name: Install uv and set the python version to 3.12 + - name: Install uv and set the python version to ${{ env.python-version }} uses: astral-sh/setup-uv@v5 with: - python-version: "3.12" + python-version: ${{ env.python-version }} - name: Install pynxtools-mpes run: | uv pip install ".[dev]" diff --git a/.github/workflows/mkdocs-deploy.yml b/.github/workflows/mkdocs-deploy.yml index e235609..636aee5 100644 --- a/.github/workflows/mkdocs-deploy.yml +++ b/.github/workflows/mkdocs-deploy.yml @@ -5,6 +5,9 @@ on: branches: - main # Triggers deployment on push to the main branch +env: + python-version: 3.12 + permissions: contents: write jobs: @@ -20,10 +23,10 @@ jobs: git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com - - name: Install uv and set the python version to 3.12 + - name: Install uv and set the python version to ${{ env.python-version }} uses: astral-sh/setup-uv@v5 with: - python-version: 3.12 + python-version: ${{ env.python-version }} - name: Cache mkdocs-material enviroment uses: actions/cache@v3 diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index e991d09..46c480d 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -2,15 +2,18 @@ name: linting on: [push] +env: + python-version: 3.12 + jobs: linting: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install uv and set the python version to 3.12 + - name: Install uv and set the python version to ${{ env.python-version }} uses: astral-sh/setup-uv@v5 with: - python-version: 3.12 + python-version: ${{ env.python-version }} - name: Install package and dev dependencies run: | curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/src/pynxtools_mpes/nomad/examples/config_file.json b/src/pynxtools_mpes/nomad/examples/config_file.json index f5be650..78dc510 100644 --- a/src/pynxtools_mpes/nomad/examples/config_file.json +++ b/src/pynxtools_mpes/nomad/examples/config_file.json @@ -90,7 +90,7 @@ "extractor_current/@units": "µA", "working_distance": 4.0, "working_distance/@units": "mm", - "LENS_EM[lens_*{A,B,C,D,E,F,G,H,I,UCA,UFA,Foc}]": { + "ELECTROMAGNETIC_LENS[lens_*{A,B,C,D,E,F,G,H,I,UCA,UFA,Foc}]": { "name": "*", "voltage": "@attrs:metadata/file/KTOF:Lens:*:V", "voltage/@units": "V" diff --git a/tests/data/config_file.json b/tests/data/config_file.json index 367b19a..01ddb9d 100644 --- a/tests/data/config_file.json +++ b/tests/data/config_file.json @@ -110,7 +110,7 @@ "extractor_current/@units": "µA", "working_distance": 4.0, "working_distance/@units": "mm", - "LENS_EM[lens_*{A,B,C,D,E,F,G,H,I,UCA,UFA,Foc}]": { + "ELECTROMAGNETIC_LENS[lens_*{A,B,C,D,E,F,G,H,I,UCA,UFA,Foc}]": { "name": "*", "voltage": "@attrs:metadata/file/KTOF:Lens:*:V", "voltage/@units": "V" diff --git a/tests/data/example.nxs b/tests/data/example.nxs index 832731e..b7850d6 100644 Binary files a/tests/data/example.nxs and b/tests/data/example.nxs differ diff --git a/tests/data/example_eln.nxs b/tests/data/example_eln.nxs index f8c7d46..e2435a2 100644 Binary files a/tests/data/example_eln.nxs and b/tests/data/example_eln.nxs differ