Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions vinca/platforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

_PLATFORM_BY_SYSTEM_AND_MACHINE = {
("linux", "aarch64"): "linux-aarch64",
("linux", "riscv64"): "linux-riscv64",
("linux", "x86_64"): "linux-64",
("darwin", "arm64"): "osx-arm64",
}
Expand Down
1 change: 1 addition & 0 deletions vinca/resolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
map_platform_python_to_conda = {
"linux-64": "linux",
"linux-aarch64": "linux",
"linux-riscv64": "linux",
"osx-64": "osx",
"osx-arm64": "osx",
"win-64": "win64",
Expand Down
11 changes: 10 additions & 1 deletion vinca/test_platforms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest

from vinca import platforms
from vinca import config, platforms, resolve


def test_explicit_conda_subdir_wins(monkeypatch):
Expand All @@ -14,6 +14,7 @@ def test_explicit_conda_subdir_wins(monkeypatch):
[
("linux", "x86_64", "linux-64"),
("linux", "aarch64", "linux-aarch64"),
("linux", "riscv64", "linux-riscv64"),
("darwin", "arm64", "osx-arm64"),
("darwin", "x86_64", "osx-64"),
("win32", "AMD64", "win-64"),
Expand Down Expand Up @@ -42,3 +43,11 @@ def test_unknown_linux_machine_is_rejected(monkeypatch):

with pytest.raises(RuntimeError, match="system='linux'.*machine='mips'"):
platforms.get_conda_subdir()


@pytest.mark.parametrize("subdir", ["linux-64", "linux-aarch64", "linux-riscv64"])
def test_linux_subdirs_use_the_linux_dependency_mapping(monkeypatch, subdir):
monkeypatch.setattr(config, "selected_platform", subdir)
conda_index = [{"pkg": {"robostack": {"linux": "linux-pkg", "osx": "osx-pkg"}}}]

assert resolve.resolve_pkgname_from_indexes("pkg", conda_index) == "linux-pkg"
Loading