Sync main to dev#390
Merged
Merged
Conversation
Required so that the AM knows what branch is installed, since zip files don't have that info.
Implement multi-branch handling
* Update README.md * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
updates: - [github.com/pre-commit/pre-commit-hooks: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b → 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c](pre-commit/pre-commit-hooks@cef0300...3e8a870)
[pre-commit.ci] pre-commit autoupdate
This was error-prone and fragile, and prevented the wiki from being reformatted because it would break the AM's display. Switch to just showing the macros metadata, and also add display of the code (some macros include useful information in their code's header).
Stop attempting to display the Macro wiki page
Improve backup deletion code
Also removes all testing files from CMake -- the tests are designed to run standalone, not within FreeCAD's testing framework.
Fix missing CMake entries
Also fixes the error-handling code itself to synchronize the signal signatures between installing an Macro and non-Macro addon.
Fix error decoding macro icon
Not all packages can be imported by their PyPI package name (e.g. `python-dateutil` is imported as `dateutil`) so use the Py3.8+ importlib `metadata` component to check for the package by its installed name. Also ensure that the package is not imported by the check, which can cause side effects.
…nTest Improve check for Python package installation
Change UI stings to match FEP7
Fix the displayed buttons in detail view
Should only display in very rare circumstances
Add progress spinner while checking single addon
Hide widgets with bad svg
Clean up license norming diagnostic output
for more information, see https://pre-commit.ci (cherry picked from commit f3cd818)
(cherry picked from commit 32653a6)
(cherry picked from commit c5c95c3)
(cherry picked from commit b74592e)
(cherry picked from commit a9b243e)
Backport FreeCAD#331 to main
(cherry picked from commit bbcc53e)
for more information, see https://pre-commit.ci (cherry picked from commit 5bd3e07)
[Backport main] Pin PySide<6.11 in CI
[Backport main] Disable the addon curation until we're ready
Fix loading and displaying metadata and icons for custom repositories, including remote fetch for not-installed addons. addonmanager_workers_startup.py: * Use load_metadata_file and load icon data for installed custom addons * Add _fetch_remote_custom_addon_metadata to fetch metadata and icon for not-installed custom addons (cherry picked from commit 2130420)
for more information, see https://pre-commit.ci (cherry picked from commit 7636bb7)
Fixed issues pointed out by AI and reviewer. (cherry picked from commit 3f1614a)
[Backport main] Fix: Addon Manager Python dependency update detection in Flatpak
[Backport main] Fix custom repository metadata and icon loading
Update version to 2026.4.25
[Backport main] Add check for missing dependencies on startup
Backport missing to main
for more information, see https://pre-commit.ci
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To reduce conflicts with automatic backports, reverse the usual synchronization and pull main into dev. This PR looks like it contains a lot of commits, but almost all of them are actually already on dev, so they won't actually do anything.