Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelzw committed Jun 5, 2024
1 parent b492f5b commit 6f1fe6b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,5 @@ jobs:
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
with:
key: tests
- name: Run clippy
run: pixi run clippy --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }}
- name: Run test
run: pixi run test --color always${{ startsWith(matrix.os, 'ubuntu-latest') && ' --no-default-features --features rustls-tls' || '' }}
1 change: 0 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ platforms = ["osx-arm64", "osx-64", "linux-64", "linux-aarch64", "win-64"]
[tasks]
build = "cargo build --release"
test = "cargo test"
clippy = "cargo clippy"

[dependencies]
rust = "1.77.2"
Expand Down
13 changes: 11 additions & 2 deletions tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@ fn required_fs_objects() -> Vec<&'static str> {
openssl_required_file,
])
} else {
required_fs_objects.extend(vec!["bin/python", "lib", "man", "ssl", openssl_required_file]);
required_fs_objects.extend(vec![
"bin/python",
"lib",
"man",
"ssl",
openssl_required_file,
]);
}
required_fs_objects
}
Expand Down Expand Up @@ -105,7 +111,10 @@ async fn test_simple_python(options: Options, required_fs_objects: Vec<&'static
});
}

#[cfg(not(target_os = "windows"))] // https://github.com/Quantco/pixi-pack/issues/8
// https://github.com/Quantco/pixi-pack/issues/8
#[cfg(not(target_os = "windows"))]
#[cfg(not(all(target_os = "linux", target_arch = "aarch64")))]
#[cfg(not(all(target_os = "macos", target_arch = "x86_64")))]
#[rstest]
#[case("conda")]
#[case("micromamba")]
Expand Down

0 comments on commit 6f1fe6b

Please sign in to comment.