Merge branch 'main' of https://github.com/GregValiant/Cura

Author: GregValiant

.github/workflows/nightly.yml

@@ -32,7 +32,7 @@ jobs:
         uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
 
       - name: Download installers jobs artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           pattern: UltiMaker-Cura-*
           path: installers

.github/workflows/printer-linter-pr-diagnose.yml

@@ -41,7 +41,7 @@ jobs:
           echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt
           echo ${{ github.event.pull_request.head.sha }} > printer-linter-result/pr-head-sha.txt
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: printer-linter-result
           path: printer-linter-result/

.github/workflows/printer-linter-pr-post.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Download analysis results
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
             const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -40,7 +40,7 @@ jobs:
           unzip -j printer-linter-result.zip -d printer-linter-result
 
       - name: Set PR details environment variables
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
             const assert = require("node:assert").strict;
@@ -63,14 +63,14 @@ jobs:
                 }
             });
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: ${{ env.PR_HEAD_REPO }}
           ref: ${{ env.PR_HEAD_SHA }}
           persist-credentials: false
 
       - name: Redownload analysis results
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
             const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -97,7 +97,7 @@ jobs:
 
       - name: Run PR Comments
         if: env.commentFileExists == 'true'
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ env.PR_ID }}
           body-path: 'printer-linter-result/comment.md'

.github/workflows/release-process_release-candidate.yml

@@ -53,7 +53,7 @@ jobs:
       tag_name: ${{ steps.find-available-tag-name.outputs.tag_name }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-tags: true
           fetch-depth: 0
@@ -87,7 +87,7 @@ jobs:
         repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials]
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: Ultimaker/${{ matrix.repository }}
           ref: ${{ needs.parse-version.outputs.branch_name }}
@@ -143,7 +143,7 @@ jobs:
     needs: [create-installers, parse-version, create-tags]
     steps:
       - name: Checkout Cura repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ needs.parse-version.outputs.branch_name }}
 
@@ -164,7 +164,7 @@ jobs:
           body: formatted_changelog.txt
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: artifacts
           merge-multiple: true

.github/workflows/security_badge.yml

@@ -28,12 +28,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -48,7 +48,7 @@ jobs:
       # uploads of run results in SARIF format to the repository Actions tab.
       # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@v7
         with:
           name: SARIF file
           path: results.sarif
@@ -57,6 +57,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@83a02f7883b12e0e4e1a146174f5e2292a01e601 # v2.16.4
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: results.sarif

.github/workflows/slicing-error-check.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Check for project file and set output
         id: check_issue_details
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
               const issue = context.payload.issue;
@@ -46,7 +46,7 @@ jobs:
 
       - name: Add comment if project file is missing
         if: ${{ steps.check_issue_details.outputs.needs_info == 'true' }}
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v5
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v10
         with:
           days-before-pr-close: -1 
           days-before-stale: 365

conanfile.py

@@ -4,6 +4,7 @@
 import yaml
 import tempfile
 import tarfile
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
 from io import StringIO
 from pathlib import Path
@@ -345,20 +346,37 @@ def _make_extra_dependency_description(self, dependency_name, dependency_data, d
 
         dependencies[dependency_name] = dependency_description
 
+    @staticmethod
+    def _run_dependency_description_job(job):
+        job_function, args = job
+        dependency = {}
+        job_function(*args, dependency)
+        return dependency
+
     def _dependencies_description(self):
         dependencies = {}
+        jobs = []
 
         for dependency in [self] + list(self.dependencies.values()):
-            self._make_conan_dependency_description(dependency, dependencies)
+            jobs.append((self._make_conan_dependency_description, (dependency,)))
 
             if "extra_dependencies" in dependency.conan_data:
                 for dependency_name, dependency_data in dependency.conan_data["extra_dependencies"].items():
-                    self._make_extra_dependency_description(dependency_name, dependency_data, dependencies)
+                    jobs.append((self._make_extra_dependency_description, (dependency_name, dependency_data)))
 
         pip_requirements_summary = os.path.abspath(Path(self.generators_folder, "pip_requirements_summary.yml") )
         with open(pip_requirements_summary, 'r') as file:
             for package_name, package_version in yaml.safe_load(file).items():
-                self._make_pip_dependency_description(package_name, package_version, dependencies)
+                jobs.append((self._make_pip_dependency_description, (package_name, package_version)))
+
+        if not jobs:
+            return dependencies
+
+        max_workers = min(32, len(jobs))
+        with ThreadPoolExecutor(max_workers=max_workers) as executor:
+            futures = [executor.submit(self._run_dependency_description_job, job) for job in jobs]
+            for future in as_completed(futures):
+                dependencies.update(future.result())
 
         return dependencies
 

cura/CuraActions.py

@@ -45,7 +45,7 @@ def openDocumentation(self) -> None:
         # Starting a web browser from a signal handler connected to a menu will crash on windows.
         # So instead, defer the call to the next run of the event loop, since that does work.
         # Note that weirdly enough, only signal handlers that open a web browser fail like that.
-        event = CallFunctionEvent(self._openUrl, [QUrl("https://ultimaker.com/en/resources/manuals/software?utm_source=cura&utm_medium=software&utm_campaign=dropdown-documentation")], {})
+        event = CallFunctionEvent(self._openUrl, [QUrl("https://ultimaker.com/en/resources/manuals/software")], {})
         cura.CuraApplication.CuraApplication.getInstance().functionEvent(event)
 
     @pyqtProperty(bool, notify=undoStackChanged)

cura/CuraApplication.py

@@ -175,8 +175,8 @@ def __init__(self, *args, **kwargs):
 
         self.default_theme = "cura-light"
 
-        self.change_log_url = "https://ultimaker.com/ultimaker-cura-latest-features?utm_source=cura&utm_medium=software&utm_campaign=cura-update-features"
-        self.beta_change_log_url = "https://ultimaker.com/ultimaker-cura-beta-features?utm_source=cura&utm_medium=software&utm_campaign=cura-update-features"
+        self.change_log_url = "https://ultimaker.com/ultimaker-cura-latest-features"
+        self.beta_change_log_url = "https://ultimaker.com/ultimaker-cura-beta-features"
 
         self._boot_loading_time = time.time()