Merge branch 'FreeCAD:main' into neumann_bc

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -1,6 +1,6 @@
 name: Report a Problem
 description: Have you found something that does not work well, is too hard to do or is missing altogether? Please create a Problem Report.
-labels: ["Status: Needs triage"]
+labels: ["Status: Needs triage","Status: Needs confirmation"]
 body:
   - type: checkboxes
     id: existing_issue
@@ -22,7 +22,7 @@ body:
     id: full_version
     attributes:
       label: Full version info
-      description: Please use the About FreeCAD dialog to copy your full version information and paste it here.
+      description: Please use the About FreeCAD dialog to copy your full version information and paste it here. Try reproducing the issue by restarting FreeCAD in safe mode too.
       render: shell
     validations:
       required: true
@@ -40,6 +40,8 @@ body:
         - Expressions
         - FEM
         - File formats
+        - Material
+        - Measurement
         - Mesh
         - OpenSCAD
         - Part

.github/workflows/stale_issues.yml

@@ -0,0 +1,68 @@
+# This workflow warns and then closes issues that have had no activity for a
+# specified amount of time. You can adjust the behavior by modifying this file.
+# For more information, see:
+#   https://github.com/marketplace/actions/close-stale-issues
+#   https://github.com/actions/stale/blob/master/action.yml
+#   https://github.com/actions/stale
+---
+name: 'Stale Issues'
+on:  # yamllint disable-line rule:truthy
+  schedule:
+    - cron: '0 0 * * *'  # Run at 00:00 UTC every day
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  issues: write  # for actions/stale to close stale issues
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - name: '🧹 Tag & close stale issues'
+        id: stale_issues
+        uses: actions/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 90
+          days-before-close: 20
+          operations-per-run: 100  # max num of ops per run
+          stale-issue-label: 'Status: Stale'
+          close-issue-label: 'Status: Auto-closing'
+          # trunk-ignore(yamllint/line-length)
+          exempt-issue-labels: 'Status: Confirmed,Priority: High,Priority: Critical,Blocker,Type: Feature'
+          remove-stale-when-updated: true
+          stale-issue-message: |
+            Hi! This issue hasn’t seen activity in a while. If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
+
+            If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
+            Thanks for helping improve FreeCAD!
+
+            Access additional [FreeCAD](https://freecad.org) resources:
+              - **Forum**: https://forum.freecad.org
+              - **Blog**: https://blog.freecad.org
+              - **Wiki**: https://wiki.freecad.org
+
+      - name: '🧹 Close stale requested feedback issues'
+        id: awaiting_issues
+        uses: actions/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-issue-stale: 20
+          days-before-close: 20
+          operations-per-run: 30  # max num of ops per run
+          stale-issue-label: 'Status: Stale'
+          close-issue-label: 'Status: Auto-closing'
+          only-labels: 'Status: Needs feedback,Status: Needs test on dev version,Status: Needs steps to reproduce'
+          remove-stale-when-updated: true
+          stale-issue-message: |
+            Hi! This issue hasn’t seen activity in a while despite the need for further feedback.
+            If it’s still relevant, please update to the latest FreeCAD weekly build [download here](https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds) to see if the problem is resolved.
+
+            If the issue persists, let us know by adding a comment with any updates or details. Otherwise, we’ll close this issue automatically in 20 days to keep our backlog tidy. Feel free to comment anytime to keep it open. Closed issues can always be reopened.
+            Thanks for helping improve FreeCAD!
+
+            Access additional [FreeCAD](https://freecad.org) resources:
+              - **Forum**: https://forum.freecad.org
+              - **Blog**: https://blog.freecad.org
+              - **Wiki**: https://wiki.freecad.org

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -78,7 +78,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildUbuntu2004.yml

@@ -95,8 +95,6 @@ jobs:
                             libboost-thread-dev                         \
                             libcoin-dev                                 \
                             libeigen3-dev                               \
-                            libgts-bin                                  \
-                            libgts-dev                                  \
                             libkdtree++-dev                             \
                             libmedc-dev                                 \
                             libocct-data-exchange-dev                   \

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildUbuntu2204CondaQt6.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env-qt6.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_buildWindowsConda.yml

@@ -71,7 +71,7 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies

.github/workflows/sub_lint.yml

@@ -77,7 +77,73 @@ on:
         type: boolean
         required: false
       cpplintFilters:
-        default: -whitespace-*
+        default: >-
+          '
+          +build/deprecated,
+          -build/endif_comment,
+          +build/explicit_make_pair,
+          -build/forward_decl,
+          +build/header_guard,
+          +build/include,
+          -build/include_subdir,
+          -build/include_alpha,
+          -build/include_order,
+          +build/include_what_you_use,
+          +build/namespaces_headers,
+          +build/namespaces_literals,
+          +build/namespaces,
+          +build/printf_format,
+          +build/storage_class,
+          +readability/alt_tokens,
+          -readability/braces,
+          +readability/casting,
+          +readability/check,
+          +readability/constructors,
+          +readability/fn_size,
+          +readability/inheritance,
+          +readability/multiline_comment,
+          +readability/multiline_string,
+          +readability/namespace,
+          -readability/nolint,
+          +readability/nul,
+          +readability/strings,
+          +readability/todo,
+          +readability/utf8,
+          +runtime/arrays,
+          +runtime/casting,
+          +runtime/explicit,
+          +runtime/int,
+          +runtime/init,
+          +runtime/invalid_increment,
+          +runtime/member_string_references,
+          +runtime/memset,
+          +runtime/operator,
+          +runtime/printf,
+          +runtime/printf_format,
+          +runtime/references,
+          +runtime/string,
+          +runtime/threadsafe_fn,
+          +runtime/vlog,
+          -whitespace/blank_line,
+          -whitespace/braces,
+          -whitespace/comma,
+          -whitespace/comments,
+          -whitespace/empty_conditional_body,
+          -whitespace/empty_if_body,
+          -whitespace/empty_loop_body,
+          -whitespace/end_of_line,
+          -whitespace/ending_newline,
+          -whitespace/forcolon,
+          -whitespace/indent,
+          -whitespace/indent_namespace,
+          -whitespace/line_length,
+          -whitespace/newline,
+          -whitespace/operators,
+          -whitespace/parens,
+          -whitespace/semicolon,
+          -whitespace/tab,
+          -whitespace/todo
+          '
         type: string
         required: false
       cpplintLineLength:
@@ -140,10 +206,6 @@ on:
         default: true
         type: boolean
         required: false
-      clangTidyChecks:
-        default: # empty to use the .clang-tidy file
-        type: string
-        required: false
       clangTidyFailSilent:
         default: true # warnings or notes will never fail the CI, only errors
         type: boolean
@@ -318,7 +380,7 @@ jobs:
           pylintWarnings=0
           pylintRefactorings=0
           pylintConventions=0
-          pip install pylint
+          pip install --break-system-packages pylint
           # List enabled pylint checks
           pylint --list-msgs-enabled > ${{ env.logdir }}pylint-enabled-checks.log
           # Run pylint on all python files
@@ -378,7 +440,7 @@ jobs:
         run: |
           blackReformats=0
           blackFails=0
-          pip install black
+          pip install --break-system-packages black
           set +e
           black --check ${{ inputs.changedPythonFiles }} &> ${{ env.logdir }}black.log
           exitCode=$?
@@ -429,8 +491,6 @@ jobs:
                             libboost-thread-dev                         \
                             libcoin-dev                                 \
                             libeigen3-dev                               \
-                            libgts-bin                                  \
-                            libgts-dev                                  \
                             libkdtree++-dev                             \
                             libmedc-dev                                 \
                             libocct-data-exchange-dev                   \
@@ -444,15 +504,14 @@ jobs:
                             libqt5x11extras5-dev                        \
                             libshiboken2-dev                            \
                             libspnav-dev                                \
-                            libvtk7-dev                                 \
+                            libvtk9-dev                                 \
                             libx11-dev                                  \
                             libxerces-c-dev                             \
                             libyaml-cpp-dev                             \
                             libzipios++-dev                             \
                             netgen                                      \
                             netgen-headers                              \
                             occt-draw                                   \
-                            pyqt5-dev-tools                             \
                             pyside2-tools                               \
                             python3-dev                                 \
                             python3-git                                 \
@@ -516,7 +575,7 @@ jobs:
         continue-on-error: ${{ inputs.cpplintFailSilent }}
         run: |
           cpplintErrors=0
-          pip install cpplint
+          pip install --break-system-packages cpplint
           # Run cpplint
           for file in ${{ inputs.changedCppFiles }}
           do
@@ -581,7 +640,7 @@ jobs:
         if: inputs.checkSpelling && always()
         continue-on-error: ${{ inputs.codespellFailSilent }}
         run: |
-          pip install codespell
+          pip install --break-system-packages codespell
           wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt
           #wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_rare.txt
           set +e
@@ -620,10 +679,10 @@ jobs:
           clangTidyNotes=0
           sudo apt-get install -y --no-install-recommends clang-tidy
           #TODO: check where this "clang-tidy.yaml" goes ; shall this be put in the fixes ?
-          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -checks=${{ inputs.clangTidyChecks }} -p build/ --explain-config &>> ${{ env.logdir }}clang-tidy-enabled-checks.log
+          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -p build/ --explain-config &>> ${{ env.logdir }}clang-tidy-enabled-checks.log
           # Run clang-tidy on all cpp files
           set +e
-          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -checks=${{ inputs.clangTidyChecks }} -p build/ ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clang-tidy.log
+          clang-tidy --quiet --format-style=${{ inputs.clangStyle }} --export-fixes=clang-tidy.yaml -p build/ ${{ inputs.changedCppFiles }} &>> ${{ env.logdir }}clang-tidy.log
           exitCode=$?
           set -e
           # If clang-tidy has run successfully, write the Log to the console with the Problem Matchers

.pre-commit-config.yaml

@@ -42,6 +42,9 @@ exclude: |
         src/App/ExpressionParser.tab.h|
         src/App/ExpressionParser.y|
         src/App/lex.ExpressionParser.c|
+        src/Gui/3Dconnexion/navlib|
+        src/Gui/QSint|
+        src/Gui/Quarter|
         src/Mod/Import/App/SCL|
         src/Mod/Import/App/SCL_output|
         src/Mod/Mesh/App/TestData|

CMakeLists.txt

@@ -21,16 +21,18 @@ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
 if(FREECAD_USE_CCACHE)
     find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
     if(CCACHE_PROGRAM)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+        message(STATUS "Using ccache found at: " ${CCACHE_PROGRAM})
+        set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
     endif()
 endif()
 
 project(FreeCAD)
 
 set(PACKAGE_VERSION_MAJOR "1")
-set(PACKAGE_VERSION_MINOR "0")
+set(PACKAGE_VERSION_MINOR "1")
 set(PACKAGE_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
-set(PACKAGE_VERSION_SUFFIX "RC1") # either "dev" for development snapshot or "" (empty string)
+set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
 set(PACKAGE_BUILD_VERSION "0") # used when the same FreeCAD version will be re-released (for example using an updated LibPack)
 
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")

CMakePresets.json

@@ -151,6 +151,10 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.sh",
         "cacheVariables": {
+          "CMAKE_IGNORE_PREFIX_PATH": {
+            "type": "STRING",
+            "value": "/opt/homebrew;/usr/local/homebrew"
+          },
           "CMAKE_INCLUDE_PATH": {
             "type": "FILEPATH",
             "value": "${sourceDir}/.conda/freecad/include"