From 49903dd411b72a97bcb316e7201dd56f1a036738 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 18 Feb 2026 13:14:24 +0100 Subject: [PATCH 1/5] Run unittests on new channel --- unittests/tests/conda/test-cpp.ts | 2 +- unittests/tests/conda/test-solver.ts | 2 +- unittests/tests/format/test-format.ts | 2 +- unittests/tests/mixed/test-create.ts | 2 +- unittests/tests/mixed/test-install.ts | 2 +- unittests/tests/mixed/test-remove.ts | 2 +- unittests/tests/mixed/test-solver.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unittests/tests/conda/test-cpp.ts b/unittests/tests/conda/test-cpp.ts index d45dc7d..650298f 100644 --- a/unittests/tests/conda/test-cpp.ts +++ b/unittests/tests/conda/test-cpp.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - xeus-cpp diff --git a/unittests/tests/conda/test-solver.ts b/unittests/tests/conda/test-solver.ts index d871500..498ebfd 100644 --- a/unittests/tests/conda/test-solver.ts +++ b/unittests/tests/conda/test-solver.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas diff --git a/unittests/tests/format/test-format.ts b/unittests/tests/format/test-format.ts index 38c8eca..4365f84 100644 --- a/unittests/tests/format/test-format.ts +++ b/unittests/tests/format/test-format.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas diff --git a/unittests/tests/mixed/test-create.ts b/unittests/tests/mixed/test-create.ts index d9ab48c..962018c 100644 --- a/unittests/tests/mixed/test-create.ts +++ b/unittests/tests/mixed/test-create.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas diff --git a/unittests/tests/mixed/test-install.ts b/unittests/tests/mixed/test-install.ts index f0567c7..2575d58 100644 --- a/unittests/tests/mixed/test-install.ts +++ b/unittests/tests/mixed/test-install.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas diff --git a/unittests/tests/mixed/test-remove.ts b/unittests/tests/mixed/test-remove.ts index bd95359..38ab255 100644 --- a/unittests/tests/mixed/test-remove.ts +++ b/unittests/tests/mixed/test-remove.ts @@ -7,7 +7,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas diff --git a/unittests/tests/mixed/test-solver.ts b/unittests/tests/mixed/test-solver.ts index d939799..251eb25 100644 --- a/unittests/tests/mixed/test-solver.ts +++ b/unittests/tests/mixed/test-solver.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://prefix.dev/emscripten-forge-dev + - https://prefix.dev/emscripten-forge - https://prefix.dev/conda-forge dependencies: - pandas From 81a49887863ead364a1b8e5572bd76e4da598e0b Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 18 Feb 2026 13:45:25 +0100 Subject: [PATCH 2/5] Injecting emscripten-abi on emscripten-wasm32 --- packages/mambajs/src/solver.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/mambajs/src/solver.ts b/packages/mambajs/src/solver.ts index 74a5cb6..8f4a8a2 100644 --- a/packages/mambajs/src/solver.ts +++ b/packages/mambajs/src/solver.ts @@ -48,6 +48,11 @@ export const solveConda = async (options: ISolveOptions): Promise => { logger.log('Solving environment...'); } + if (platform === 'emscripten-wasm32') { + // Injecting emscripten-abi so that 4.x takes precedence if both 3.x and 4.x are valid + specs = ['emscripten-abi', ...specs] + } + try { const startSolveTime = performance.now(); From 6cb60e048b4e8476d22382c47536fc29b7cd5c84 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 18 Feb 2026 13:54:49 +0100 Subject: [PATCH 3/5] Up --- packages/mambajs/src/solver.ts | 8 ++------ unittests/tests/mixed/test-install2.ts | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/mambajs/src/solver.ts b/packages/mambajs/src/solver.ts index 8f4a8a2..86f8660 100644 --- a/packages/mambajs/src/solver.ts +++ b/packages/mambajs/src/solver.ts @@ -48,16 +48,12 @@ export const solveConda = async (options: ISolveOptions): Promise => { logger.log('Solving environment...'); } - if (platform === 'emscripten-wasm32') { - // Injecting emscripten-abi so that 4.x takes precedence if both 3.x and 4.x are valid - specs = ['emscripten-abi', ...specs] - } - try { const startSolveTime = performance.now(); const result = (await simpleSolve( - specs, + // Injecting emscripten-abi so that 4.x takes precedence if both 3.x and 4.x are valid + platform === 'emscripten-wasm32' ? ['emscripten-abi', ...specs] : specs, formattedChannels.channels.map(channelName => { // TODO Support picking mirror // Always picking the first mirror for now diff --git a/unittests/tests/mixed/test-install2.ts b/unittests/tests/mixed/test-install2.ts index 945a4dd..1023dfa 100644 --- a/unittests/tests/mixed/test-install2.ts +++ b/unittests/tests/mixed/test-install2.ts @@ -6,7 +6,7 @@ const logger = new TestLogger(); const yml = ` channels: - - https://repo.prefix.dev/emscripten-forge-dev + - https://repo.prefix.dev/emscripten-forge - https://repo.prefix.dev/conda-forge dependencies: - pandas From 06e95abb0da719c751b54794c78b37c6f3542b7b Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 18 Feb 2026 14:03:46 +0100 Subject: [PATCH 4/5] Update alias to point to the new channel --- packages/mambajs-core/src/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mambajs-core/src/types.ts b/packages/mambajs-core/src/types.ts index 1afc866..eb47544 100644 --- a/packages/mambajs-core/src/types.ts +++ b/packages/mambajs-core/src/types.ts @@ -27,11 +27,11 @@ export const DEFAULT_CHANNELS: ILock['channels'] = [ export const DEFAULT_CHANNELS_INFO: ILock['channelInfo'] = { 'emscripten-forge': [ { - url: 'https://prefix.dev/emscripten-forge-dev', + url: 'https://prefix.dev/emscripten-forge', protocol: 'https' }, { - url: 'https://repo.prefix.dev/emscripten-forge-dev', + url: 'https://repo.prefix.dev/emscripten-forge', protocol: 'https' } ], From 2687f61f6c2393b61bb4d8fbe62fd5f84a10ac04 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 18 Feb 2026 14:14:56 +0100 Subject: [PATCH 5/5] Remove emsripten-abi injection --- packages/mambajs/src/solver.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mambajs/src/solver.ts b/packages/mambajs/src/solver.ts index 86f8660..74a5cb6 100644 --- a/packages/mambajs/src/solver.ts +++ b/packages/mambajs/src/solver.ts @@ -52,8 +52,7 @@ export const solveConda = async (options: ISolveOptions): Promise => { const startSolveTime = performance.now(); const result = (await simpleSolve( - // Injecting emscripten-abi so that 4.x takes precedence if both 3.x and 4.x are valid - platform === 'emscripten-wasm32' ? ['emscripten-abi', ...specs] : specs, + specs, formattedChannels.channels.map(channelName => { // TODO Support picking mirror // Always picking the first mirror for now