From f5d7777e340ddbe014c279f6b4b7a1954f8ed102 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 23 Nov 2024 16:30:42 +1100 Subject: [PATCH] add PyPIOrgMigrator as piggyback to version migrator --- conda_forge_tick/make_migrators.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conda_forge_tick/make_migrators.py b/conda_forge_tick/make_migrators.py index fa5171bb4..5ec38c019 100644 --- a/conda_forge_tick/make_migrators.py +++ b/conda_forge_tick/make_migrators.py @@ -293,6 +293,7 @@ def add_rebuild_migration_yaml( CrossCompilationForARMAndPower(), MPIPinRunAsBuildCleanup(), PyPIOrgMigrator(), + StdlibMigrator(), ] if migration_name == "qt515": piggy_back_migrations.append(QtQtMainMigrator()) @@ -306,9 +307,6 @@ def add_rebuild_migration_yaml( piggy_back_migrations.append(RUCRTCleanup()) if migration_name.startswith("flang19"): piggy_back_migrations.append(FlangMigrator()) - # stdlib migrator runs on top of ALL migrations, see - # https://github.com/conda-forge/conda-forge.github.io/issues/2102 - piggy_back_migrations.append(StdlibMigrator()) cycles = set() for cyc in nx.simple_cycles(total_graph): cycles |= set(cyc) @@ -764,6 +762,7 @@ def initialize_migrators( PipWheelMigrator(), MPIPinRunAsBuildCleanup(), DependencyUpdateMigrator(python_nodes), + PyPIOrgMigrator(), StdlibMigrator(), ], )