Expand Jinja templating #922
Merged
Conversation
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
conda-bot
added
the
cla-signed
jaimergp
reviewed
Jan 7, 2025
constructor/nsis/main.nsi.tmpl
Outdated
| {{ SCRIPT_ENV_VARIABLES }} | ||
|
|
||
| {%- for key, val in SCRIPT_ENV_VARIABLES | items %} | ||
| System::Call 'kernel32::SetEnvironmentVariable(t,t)i("{{ key }}", {{ val }}).r0' |
Contributor
There was a problem hiding this comment.
Don't we need quotes for val too?
Contributor
There was a problem hiding this comment.
Ah ok they are pre-escaped in Python. Let's rename this for clarity in the future then:
Suggested change
| System::Call 'kernel32::SetEnvironmentVariable(t,t)i("{{ key }}", {{ val }}).r0' | |
| System::Call 'kernel32::SetEnvironmentVariable(t,t)i("{{ key }}", {{ escaped_val }}).r0' |
(and in the line above too)
Contributor
Author
There was a problem hiding this comment.
I was surprised, too, but we don't do it in the current version either: https://github.com/conda/constructor/blob/main/constructor/winexe.py#L97
jaimergp
approved these changes
Jan 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Description
#892 introduced a small regression by missing a few template variables for PKG installers. In fixing this regression, I decided to expand the Jinja templating as described in #901.
Specifically, this PR removes custom Python code with Jinja templating logic, which removed a lot of custom Python formatting functions on Windows and simplified the data structures.
Additionally, I patched a few testing issues that broke tests for local test executions and when using the defaults channel.
Closes #901
Checklist - did you ...
newsdirectory (using the template) for the next release's release notes?