diff --git a/src/rattler_build_conda_compat/lint.py b/src/rattler_build_conda_compat/lint.py index 3000f2b..7fae4ce 100644 --- a/src/rattler_build_conda_compat/lint.py +++ b/src/rattler_build_conda_compat/lint.py @@ -26,9 +26,6 @@ def _format_validation_msg(error: ValidationError): - import pdb - - pdb.set_trace() return cleandoc( f""" In recipe.yaml: \n{indent(error.message, " " * 12 + "> ")} diff --git a/src/rattler_build_conda_compat/render.py b/src/rattler_build_conda_compat/render.py index 591434b..8270433 100644 --- a/src/rattler_build_conda_compat/render.py +++ b/src/rattler_build_conda_compat/render.py @@ -118,6 +118,9 @@ def get_used_vars(self, force_top_level=False, force_global=False): if "target_platform" in self.config.variant and self.noarch: used_vars.remove("target_platform") + # # if "channel_targets" not in self.config.variant: + # used_vars.remove("channel_targets") + return set(used_vars) def get_used_variant(self) -> Dict: @@ -145,7 +148,15 @@ def get_used_variant(self) -> Dict: return used_variant_key_normalized def get_used_loop_vars(self, force_top_level=False, force_global=False): - return self.get_used_vars(force_top_level, force_global) + # return self.get_used_vars(force_top_level, force_global) + + return { + var + for var in self.get_used_vars( + force_top_level=force_top_level, force_global=force_global + ) + if var in self.get_loop_vars() + } def get_section(self, name): if not self._rendered: