From 0327cd6a0ac7a52b89dee57983f424468ec69179 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 25 Nov 2020 23:51:05 -0600 Subject: [PATCH 1/2] Don't consider build reqs for cross compiling platforms --- conda_forge_tick/feedstock_parser.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/conda_forge_tick/feedstock_parser.py b/conda_forge_tick/feedstock_parser.py index 78c1ffafa..f27feb08a 100644 --- a/conda_forge_tick/feedstock_parser.py +++ b/conda_forge_tick/feedstock_parser.py @@ -220,10 +220,13 @@ def populate_feedstock_attributes( # collapse them down final_cfgs = {} - for plat_arch, varyml in zip(plat_arch, varient_yamls): - if plat_arch not in final_cfgs: - final_cfgs[plat_arch] = [] - final_cfgs[plat_arch].append(varyml) + for plat_arch_i, varyml in zip(plat_arch, varient_yamls): + if plat_arch_i not in final_cfgs: + final_cfgs[plat_arch_i] = [] + if plat_arch_i == "osx-arm64": + # Don't consider build reqs for cross compiling platforms + varyml["requirements"]["build"] = [] + final_cfgs[plat_arch_i].append(varyml) for k in final_cfgs: ymls = final_cfgs[k] final_cfgs[k] = _convert_to_dict(ChainDB(*ymls)) From a3bc33821f7a80ddf0e6999833d64608910fe7ff Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 26 Nov 2020 01:03:22 -0600 Subject: [PATCH 2/2] Fix comparing --- conda_forge_tick/feedstock_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_forge_tick/feedstock_parser.py b/conda_forge_tick/feedstock_parser.py index f27feb08a..2783c9ce5 100644 --- a/conda_forge_tick/feedstock_parser.py +++ b/conda_forge_tick/feedstock_parser.py @@ -223,7 +223,7 @@ def populate_feedstock_attributes( for plat_arch_i, varyml in zip(plat_arch, varient_yamls): if plat_arch_i not in final_cfgs: final_cfgs[plat_arch_i] = [] - if plat_arch_i == "osx-arm64": + if plat_arch_i == ("osx", "arm64"): # Don't consider build reqs for cross compiling platforms varyml["requirements"]["build"] = [] final_cfgs[plat_arch_i].append(varyml)