Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/compatibility_with_pynxtools_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
pull_request:
branches: [main]

env:
python-version: 3.12

jobs:
pynx_compatibility:
runs-on: ubuntu-latest
Expand All @@ -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]"
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/mkdocs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches:
- main # Triggers deployment on push to the main branch

env:
python-version: 3.12

permissions:
contents: write
jobs:
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/pynxtools_mpes/nomad/examples/config_file.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/data/config_file.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified tests/data/example.nxs
Binary file not shown.
Binary file modified tests/data/example_eln.nxs
Binary file not shown.
Loading