apply selectors before checking for requirements #2973
Conversation
conda_build/variants.py
Outdated
| @@ -555,7 +555,10 @@ def find_used_variables_in_text(variant, recipe_text): | |||
| conditional_regex = r"(?:^|[^\{])\{%\s*(?:el)?if\s*" + v_regex + r"\s*(?:[^%]*?)?%\}" | |||
| # plain req name, no version spec. Look for end of line after name, or comment or selector | |||
| requirement_regex = r"^\s+\-\s+%s\s*(?:\s[\[#]|$)" % v_req_regex | |||
| all_res.extend([variant_regex, selector_regex, conditional_regex, requirement_regex]) | |||
| if not selectors: | |||
There was a problem hiding this comment.
This logic is counterintuitive to me. I think it means:
- If
selectorsis True, it means you want to apply them to the recipe, rather than detect used variables in them - If
selectorsis False, you'll instead detect used variables in them, and not apply them.
Is that accurate? If so, do you mind adding a bit of a comment to clarify it?
There was a problem hiding this comment.
It should have been if selectors.
There was a problem hiding this comment.
Could you please document how you want this to behave? I still don't trust myself to get this right, especially without some tests.
|
Aside from my one question, this looks fine. I'll be happy to merge if you can clarify things a bit for me. |
| else: | ||
| recipe_text = (self.get_recipe_text(force_top_level=force_top_level, | ||
| apply_selectors=False).replace( | ||
| apply_selectors=apply_selectors).replace( | ||
| self.extract_outputs_text(apply_selectors=False).strip(), '') + |
There was a problem hiding this comment.
This should have been apply_selectors=apply_selectors.
cc @CJ-Wright
| else: | ||
| recipe_text = (self.get_recipe_text(force_top_level=force_top_level, | ||
| apply_selectors=False).replace( | ||
| apply_selectors=apply_selectors).replace( | ||
| self.extract_outputs_text(apply_selectors=False).strip(), '') + | ||
| self.extract_single_output_text(self.name(), apply_selectors=False)) |
|
Hi there, thank you for your contribution! This pull request has been automatically locked because it has not had recent activity after being closed. Please open a new issue or pull request if needed. Thanks! |
No description provided.