Fixes obsolete libgl1-mesa-glx package and updates ruff formatting (#…

…64) * fixed obsolete package * ruff format
RascalSoftware · Jan 20, 2025 · 8c38d74 · 8c38d74
1 parent 66b25dd
commit 8c38d74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/actions/linux/action.yaml b/.github/actions/linux/action.yaml
@@ -9,7 +9,7 @@ runs:
     shell: bash -l {0}
     run: |
       sudo apt update
-      sudo apt install xvfb libqt5x11extras5 libgl1-mesa-glx '^libxcb.*-dev'
+      sudo apt install xvfb libqt5x11extras5 libgl1 libglx-mesa0 '^libxcb.*-dev'
   - name: Install RasCAL2
     shell: bash -l {0}
     run: pip install .

diff --git a/rascal2/widgets/project/project.py b/rascal2/widgets/project/project.py
@@ -326,11 +326,11 @@ def validate_draft_project(self):
 
                 if missing_params:
                     noun = "a parameter" if len(missing_params) == 1 else "parameters"
-                    msg = f"Layer '{layer.name}' (row {i+1}) is missing {noun}: {', '.join(missing_params)}"
+                    msg = f"Layer '{layer.name}' (row {i + 1}) is missing {noun}: {', '.join(missing_params)}"
                     errors.append(msg)
                 if invalid_params:
                     noun = "an invalid value" if len(invalid_params) == 1 else "invalid values"
-                    msg = f"Layer '{layer.name}' (row {i+1}) has {noun}: " "{0}".format(
+                    msg = f"Layer '{layer.name}' (row {i + 1}) has {noun}: {{0}}".format(
                         ",\n  ".join(f'"{v}" for parameter {p}' for p, v in invalid_params)
                     )
                     errors.append(msg)

diff --git a/tests/widgets/project/test_project.py b/tests/widgets/project/test_project.py
@@ -291,12 +291,12 @@ def test_project_tab_validate_layers(input_params, absorption):
 
         if missing_params:
             noun = "a parameter" if len(missing_params) == 1 else "parameters"
-            msg = f"Layer '{layer.name}' (row {i+1}) is missing {noun}: {', '.join(missing_params)}"
+            msg = f"Layer '{layer.name}' (row {i + 1}) is missing {noun}: {', '.join(missing_params)}"
             expected_err.append(msg)
         if invalid_params:
             noun = "an invalid value" if len(invalid_params) == 1 else "invalid values"
             msg = (
-                f"Layer '{layer.name}' (row {i+1}) has {noun}: "
+                f"Layer '{layer.name}' (row {i + 1}) has {noun}: "
                 f"{', '.join(f'"Invalid Param" for parameter {p}' for p in invalid_params)}"
             )
             expected_err.append(msg)