Repository navigation
backport(master): feat: Read apt dependencies from [tool.frappe-cloud] (#616) - #661
Merged
Merged
Conversation
[deploy.dependencies.apt] is not a valid pyproject.toml table, because PEP 518 reserves all top-level tables except [tool.*]. Also read [tool.frappe-cloud] apt-dependencies and keep the legacy key working. Remove duplicate package names. (cherry picked from commit 3138624)
Contributor
|
This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again. |
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
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.
Backport of #616 to
master.Mergify could not backport it, because the source PR has a merge commit (it merged
developinto the branch).Cherry-picked commits
74a2cc5(from3138624) feat: Read apt dependencies from [tool.frappe-cloud]The merge commit
6c3ba82is not cherry-picked.Conflicts
agent/tests/test_builder.py: master has more test classes at the same place. The change is purely additive, so I kept both sides and put the newTestParseAdditionalPackagesclass at the end of the file.os,tempfileandSimpleNamespaceinside the function. Ondevelop, the merge commit removed those local imports, because the file now imports them at the top. Master's file also imports them at the top, so the backport uses thedevelopversion of the test.The net diff is the same as #616 on
develop(2 files, +33 −4).🤖 Generated with Claude Code