From 284b24de0d4b0560483b3afa8ad4994ead15585a Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Fri, 3 Jan 2025 15:18:53 +0100 Subject: [PATCH 1/2] use current platform by default --- tests/integration_python/common.py | 6 ++++-- tests/integration_python/test_main_cli.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/integration_python/common.py b/tests/integration_python/common.py index f2054ae36..91455e3a6 100644 --- a/tests/integration_python/common.py +++ b/tests/integration_python/common.py @@ -9,13 +9,15 @@ PIXI_VERSION = "0.39.4" -ALL_PLATFORMS = '["linux-64", "osx-64", "win-64", "linux-ppc64le", "linux-aarch64"]' +ALL_PLATFORMS = '["linux-64", "osx-64", "osx-arm64", "win-64", "linux-ppc64le", "linux-aarch64"]' + +CURRENT_PLATFORM = str(Platform.current()) EMPTY_BOILERPLATE_PROJECT = f""" [project] name = "test" channels = [] -platforms = {ALL_PLATFORMS} +platforms = {CURRENT_PLATFORM} """ diff --git a/tests/integration_python/test_main_cli.py b/tests/integration_python/test_main_cli.py index 4d863a712..fddd8ff7e 100644 --- a/tests/integration_python/test_main_cli.py +++ b/tests/integration_python/test_main_cli.py @@ -1,7 +1,7 @@ import os from pathlib import Path -from .common import verify_cli_command, ExitCode, PIXI_VERSION, ALL_PLATFORMS +from .common import verify_cli_command, ExitCode, PIXI_VERSION, CURRENT_PLATFORM import tomllib import json import pytest @@ -570,8 +570,8 @@ def test_upgrade_dependency_location_pixi(pixi: Path, tmp_path: Path) -> None: test = ["pytest==6"] [tool.pixi.project] -channels = ["conda-forge"] -platforms = {ALL_PLATFORMS} +channels = ["https://prefix.dev/conda-forge"] +platforms = {CURRENT_PLATFORM} [tool.pixi.pypi-dependencies] polars = "==0.*" From 8be55dbf9967d463c548beb403ca4ed48f0bcd74 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Fri, 3 Jan 2025 15:52:13 +0100 Subject: [PATCH 2/2] fix: platform array --- tests/integration_python/common.py | 2 +- tests/integration_python/test_main_cli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration_python/common.py b/tests/integration_python/common.py index 91455e3a6..baa384c26 100644 --- a/tests/integration_python/common.py +++ b/tests/integration_python/common.py @@ -17,7 +17,7 @@ [project] name = "test" channels = [] -platforms = {CURRENT_PLATFORM} +platforms = ["{CURRENT_PLATFORM}"] """ diff --git a/tests/integration_python/test_main_cli.py b/tests/integration_python/test_main_cli.py index fddd8ff7e..58376aedc 100644 --- a/tests/integration_python/test_main_cli.py +++ b/tests/integration_python/test_main_cli.py @@ -571,7 +571,7 @@ def test_upgrade_dependency_location_pixi(pixi: Path, tmp_path: Path) -> None: [tool.pixi.project] channels = ["https://prefix.dev/conda-forge"] -platforms = {CURRENT_PLATFORM} +platforms = ["{CURRENT_PLATFORM}"] [tool.pixi.pypi-dependencies] polars = "==0.*"