Skip to content

Empy upgrade#35

Merged
tridge merged 4 commits intodronecan:masterfrom
KarolNi:empy_upgrade
Jul 12, 2025
Merged

Empy upgrade#35
tridge merged 4 commits intodronecan:masterfrom
KarolNi:empy_upgrade

Conversation

@KarolNi
Copy link
Copy Markdown
Contributor

@KarolNi KarolNi commented Mar 1, 2025

Updated empy to recent version because of my CI failnig

#18

@tpwrules
Copy link
Copy Markdown
Contributor

tpwrules commented Mar 2, 2025

Thanks for looking into this. Can you please perform a rebase to clean up the merge commits?

@tridge
Copy link
Copy Markdown
Member

tridge commented Mar 4, 2025

@KarolNi thanks! just needs testing to check that this results in no change in generated code (or at least only white-space change)

@tpwrules
Copy link
Copy Markdown
Contributor

tpwrules commented Mar 4, 2025

Confirmed that Empy 3.3.4 and Empy 4.2 both generate identical outputs after this PR. So there is no impact for users on either the old or the new version.

KarolNi and others added 4 commits July 12, 2025 14:48
The 4.x branch expects a locals dictionary whereas 3.x expects keyword
arguments, though it can use a locals dictionary too.

Allegedly on 4.x we should be using the `locals` keyword argument
instead of a positiional argument for maximum future-proofing, but that
is incompatible with 3.x. If it breaks in the future, hopefully 3.x will
be long gone so that argument can be used.

Co-authored-by: Thomas Watson <twatson52@icloud.com>
This is no longer accepted by 4.x. `)` works with both 3.x and 4.x.

Co-authored-by: Thomas Watson <twatson52@icloud.com>
No longer necessary now that we are 3.x and 4.x compatible.

Co-authored-by: Thomas Watson <twatson52@icloud.com>
To streamline install and automated builds

Also ignore test output
Copy link
Copy Markdown
Contributor

@tpwrules tpwrules left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Smoothed out the commits and re-confirmed that empy 3.3.4 and 4.2 generate bit-identical code and binaries on ArduPilot.

@tridge tridge merged commit bd91247 into dronecan:master Jul 12, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants