From 7bb89680b097a9575045f4ef5e977955a5b5221d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 18 Apr 2024 12:54:32 +1100 Subject: [PATCH 1/2] cover templated sysroot reqs in stdlib migrator --- conda_forge_tick/migrators/cstdlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_forge_tick/migrators/cstdlib.py b/conda_forge_tick/migrators/cstdlib.py index 5509b331d..b604bee8e 100644 --- a/conda_forge_tick/migrators/cstdlib.py +++ b/conda_forge_tick/migrators/cstdlib.py @@ -20,7 +20,7 @@ ) pat_stdlib = re.compile(r".*\{\{\s*stdlib\([\"\']c[\"\']\)\s*\}\}.*") # no version other than 2.17 currently available (except 2.12 as default on linux-64) -pat_sysroot_217 = re.compile(r"- sysroot_linux-64\s*=?=?2\.17") +pat_sysroot_217 = re.compile(r"- sysroot_(linux-64|\{\{.*\}\})\s*=?=?2\.17") def _process_section(name, attrs, lines): From 03f5da392464c34a7436644534a1dca74b1a8035 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 18 Apr 2024 12:56:28 +1100 Subject: [PATCH 2/2] add stdlib piggyback to version_migrator --- conda_forge_tick/auto_tick.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conda_forge_tick/auto_tick.py b/conda_forge_tick/auto_tick.py index eb3a024d3..6ba5f26f7 100644 --- a/conda_forge_tick/auto_tick.py +++ b/conda_forge_tick/auto_tick.py @@ -1052,6 +1052,7 @@ def initialize_migrators( PipWheelMigrator(), MPIPinRunAsBuildCleanup(), DependencyUpdateMigrator(python_nodes), + StdlibMigrator(), ], )