Skip to content

Commit 0576bca

Browse files
committed
Fix lints
1 parent 0ab67c1 commit 0576bca

File tree

43 files changed

+243
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+243
-319
lines changed

.github/workflows/backends-python-bindings.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
- uses: actions/checkout@v4
3535
with:
3636
submodules: recursive
37-
- uses: prefix-dev/setup-pixi@main
37+
persist-credentials: false
38+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
3839
with:
3940
manifest-path: pixi-build-backends/py-pixi-build-backend/pixi.toml
4041
environments: ci

.github/workflows/backends-ros.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
- uses: actions/checkout@v4
3434
with:
3535
submodules: recursive
36-
- uses: prefix-dev/setup-pixi@main
36+
persist-credentials: false
37+
- uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
3738
with:
3839
manifest-path: pixi-build-backends/backends/pixi-build-ros/pixi.toml
3940
- name: Run mypy

.github/workflows/backends-rust.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

Cargo.lock

Lines changed: 13 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude = [
1010
"pixi-build-backends",
1111
"tests/data",
1212
"trampoline",
13-
"pytest-temp"
13+
"pytest-temp",
1414
]
1515
members = ["crates/*"]
1616
resolver = "3"
@@ -31,21 +31,20 @@ assert_matches = "1.5.0"
3131
async-fd-lock = "0.2.0"
3232
async-once-cell = "0.5.4"
3333
async-trait = "0.1.86"
34-
cargo_toml = "0.22.3"
35-
clap-verbosity-flag = "3.0.2"
3634
axum = "0.8"
3735
barrier_cell = { path = "crates/barrier_cell" }
3836
base64 = "0.22.1"
37+
cargo_toml = "0.22.3"
3938
chrono = "0.4.40"
4039
clap = { version = "4.5.31", default-features = false }
40+
clap-verbosity-flag = "3.0.2"
4141
clap_complete = "4.5.46"
4242
clap_complete_nushell = "4.5.5"
4343
# Rattler crates
4444
coalesced_map = "0.1.2"
4545
comfy-table = "7.2.1"
4646
console = "0.16.1"
4747
# Force crc to 3.3.0 to satisfy both lzma-rs (^3.0.0) and lzma-rust2 (=3.3.0)
48-
crc = "=3.3.0"
4948
console-subscriber = "0.5.0"
5049
crossbeam-channel = "0.5.14"
5150
csv = "1.3.1"
@@ -132,16 +131,12 @@ pixi_uv_conversions = { path = "crates/pixi_uv_conversions" }
132131
pixi_variant = { path = "crates/pixi_variant" }
133132
# Pixi build backends
134133
pixi-build-backend = { path = "crates/pixi-build-backend" }
135-
pixi-build-cmake = { path = "crates/pixi-build-cmake" }
136-
pixi-build-mojo = { path = "crates/pixi-build-mojo" }
137-
pixi-build-python = { path = "crates/pixi-build-python" }
138-
pixi-build-rattler-build = { path = "crates/pixi-build-rattler-build" }
139-
pixi-build-rust = { path = "crates/pixi-build-rust" }
140134
pypi_mapping = { path = "crates/pypi_mapping" }
141135
pypi_modifiers = { path = "crates/pypi_modifiers" }
142136
pyproject-toml = "0.13.7"
143137
rand = { version = "0.9.1", default-features = false }
144138
rattler = { version = "0.39.0", default-features = false }
139+
rattler-build = { git = "https://github.com/prefix-dev/rattler-build", branch = "main", default-features = false }
145140
rattler_cache = { version = "0.6.2", default-features = false }
146141
rattler_conda_types = { version = "0.42.0", default-features = false, features = [
147142
"rayon",
@@ -161,7 +156,6 @@ rattler_upload = { version = "0.4.5", default-features = false, features = [
161156
"s3",
162157
] }
163158
rattler_virtual_packages = { version = "2.3.0", default-features = false }
164-
rattler-build = { git = "https://github.com/prefix-dev/rattler-build", branch = "main", default-features = false }
165159
rayon = "1.10.0"
166160
recipe-stage0 = { path = "crates/recipe-stage0" }
167161
regex = "1.11.1"

crates/pixi-build-backend/Cargo.toml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
2+
edition.workspace = true
23
name = "pixi-build-backend"
34
version = "0.1.5"
4-
edition.workspace = true
55

66
[features]
77
default = ["rustls-tls"]
@@ -17,36 +17,35 @@ clap = { workspace = true, features = ["derive", "env"] }
1717
clap-verbosity-flag = { workspace = true }
1818
fs-err = { workspace = true }
1919
indexmap = { workspace = true }
20-
ordermap = { workspace = true }
2120
itertools = { workspace = true }
2221
miette = { workspace = true }
2322
minijinja = { workspace = true }
24-
rattler_conda_types = { workspace = true }
25-
rattler_virtual_packages = { workspace = true }
23+
ordermap = { workspace = true }
24+
pathdiff = { workspace = true }
2625
rattler-build = { workspace = true }
26+
rattler_conda_types = { workspace = true }
2727
rattler_digest = { workspace = true }
28+
rattler_virtual_packages = { workspace = true }
2829
serde = { workspace = true, features = ["derive"] }
29-
serde_yaml = { workspace = true }
3030
serde_json = { workspace = true }
31+
serde_yaml = { workspace = true }
3132
tempfile = { workspace = true }
33+
thiserror = { workspace = true }
3234
tokio = { workspace = true, features = ["macros"] }
33-
tracing-subscriber = { workspace = true }
3435
tracing = { workspace = true }
36+
tracing-subscriber = { workspace = true }
3537
url = { workspace = true }
36-
pathdiff = { workspace = true }
37-
thiserror = { workspace = true }
3838

3939
pixi_build_types = { workspace = true }
4040

41-
jsonrpc-stdio-server = { workspace = true }
42-
jsonrpc-http-server = { workspace = true }
4341
jsonrpc-core = { workspace = true }
42+
jsonrpc-http-server = { workspace = true }
43+
jsonrpc-stdio-server = { workspace = true }
4444
recipe-stage0 = { workspace = true }
4545

4646

4747
[dev-dependencies]
4848
insta = { version = "1.42.1", features = ["yaml", "redactions", "filters"] }
49-
toml_edit = { version = "0.24.0" }
5049
toml = { version = "0.9.0" }
5150

5251
[package.metadata.cargo-shear]

crates/pixi-build-cmake/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
2-
name = "pixi-build-cmake"
3-
version = "0.3.7"
42
description = "CMake build backend for Pixi"
53
edition.workspace = true
4+
name = "pixi-build-cmake"
5+
version = "0.3.7"
66

77
[features]
88
default = ["rustls-tls"]
9-
rustls-tls = ["pixi-build-backend/rustls-tls", "rattler-build/rustls-tls"]
109
native-tls = ["pixi-build-backend/native-tls", "rattler-build/native-tls"]
10+
rustls-tls = ["pixi-build-backend/rustls-tls", "rattler-build/rustls-tls"]
1111

1212
[dependencies]
1313
async-trait = { workspace = true }
@@ -25,7 +25,6 @@ tokio = { workspace = true, features = ["macros"] }
2525
[dev-dependencies]
2626
insta = { workspace = true, features = ["yaml", "redactions", "filters"] }
2727
rstest = { workspace = true }
28+
serde_json = { workspace = true }
2829
strum = { workspace = true }
2930
tempfile = { workspace = true }
30-
fs-err = { workspace = true }
31-
serde_json = { workspace = true }

crates/pixi-build-cmake/pixi.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[package.build.backend]
2-
name = "pixi-build-rust"
3-
version = "*"
42
channels = [
53
"https://prefix.dev/pixi-build-backends",
64
"https://prefix.dev/conda-forge",
75
]
6+
name = "pixi-build-rust"
7+
version = "*"
88

99
[package.run-dependencies]
1010
pixi-build-api-version = ">=4,<5"

crates/pixi-build-cmake/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mod tests {
7676
use super::CMakeBackendConfig;
7777

7878
#[test]
79-
fn test_ensure_deseralize_from_empty() {
79+
fn test_ensure_deserialize_from_empty() {
8080
let json_data = json!({});
8181
serde_json::from_value::<CMakeBackendConfig>(json_data).unwrap();
8282
}

0 commit comments

Comments
 (0)