Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schema/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class MatchspecTable(StrictBaseModel):
channel: NonEmptyStr | None = Field(
None,
description="The channel the packages needs to be fetched from",
examples=["conda-forge", "pytorch", "https://repo.prefix.dev/conda-forge"],
examples=["conda-forge", "pytorch", "https://prefix.dev/conda-forge"],
)
subdir: NonEmptyStr | None = Field(
None, description="The subdir of the package, also known as platform"
Expand Down
2 changes: 2 additions & 0 deletions tests/integration_python/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
platforms = ["{CURRENT_PLATFORM}"]
"""

CONDA_FORGE_CHANNEL = "https://prefix.dev/conda-forge"


class ExitCode(IntEnum):
SUCCESS = 0
Expand Down
6 changes: 3 additions & 3 deletions tests/integration_python/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from .common import exec_extension
from .common import exec_extension, CONDA_FORGE_CHANNEL


def pytest_addoption(parser: pytest.Parser) -> None:
Expand All @@ -23,9 +23,9 @@ def pixi(request: pytest.FixtureRequest) -> Path:

@pytest.fixture
def tmp_pixi_workspace(tmp_path: Path) -> Path:
pixi_config = """
pixi_config = f"""
# Reset to defaults
default-channels = ["conda-forge"]
default-channels = ["{CONDA_FORGE_CHANNEL}"]
shell.change-ps1 = true
tls-no-verify = false
detached-environments = false
Expand Down
14 changes: 7 additions & 7 deletions tests/integration_python/test_edge_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import tomli
import tomli_w

from .common import CURRENT_PLATFORM, verify_cli_command, ExitCode
from .common import CURRENT_PLATFORM, verify_cli_command, ExitCode, CONDA_FORGE_CHANNEL


@pytest.mark.extra_slow
Expand Down Expand Up @@ -414,7 +414,7 @@ def test_installation_pypi_conda_mismatch(


def test_pypi_url_fragment_in_project_deps(tmp_pixi_workspace: Path, pixi: Path) -> None:
pyproject_content = """
pyproject_content = f"""
[project]
version = "0.1.0"
name = "test"
Expand All @@ -428,11 +428,11 @@ def test_pypi_url_fragment_in_project_deps(tmp_pixi_workspace: Path, pixi: Path)
build-backend = "hatchling.build"

[tool.pixi.workspace]
platforms = ["linux-64", "osx-arm64", "win-64"]
channels = ["https://prefix.dev/conda-forge"]
platforms = ["{CURRENT_PLATFORM}"]
channels = ["{CONDA_FORGE_CHANNEL}"]

[tool.pixi.pypi-dependencies]
test = { path = ".", editable = true }
test = {{ path = ".", editable = true }}

[tool.hatch.metadata]
allow-direct-references = true
Expand Down Expand Up @@ -516,7 +516,7 @@ def test_issue_4123_cache_prevents_editable_install(

(proj1 / "pixi.toml").write_text(f"""[project]
name = "proj1"
channels = ["conda-forge"]
channels = ["{CONDA_FORGE_CHANNEL}"]
platforms = ["{CURRENT_PLATFORM}"]
[dependencies]
python = "3.12.*"
Expand All @@ -531,7 +531,7 @@ def test_issue_4123_cache_prevents_editable_install(

(proj2 / "pixi.toml").write_text(f"""[project]
name = "proj2"
channels = ["conda-forge"]
channels = ["{CONDA_FORGE_CHANNEL}"]
platforms = ["{CURRENT_PLATFORM}"]
[dependencies]
python = "3.12.*"
Expand Down
1 change: 1 addition & 0 deletions tests/integration_python/test_main_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,7 @@ def test_pixi_task_list_json(
assert task_data == snapshot


@pytest.mark.extra_slow
def test_info_output_extended(
pixi: Path, tmp_pixi_workspace: Path, snapshot: SnapshotAssertion
) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_python/test_reinstall.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def reinstall_workspace(tmp_pixi_workspace: Path, mock_projects: Path) -> Path:
return tmp_pixi_workspace


@pytest.mark.slow
@pytest.mark.extra_slow
def test_pixi_reinstall_default_env(pixi: Path, reinstall_workspace: Path) -> None:
env = {
"PIXI_CACHE_DIR": str(reinstall_workspace.joinpath("pixi_cache")),
Expand Down
2 changes: 1 addition & 1 deletion tests/integration_rust/upgrade_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async fn pypi_dependency_index_preserved_on_upgrade() {
let pixi = PixiControl::from_manifest(&format!(
r#"
[workspace]
channels = ["conda-forge"]
channels = ["https://prefix.dev/conda-forge"]
platforms = ["{platform}"]
exclude-newer = "2025-05-19"

Expand Down
Loading