Sync stable with master

.github/workflows/build-pr.yml

@@ -6,24 +6,24 @@ on:
       - opened
       - synchronize
       - labeled
-    
+
 jobs:
   build_amd64:
     runs-on: ubuntu-latest
     if: |
       github.event.pull_request.state == 'open' &&
       (
         (
-          github.event.action == 'labeled' && 
+          github.event.action == 'labeled' &&
           github.event.label.name == 'safe to publish'
-        ) || 
+        ) ||
         (
-          github.event.action != 'labeled' && 
+          github.event.action != 'labeled' &&
           contains(github.event.pull_request.labels.*.name, 'safe to publish')
         )
       )
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install snapcraft
       run: |
         sudo snap install snapcraft --classic
@@ -35,11 +35,11 @@ jobs:
         mkdir -p ./pr-data
         echo '${{ github.event.number }}' > ./pr-data/pr-number
         echo '${{ github.event.pull_request.head.sha }}' > ./pr-data/pr-commit
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: snap
         path: freecad*.snap
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: pr-data
         path: pr-data/

.github/workflows/promote-to-beta.yml

@@ -4,12 +4,12 @@ on:
   schedule:
     - cron: "0 4 * * 0" # Every Sunday at 4:00
   workflow_dispatch: # or manually
-    
+
 jobs:
   publish_amd64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install snapcraft
       run: sudo snap install snapcraft --classic
     - name: promote from edge to beta

.github/workflows/publish-daily.yml

@@ -4,12 +4,12 @@ on:
   schedule:
     - cron: "0 0 * * *" # Every day at 0:00
   workflow_dispatch: # or manually
-    
+
 jobs:
   publish_amd64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install snapcraft
       run: sudo snap install snapcraft --classic
     - name: build snap

.github/workflows/publish-pr.yml

@@ -119,7 +119,7 @@ jobs:
                 $ sudo snap install --channel=${snapChannel} freecad
 
                 # If you already have the freecad snap installed
-                $ sudo snap refresh --channel=${snapChannel} freecad 
+                $ sudo snap refresh --channel=${snapChannel} freecad
 
                 # Experimental: Parallel install (see https://github.com/FreeCAD/FreeCAD-snap/blob/master/docs/index.md#parallel-installs)
                 $ sudo snap set system experimental.parallel-instances=true
@@ -130,4 +130,3 @@ jobs:
                 $ snap refresh freecad --channel=edge freecad
               \`\`\``
             });
-

.github/workflows/publish-release.yml

@@ -9,13 +9,14 @@ jobs:
   publish_amd64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: snapcore/action-build@v1
       id: build
       with:
         snapcraft-args: "--enable-experimental-extensions"
     - uses: snapcore/action-publish@v1
+      env:
+        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
       with:
-        store_login: ${{ secrets.STORE_LOGIN }}
         snap: ${{ steps.build.outputs.snap }}
         release: candidate

.github/workflows/publish-toponaming.yml

@@ -4,7 +4,7 @@ on:
   schedule:
     - cron: "0 0 * * *" # Every day at 0:00
   workflow_dispatch: # or manually
-    
+
 jobs:
   publish_amd64:
     runs-on: ubuntu-20.04

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+    -   id: mixed-line-ending

README.md

@@ -31,13 +31,12 @@ There are multiple apps/commands included in the snap:
 
 - `freecad.freecad`:  Run FreeCAD
 - `freecad.cmd`:      Run FreeCAD command line interface
-- `freecad.pip`:      Install python packages for user (not system-wide). 
-                      E.g. `freecad.pip install py_slvs` for Assembly3. 
-                          
+- `freecad.pip`:      Install python packages for user (not system-wide).
+                      E.g. `freecad.pip install py_slvs` for Assembly3.
+
 ## FreeCAD Link Branch by RealThunder
 
 There's also a snap that packages the well-known experimental FreeCAD fork by RealThunder: https://snapcraft.io/freecad-realthunder
 Try it for some exciting new features and improvements.
 
 [![freecad-realthunder](https://snapcraft.io/freecad-realthunder/badge.svg)](https://snapcraft.io/freecad-realthunder)
-

snap/local/snap-setup-mod/Init.py

@@ -9,12 +9,6 @@ def add_snap_pythonpath():
     for path in pythonpath.split(":"):
       sys.path.insert(0, path)
 
-def configure_mod_raytracing():
-  import FreeCAD
-  param = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Raytracing")
-  if not param.GetString("PovrayExecutable", ""):
-    param.SetString("PovrayExecutable", "/snap/freecad/current/usr/bin/povray")
-
 def configure_mod_mesh():
   import FreeCAD
   param = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Mesh/Meshing")
@@ -28,6 +22,5 @@ def fix_theme():
     param.SetBool("ThemeSearchPaths", False)
 
 add_snap_pythonpath()
-configure_mod_raytracing()
 configure_mod_mesh()
 fix_theme()