From 7d5ec53ef4d2742d10f542b5ec4fcf2805dff232 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Thu, 22 Aug 2024 12:36:06 -0500 Subject: [PATCH 1/2] feat: enable cross-compilation by default --- conda_forge_tick/make_migrators.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/conda_forge_tick/make_migrators.py b/conda_forge_tick/make_migrators.py index 43c28071d..bfdb8b334 100644 --- a/conda_forge_tick/make_migrators.py +++ b/conda_forge_tick/make_migrators.py @@ -181,6 +181,15 @@ def add_arch_migrate(migrators: MutableSequence[Migrator], gx: nx.DiGraph) -> No graph=total_graph, pr_limit=PR_LIMIT, name="aarch64 and ppc64le addition", + piggy_back_migrations=[ + Build2HostMigrator(), + CondaForgeYAMLCleanup(), + UpdateCMakeArgsMigrator(), + GuardTestingMigrator(), + CrossCompilationForARMAndPower(), + NoCondaInspectMigrator(), + MPIPinRunAsBuildCleanup(), + ], ), ) @@ -287,6 +296,8 @@ def add_rebuild_migration_yaml( ExtraJinja2KeysCleanup(), Build2HostMigrator(), NoCondaInspectMigrator(), + UpdateCMakeArgsMigrator(), + GuardTestingMigrator(), CrossCompilationForARMAndPower(), MPIPinRunAsBuildCleanup(), ] @@ -756,6 +767,9 @@ def initialize_migrators( Build2HostMigrator(), NoCondaInspectMigrator(), PipWheelMigrator(), + UpdateCMakeArgsMigrator(), + GuardTestingMigrator(), + CrossCompilationForARMAndPower(), MPIPinRunAsBuildCleanup(), DependencyUpdateMigrator(python_nodes), StdlibMigrator(), From 5e6eebad8c109f9813836597dad76c5640976093 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 17:41:40 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conda_forge_tick/make_migrators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda_forge_tick/make_migrators.py b/conda_forge_tick/make_migrators.py index bfdb8b334..d577227a2 100644 --- a/conda_forge_tick/make_migrators.py +++ b/conda_forge_tick/make_migrators.py @@ -189,7 +189,7 @@ def add_arch_migrate(migrators: MutableSequence[Migrator], gx: nx.DiGraph) -> No CrossCompilationForARMAndPower(), NoCondaInspectMigrator(), MPIPinRunAsBuildCleanup(), - ], + ], ), ) @@ -297,7 +297,7 @@ def add_rebuild_migration_yaml( Build2HostMigrator(), NoCondaInspectMigrator(), UpdateCMakeArgsMigrator(), - GuardTestingMigrator(), + GuardTestingMigrator(), CrossCompilationForARMAndPower(), MPIPinRunAsBuildCleanup(), ] @@ -768,7 +768,7 @@ def initialize_migrators( NoCondaInspectMigrator(), PipWheelMigrator(), UpdateCMakeArgsMigrator(), - GuardTestingMigrator(), + GuardTestingMigrator(), CrossCompilationForARMAndPower(), MPIPinRunAsBuildCleanup(), DependencyUpdateMigrator(python_nodes),