Merge pull request #351 from OpenCOMPES/create-pull-request/patch

Fix linting error
OpenCOMPES · Mar 6, 2024 · 23e7211 · 23e7211
2 parents 714fde6 + eabd2b8
commit 23e7211
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 75 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -3,8 +3,6 @@ name: linting
 # Triggers the workflow on push for all branches
 on:
   push:
-    branches:
-      - '*'
     paths-ignore:
       pyproject.toml
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ on:
     branches:
       - main
     tags:
-      - '*'
+      - v[0-9]+.[0-9]+.[0-9]+
     paths:
       - sed/**/*
       - .github/workflows/release.yml

diff --git a/.github/workflows/testing_coverage.yml b/.github/workflows/testing_coverage.yml
@@ -3,8 +3,8 @@ name: pytest and coverage report
 # Triggers the workflow on push for all branches and PR only for main
 on:
   push:
-    branches:
-      - '*'
+    paths-ignore:
+      pyproject.toml
   pull_request:
     branches:
       - main

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.7
+    rev: v0.2.2
     hooks:
       # Run the formatter.
       - id: ruff-format

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ numpy = ">=1.18"
 opencv-python = ">=4.8.0.74"
 pandas = ">=1.4.1"
 psutil = ">=5.9.0"
-pynxtools = ">=0.0.2"
+pynxtools-mpes = ">=0.0.1"
 pyyaml = ">=6.0.0"
 scipy = ">=1.8.0"
 symmetrize = ">=0.5.5"
@@ -52,7 +52,7 @@ pytest = ">=7.0.1"
 pytest-cov = ">=3.0.0"
 pytest-xdist = ">=2.5.0"
 pytest-clarity = ">=1.0.1"
-ruff = ">=0.1.7"
+ruff = ">=0.1.7, <0.3.0"
 mypy = ">=1.6.0"
 types-pyyaml = ">=6.0.12.12"
 types-requests = ">=2.31.0.9"
@@ -83,12 +83,12 @@ omit = [
 
 [tool.ruff]
 include = ["sed/*.py", "tests/*.py"]
-select = [
+lint.select = [
     "E", # pycodestyle
     "W", # pycodestyle
     "PL", # pylint
 ]
-ignore = [
+lint.ignore = [
     "E701", # Multiple statements on one line (colon)
     "PLR0911", # Too many return statements
     "PLR0912", # Too many branches
@@ -98,7 +98,7 @@ ignore = [
     "PLR5501", # else-if-used
     "PLW2901", # redefined-loop-name
 ]
-fixable = ["ALL"]
+lint.fixable = ["ALL"]
 line-length = 100 # change the default line length number or characters.
 
 [tool.mypy]

diff --git a/sed/config/NXmpes_config.json b/sed/config/NXmpes_config.json
@@ -345,9 +345,9 @@
     }
   },
   "/ENTRY[entry]/PROCESS[process]/DISTORTION[distortion]": {
-    "symmetry": "@attrs:metadata/momentum_correction/correction/rotsym",
-    "original_centre": "@attrs:metadata/momentum_correction/correction/pcent",
-    "original_points": "@attrs:metadata/momentum_correction/correction/pouter",
+    "symmetry": "@attrs:metadata/momentum_correction/correction/rotation_symmetry",
+    "original_centre": "@attrs:metadata/momentum_correction/correction/center_point",
+    "original_points": "@attrs:metadata/momentum_correction/correction/outer_points",
     "cdeform_field": "@attrs:metadata/momentum_correction/correction/cdeform_field",
     "rdeform_field": "@attrs:metadata/momentum_correction/correction/rdeform_field"
   },