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
8 changes: 5 additions & 3 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ jobs:
shell: bash

- name: Run Tests
run: cargo test --frozen --all-features
run: cargo test --frozen --all-features -- --nocapture
shell: bash

- name: Find Environments
if: matrix.run_cli == 'yes'
run: cargo run --release --target ${{ matrix.target }}
shell: bash

builds:
name: Builds
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -183,7 +183,9 @@ jobs:
shell: bash

- name: Run Tests
run: cargo test --frozen --all-features
# We do not want to run all features, CI is only for tests with Python
# Thats a separate job.
run: cargo test --frozen
shell: bash

- name: Build
Expand Down
3 changes: 3 additions & 0 deletions crates/pet-conda/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ pet-core = { path = "../pet-core" }
pet-utils = { path = "../pet-utils" }
log = "0.4.21"
regex = "1.10.4"

[features]
ci = []
10 changes: 2 additions & 8 deletions crates/pet-conda/src/environment_locations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,7 @@ pub fn get_known_conda_install_locations(env_vars: &EnvVariables) -> Vec<PathBuf
known_paths.push(PathBuf::from(conda_prefix.clone()));
}
if let Some(ref conda) = env_vars.conda {
let conda = PathBuf::from(conda);
if let Some(parent) = conda.parent() {
known_paths.push(parent.to_path_buf());
}
known_paths.push(PathBuf::from(conda));
}
if let Some(home) = env_vars.clone().home {
known_paths.push(home.clone().join("anaconda3"));
Expand Down Expand Up @@ -233,10 +230,7 @@ pub fn get_known_conda_install_locations(env_vars: &EnvVariables) -> Vec<PathBuf
known_paths.push(PathBuf::from(conda_prefix.clone()));
}
if let Some(ref conda) = env_vars.conda {
let conda = PathBuf::from(conda);
if let Some(parent) = conda.parent() {
known_paths.push(parent.to_path_buf());
}
known_paths.push(PathBuf::from(conda));
}
if let Some(ref home) = env_vars.home {
known_paths.push(home.clone().join("anaconda"));
Expand Down
1 change: 1 addition & 0 deletions crates/pet-conda/src/environments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ pub fn get_activation_command(

#[cfg(test)]
mod tests {
#[cfg(windows)]
use super::*;

#[test]
Expand Down
Loading