From ebcdb4f5872c29808fa03b7784eafeb424f73e37 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 20 Apr 2024 22:08:09 +1100 Subject: [PATCH] numpy2: don't bother with treating sections separately --- conda_forge_tick/migrators/numpy2.py | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/conda_forge_tick/migrators/numpy2.py b/conda_forge_tick/migrators/numpy2.py index 8020a7b9e..418c1c8bd 100644 --- a/conda_forge_tick/migrators/numpy2.py +++ b/conda_forge_tick/migrators/numpy2.py @@ -2,7 +2,7 @@ import re from conda_forge_tick.migrators.core import MiniMigrator -from conda_forge_tick.migrators.libboost import _replacer, _slice_into_output_sections +from conda_forge_tick.migrators.libboost import _replacer # pin_compatible("numpy"...) # ^ ^ ^ @@ -11,19 +11,6 @@ pat_pcn = re.compile(raw_pat_pcn) -def _process_section(name, attrs, lines): - """ - Migrate requirements per section. - - We want to migrate as follows: - - remove all occurrences of `{{ pin_compatible("numpy",...) }}`; - these will be taken care of henceforth by numpy's run-export - """ - # _replacer take the raw pattern, not the compiled one - lines = _replacer(lines, raw_pat_pcn, "") - return lines - - class Numpy2Migrator(MiniMigrator): def filter(self, attrs, not_bad_str_start=""): lines = attrs["raw_meta_yaml"].splitlines() @@ -37,11 +24,8 @@ def migrate(self, recipe_dir, attrs, **kwargs): with open(fname) as fp: lines = fp.readlines() - new_lines = [] - sections = _slice_into_output_sections(lines, attrs) - for name, section in sections.items(): - # _process_section returns list of lines already - new_lines += _process_section(name, attrs, section) + # _replacer take the raw pattern, not the compiled one + new_lines = _replacer(lines, raw_pat_pcn, "") with open(fname, "w") as fp: fp.write("".join(new_lines))