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
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ rustflags = [
[env]
# Required for `dist` to work with linux arm targets: https://github.com/axodotdev/cargo-dist/issues/74#issuecomment-2053680080
CC_aarch64_unknown_linux_musl = "aarch64-linux-gnu-gcc"
# Necessary to let `deno_task_shell` know that our executable is called `pixi` instead of `deno`
DENO_EXECUTABLE_NAME = "pixi"

[target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-gnu-gcc"
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ crossbeam-channel = "0.5.14"
csv = "1.3.1"
ctrlc = "3.4.5"
dashmap = "6.1.0"
deno_task_shell = "0.20.3"
deno_task_shell = "0.21.0"
dialoguer = "0.11.0"
digest = "0.10"
dirs = "6.0.0"
Expand Down
4 changes: 2 additions & 2 deletions pixi_docs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":{"subdir":"linux-64"},"packages":{},"packages.conda":{"deno-0.1.0-hb0f4dca_0.conda":{"arch":"x86_64","build":"hb0f4dca_0","build_number":0,"depends":[],"md5":"0b8e0df380c48280aa2dd07638c5e4da","name":"deno","platform":"linux","sha256":"355d4eb0702bec8c594ead99788d28cf2fd45d1c74232c36d141f673606912a9","size":1153,"subdir":"linux-64","timestamp":1743598985535,"version":"0.1.0"}},"repodata_version":2}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":{"subdir":"noarch"},"packages":{},"packages.conda":{},"repodata_version":2}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":{"subdir":"osx-64"},"packages":{},"packages.conda":{"deno-0.1.0-h0dc7051_0.conda":{"arch":"x86_64","build":"h0dc7051_0","build_number":0,"depends":[],"md5":"a7dedac45cc5b964d98811f653b29e09","name":"deno","platform":"osx","sha256":"f0058f53dbbe8b1f68e00dac1d5f137a452344e009286e88814fe2daf750df7a","size":1151,"subdir":"osx-64","timestamp":1743598985623,"version":"0.1.0"}},"repodata_version":2}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":{"subdir":"osx-arm64"},"packages":{},"packages.conda":{"deno-0.1.0-h60d57d3_0.conda":{"arch":"arm64","build":"h60d57d3_0","build_number":0,"depends":[],"md5":"d0062f73aca159bbf60e57cde7f48049","name":"deno","platform":"osx","sha256":"3e8a1829a6f9bba59e27c424857288c8ef9704e13bc266ca8d341a77710d4577","size":1153,"subdir":"osx-arm64","timestamp":1743598985578,"version":"0.1.0"}},"repodata_version":2}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":{"subdir":"win-64"},"packages":{},"packages.conda":{"deno-0.1.0-h9490d1a_0.conda":{"arch":"x86_64","build":"h9490d1a_0","build_number":0,"depends":[],"md5":"a70cbf9de5c2c14d2087519f5e6cae1f","name":"deno","platform":"win","sha256":"8e572bc4382aab6e4987dc3b1803b565a23c58c17b63ea0843da44eb5faa3015","size":1142,"subdir":"win-64","timestamp":1743598985482,"version":"0.1.0"}},"repodata_version":2}
1 change: 1 addition & 0 deletions tests/data/channels/mappings.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"completions_channel_1.yaml" = "completions_channel_1"
"deno_channel.yaml" = "deno_channel"
"dummy_channel_1.yaml" = "dummy_channel_1"
"dummy_channel_2.yaml" = "dummy_channel_2"
"multiple_versions_channel_1_010.yaml" = "multiple_versions_channel_1"
Expand Down
20 changes: 20 additions & 0 deletions tests/data/channels/recipes/deno_channel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
recipe:
name: deno-channel
version: 1.0.0

outputs:
- package:
name: deno
version: 0.1.0

build:
script:
- mkdir -p $PREFIX/bin
- if: win
then:
- echo "@echo off" > $PREFIX/bin/deno.bat
- echo "echo deno" >> $PREFIX/bin/deno.bat
else:
- echo "#!/usr/bin/env bash" > $PREFIX/bin/deno
- echo "echo deno" >> $PREFIX/bin/deno
- chmod +x $PREFIX/bin/deno
5 changes: 5 additions & 0 deletions tests/integration_python/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,10 @@ def post_link_script_channel(channels: Path) -> str:
return channels.joinpath("post_link_script_channel").as_uri()


@pytest.fixture
def deno_channel(channels: Path) -> str:
return channels.joinpath("deno_channel").as_uri()


def doc_pixi_workspaces() -> Path:
return Path(__file__).parents[2].joinpath("docs", "source_files", "pixi_workspaces")
21 changes: 21 additions & 0 deletions tests/integration_python/test_run_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,27 @@ def test_run_help(pixi: Path, tmp_pixi_workspace: Path) -> None:
)


def test_run_deno(pixi: Path, tmp_pixi_workspace: Path, deno_channel: str) -> None:
"""Ensure that `pixi run deno` will just be forwarded instead of calling pixi"""
manifest = tmp_pixi_workspace.joinpath("pixi.toml")
toml = f"""
[project]
name = "test"
channels = ["{deno_channel}"]
platforms = ["linux-64", "osx-64", "osx-arm64", "win-64"]

[dependencies]
deno = "*"
"""
manifest.write_text(toml)

verify_cli_command(
[pixi, "run", "--manifest-path", manifest, "deno"],
stdout_contains="deno",
stdout_excludes="pixi",
)


def test_run_dry_run(pixi: Path, tmp_pixi_workspace: Path) -> None:
manifest = tmp_pixi_workspace.joinpath("pixi.toml")
toml = f"""
Expand Down
Loading