Skip to content

Commit 3bc5876

Browse files
authored
test: move target folder (prefix-dev#2542)
`target-pixi` to `target/pixi` Fits to convention of rust-analyzer and cargo-nextest. Also this way `cargo clean` removes that directory as well
1 parent 0638d86 commit 3bc5876

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

.github/workflows/rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
cache: true
134134
- uses: Swatinem/rust-cache@v2
135135
with:
136-
workspaces: ". -> target-pixi"
136+
workspaces: ". -> target/pixi"
137137
key: ${{ hashFiles('pixi.lock') }}
138138
- name: Test pixi
139139
run: pixi run test-slow

.github/workflows/test_common_wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: ${{ matrix.arch.name }} - Test Installation of Common Wheels
99
runs-on: ${{ matrix.arch.os }}
1010
env:
11-
TARGET_RELEASE: "${{ github.workspace }}/target-pixi/release"
11+
TARGET_RELEASE: "${{ github.workspace }}/target/pixi/release"
1212
LOGS_DIR: "${{ github.workspace }}/tests/wheel_tests/.logs"
1313
SUMMARY_FILE: "${{ github.workspace }}/tests/wheel_tests/.summary.md"
1414
PYTHONIOENCODING: utf-8

.github/workflows/test_downstream.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
timeout-minutes: 30
157157
runs-on: ${{ matrix.arch.os }}
158158
env:
159-
TARGET_RELEASE: "${{ github.workspace }}/target-pixi/release"
159+
TARGET_RELEASE: "${{ github.workspace }}/target/pixi/release"
160160
strategy:
161161
fail-fast: false
162162
matrix:

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ __pycache__
99
site/
1010
.cache
1111
pytest-temp
12-
target-pixi

scripts/activate.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
set CARGO_TARGET_DIR=target-pixi
2+
set CARGO_TARGET_DIR=target/pixi

scripts/activate.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22
set -Eeuo pipefail
3-
export CARGO_TARGET_DIR="target-pixi"
3+
export CARGO_TARGET_DIR="target/pixi"
44
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="clang"
55
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=-fuse-ld=$CONDA_PREFIX/bin/mold"

tests/integration_python/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
1515
@pytest.fixture
1616
def pixi(request: pytest.FixtureRequest) -> Path:
1717
pixi_build = request.config.getoption("--pixi-build")
18-
return Path(__file__).parent.joinpath(f"../../target-pixi/{pixi_build}/pixi")
18+
return Path(__file__).parent.joinpath(f"../../target/pixi/{pixi_build}/pixi")
1919

2020

2121
@pytest.fixture

tests/wheel_tests/test_common_wheels.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def pixi(pytestconfig: pytest.Config) -> pathlib.Path:
8585
# Check if the target directory exists
8686
# This assertion is for the type checker
8787
assert project_root
88-
target_dir = pathlib.Path(project_root).joinpath("target-pixi/release")
88+
target_dir = pathlib.Path(project_root).joinpath("target/pixi/release")
8989
if not target_dir.exists():
9090
pytest.exit("pixi executable not found, run `pixi r build` first")
9191

0 commit comments

Comments
 (0)