Skip to content

Commit

Permalink
chore: prepare release 0.32.0 (#1252)
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv authored Dec 10, 2024
1 parent c24de58 commit b9d67d7
Show file tree
Hide file tree
Showing 17 changed files with 282 additions and 291 deletions.
440 changes: 219 additions & 221 deletions Cargo.lock

Large diffs are not rendered by default.

75 changes: 31 additions & 44 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["rust-tests"]

[package]
name = "rattler-build"
version = "0.31.1"
version = "0.32.0"
authors = ["rattler-build contributors <[email protected]>"]
repository = "https://github.com/prefix-dev/rattler-build"
edition = "2021"
Expand Down Expand Up @@ -48,61 +48,61 @@ required-features = ["recipe-generation"]
serde = { version = "1.0.215", features = ["derive"] }
serde_yaml = "0.9.34"
serde-untagged = "0.1.6"
anyhow = "1.0.93"
anyhow = "1.0.94"
walkdir = "2.5.0"
sha2 = "0.10.8"
hex = "0.4.3"
serde_json = "1.0.132"
serde_json = "1.0.133"
reqwest = { version = "0.12.9", default-features = false, features = [
"multipart",
] }
tokio = { version = "1.41.1", features = ["rt", "macros", "rt-multi-thread", "process"] }
tokio = { version = "1.42.0", features = ["rt", "macros", "rt-multi-thread", "process"] }
itertools = "0.13.0"
content_inspector = "0.2.4"
serde_with = "3.11.0"
url = "2.5.3"
tracing = "0.1.40"
clap = { version = "4.5.21", features = ["derive", "env", "cargo"] }
url = "2.5.4"
tracing = "0.1.41"
clap = { version = "4.5.23", features = ["derive", "env", "cargo"] }
minijinja = { version = "=2.4.0", features = [
"unstable_machinery",
"custom_syntax",
] }
tracing-subscriber = { version = "0.3.18", features = [
tracing-subscriber = { version = "0.3.19", features = [
"env-filter",
"fmt",
"ansi",
"json",
] }
marked-yaml = { version = "0.7.1" }
miette = { version = "7.2.0", features = ["fancy"] }
miette = { version = "7.4.0", features = ["fancy"] }
num_cpus = "1.16.0"
goblin = "0.9.2"
scroll = "0.12.0"
pathdiff = "0.2.2"
pathdiff = "0.2.3"
comfy-table = "7.1.3"
futures = "0.3.31"
indicatif = "0.17.9"
console = { version = "0.15.8", features = ["windows-console-colors"] }
thiserror = "2.0.3"
thiserror = "2.0.6"
tempfile = "3.14.0"
chrono = "0.4.38"
chrono = "0.4.39"
sha1 = "0.10.6"
spdx = "0.10.7"
ignore = "0.4.23"
globset = "0.4.15"
clap-verbosity-flag = "2.2.3"
tracing-core = "0.1.32"
clap-verbosity-flag = "3.0.1"
tracing-core = "0.1.33"
petgraph = "0.6.5"
indexmap = "2.6.0"
indexmap = "2.7.0"
dunce = "1.0.5"
fs-err = "3.0.0"
which = "7.0.0"
clap_complete = "4.5.38"
clap_complete_nushell = "4.5.4"
tokio-util = "0.7.12"
tokio-util = "0.7.13"

tar = "0.4.43"
zip = { version = "2.2.0", default-features = false, features = [
zip = { version = "2.2.1", default-features = false, features = [
"flate2",
"deflate",
] }
Expand All @@ -116,39 +116,39 @@ memmap2 = "0.9.5"
reqwest-middleware = "0.4.0"
rattler_installs_packages = { version = "0.10.0", default-features = false, optional = true }
async-once-cell = "0.5.4"
terminal_size = "0.4.0"
terminal_size = "0.4.1"
memchr = "2.7.4"
ratatui = { version = "0.29.0", optional = true }
crossterm = { version = "0.28.1", features = ["event-stream"], optional = true }
ansi-to-tui = { version = "7.0.0", optional = true }
throbber-widgets-tui = { version = "0.8", optional = true }
tui-input = { version = "0.11.0", optional = true }
tui-input = { version = "0.11.1", optional = true }
reflink-copy = "0.1.20"
rayon = "1.10.0"
patch = "0.7.0"
regex = "1.11.1"
async-recursion = "1.1.1"

# Rattler crates
rattler = { version = "0.28.2", default-features = false, features = ["cli-tools", "indicatif"] }
rattler_cache = { version = "0.2.10", default-features = false }
rattler_conda_types = { version = "0.29.2", default-features = false }
rattler = { version = "0.28.5", default-features = false, features = ["cli-tools", "indicatif"] }
rattler_cache = { version = "0.2.13", default-features = false }
rattler_conda_types = { version = "0.29.3", default-features = false }
rattler_digest = { version = "1.0.3", default-features = false, features = ["serde"] }
rattler_index = { version = "0.19.36", default-features = false }
rattler_networking = { version = "0.21.5", default-features = false }
rattler_redaction = { version = "0.1.3" }
rattler_repodata_gateway = { version = "0.21.22", default-features = false, features = ["gateway"] }
rattler_shell = { version = "0.22.7", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "1.2.3", default-features = false, features = ["resolvo", "serde"] }
rattler_virtual_packages = { version = "1.1.10", default-features = false }
rattler_package_streaming = { version = "0.22.13", default-features = false }
rattler_index = { version = "0.20.0", default-features = false }
rattler_networking = { version = "0.21.8", default-features = false }
rattler_redaction = { version = "0.1.4" }
rattler_repodata_gateway = { version = "0.21.25", default-features = false, features = ["gateway"] }
rattler_shell = { version = "0.22.8", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "1.2.4", default-features = false, features = ["resolvo", "serde"] }
rattler_virtual_packages = { version = "1.1.11", default-features = false }
rattler_package_streaming = { version = "0.22.16", default-features = false }
lazy_static = "1.5.0"

[dev-dependencies]
insta = { version = "1.41.1", features = ["yaml"] }
rstest = "0.23.0"
tracing-test = "0.2.5"
tracing-indicatif = "0.3.6"
tracing-indicatif = "0.3.8"

[profile.dev.package."*"]
opt-level = 3
Expand All @@ -169,19 +169,6 @@ pre-build = [
# this fork contains fixes for slow zip reading and large file writing
zip = { git = "https://github.com/wolfv/zip2", branch = "patched"}

rattler = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_cache = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_digest = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_index = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_networking = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_redaction = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_shell = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_solve = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "main" }
rattler_package_streaming = { git = "https://github.com/conda/rattler", branch = "main" }

# rattler = { path = "../rattler/crates/rattler" }
# rattler_cache = { path = "../rattler/crates/rattler_cache" }
# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
Expand Down
4 changes: 2 additions & 2 deletions rust-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
glob = "0.3.1"
rattler_package_streaming = { version = "0.22.11", default-features = false }
serde_json = "1.0.132"
rattler_package_streaming = { version = "0.22.16", default-features = false }
serde_json = "1.0.133"
sha1 = "0.10.6"
duct = "0.13.7"
7 changes: 4 additions & 3 deletions src/console_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -508,11 +508,11 @@ pub enum LogStyle {
/// Constructs a default [`EnvFilter`] that is used when the user did not
/// specify a custom RUST_LOG.
pub fn get_default_env_filter(
verbose: clap_verbosity_flag::LevelFilter,
verbose: clap_verbosity_flag::log::LevelFilter,
) -> Result<EnvFilter, ParseError> {
let mut result = EnvFilter::new(format!("rattler_build={verbose}"));

if verbose >= clap_verbosity_flag::LevelFilter::Trace {
if verbose >= clap_verbosity_flag::log::LevelFilter::Trace {
result = result.add_directive(Directive::from_str("resolvo=info")?);
result = result.add_directive(Directive::from_str("rattler=info")?);
result = result.add_directive(Directive::from_str(
Expand Down Expand Up @@ -598,7 +598,8 @@ pub fn init_logging(
let registry =
tracing_subscriber::registry().with(get_default_env_filter(verbosity.log_level_filter())?);

let log_style = if verbosity.log_level_filter() >= clap_verbosity_flag::LevelFilter::Debug {
let log_style = if verbosity.log_level_filter() >= clap_verbosity_flag::log::LevelFilter::Debug
{
LogStyle::Plain
} else {
*log_style
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to parse SPDX license: invalid character(s)
Error:
× Parsing: failed to parse SPDX license: invalid character(s)
See <https://spdx.org/licenses> for the list of valid licenses.
Use 'LicenseRef-<MyLicense>' if you are using a custom license.
╭─[7:22]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to parse URL: relative URL without a base
Error:
× Parsing: failed to parse URL: relative URL without a base
╭─[7:23]
6about:
7homepage: license_urla.asda:://sdskd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ expression: find_outputs_from_src(&src).unwrap_err()
· ╰── here
6host:
╰────
help: multi-output recipes cannot have a top-level requirements field.
Move `requirements` inside the individual output.

help: multi-output recipes cannot have a top-level requirements field. Move
`requirements` inside the individual output.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: missing field `version`
Error:
× Parsing: missing field `version`
╭─[6:11]
5- package:
6 │ ╭─▶ name: bla
╰────
help: the field `version` is required for `package`

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: invalid field `invalid`.
Error:
× Parsing: invalid field `invalid`.
╭─[5:13]
4version: 0.1.0
5invalid: "field"
Expand All @@ -13,4 +14,3 @@ Error: × Parsing: invalid field `invalid`.
6
╰────
help: valid fields for `package` are `name` and `version`

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: missing field `version`
Error:
× Parsing: missing field `version`
╭─[3:17]
2package:
3name: test
Expand All @@ -13,4 +14,3 @@ Error: × Parsing: missing field `version`
4
╰────
help: the field `version` is required for `package`

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: expected a mapping.
Error:
× Parsing: expected a mapping.
╭─[3:17]
2context:
3 │ ╭─▶ - a
Expand All @@ -13,4 +14,3 @@ Error: × Parsing: expected a mapping.
5package:
╰────
help: `context` must always be a mapping

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to render Jinja expression: syntax error: unexpected
Error:
× Parsing: failed to render Jinja expression: syntax error: unexpected
character (in <expression>:1)
╭─[12:11]
11 │ skip:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to render Jinja expression: syntax error: unexpected
Error:
× Parsing: failed to render Jinja expression: syntax error: unexpected
character (in <expression>:1)
╭─[7:7]
6 │ skip:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: expected a mapping.
Error:
× Parsing: expected a mapping.
╭─[2:18]
1
2context: "not-mapping"
Expand All @@ -13,4 +14,3 @@ Error: × Parsing: expected a mapping.
3
╰────
help: `context` must always be a mapping

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: expected a scalar value.
Error:
× Parsing: expected a scalar value.
╭─[3:16]
2context:
3key: ["not-scalar"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to parse YAML: duplicate key.
Error:
× Parsing: failed to parse YAML: duplicate key.
╭─[8:1]
7
8build:
· ──┬──
· ╰── duplicate key here
9string: "1234"
╰────

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ expression: err
---
× Failed to parse recipe

Error: × Parsing: failed to render Jinja expression: unknown function: zcompiler is
Error:
× Parsing: failed to render Jinja expression: unknown function: zcompiler is
│ unknown (in <string>:1)
╭─[7:7]
6 │ host:
Expand Down

0 comments on commit b9d67d7

Please sign in to comment.