Skip to content

Commit 5113b58

Browse files
committed
More updates
1 parent 90c5735 commit 5113b58

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

.github/workflows/testing.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,16 @@ jobs:
383383
uses: dtolnay/rust-toolchain@stable
384384
- name: Cache Rust dependencies
385385
uses: Swatinem/[email protected]
386-
- name: Install Pixi
387-
uses: prefix-dev/[email protected]
388-
with:
389-
pixi-version: v0.57.0
390386
- name: Build package
391387
run: cargo build --release
392388
- name: Run creation
393389
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 5
394390
shell: bash
391+
- name: Install Pixi
392+
uses: prefix-dev/[email protected]
393+
with:
394+
manifest-path: ${{ env.WORKING_DIR }}/pyproject.toml
395+
pixi-version: v0.57.0
395396
- name: Set up Python
396397
working-directory: ${{ env.WORKING_DIR }}
397398
run: pixi add python=="${{ env.MIN_PYTHON_VERSION }}.*"
@@ -417,15 +418,16 @@ jobs:
417418
uses: dtolnay/rust-toolchain@stable
418419
- name: Cache Rust dependencies
419420
uses: Swatinem/[email protected]
420-
- name: Install Pixi
421-
uses: prefix-dev/[email protected]
422-
with:
423-
pixi-version: v0.57.0
424421
- name: Build package
425422
run: cargo build --release
426423
- name: Run creation
427424
run: ./scripts/ci_run.sh ${{ matrix.project_type }} 5
428425
shell: bash
426+
- name: Install Pixi
427+
uses: prefix-dev/[email protected]
428+
with:
429+
manifest-path: ${{ env.WORKING_DIR }}/pyproject.toml
430+
pixi-version: v0.57.0
429431
- name: Set up Python
430432
working-directory: ${{ env.WORKING_DIR }}
431433
run: pixi add python=="${{ env.MIN_PYTHON_VERSION }}.*"

src/dev_dependency_installer.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ fn setuptools_dev_dependency_installer(project_info: &ProjectInfo) -> Result<()>
8080
}
8181
}
8282

83+
let python_bin = if cfg!(windows) {
84+
".venv/Scripts/python.exe"
85+
} else {
86+
".venv/bin/python"
87+
};
88+
8389
let packages = determine_dev_packages(project_info)?;
8490
let package_specs: Vec<String> = packages.iter().map(format_package_with_extras).collect();
8591

8692
let mut args = vec!["-m", "pip", "install"];
8793
let package_refs: Vec<&str> = package_specs.iter().map(|s| s.as_str()).collect();
8894
args.extend(package_refs);
8995

90-
let python_bin = if cfg!(windows) {
91-
".venv/Scripts/python.exe"
92-
} else {
93-
".venv/bin/python"
94-
};
95-
9696
let output = std::process::Command::new(python_bin)
9797
.args(args)
9898
.current_dir(project_info.base_dir())

0 commit comments

Comments
 (0)