From 9e97f5a2e99e13e70d9d0417e6891e9ce9fd2907 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 11:58:59 +0000 Subject: [PATCH 1/4] Bump the rust-dependencies group across 1 directory with 2 updates Bumps the rust-dependencies group with 2 updates in the / directory: [libherokubuildpack](https://github.com/heroku/libcnb.rs) and [ureq](https://github.com/algesten/ureq). Updates `libherokubuildpack` from 0.26.0 to 0.26.1 - [Release notes](https://github.com/heroku/libcnb.rs/releases) - [Changelog](https://github.com/heroku/libcnb.rs/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/libcnb.rs/compare/v0.26.0...v0.26.1) Updates `ureq` from 2.10.1 to 2.12.1 - [Changelog](https://github.com/algesten/ureq/blob/main/CHANGELOG.md) - [Commits](https://github.com/algesten/ureq/compare/2.10.1...2.12.1) --- updated-dependencies: - dependency-name: libherokubuildpack dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: ureq dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a79959a..41d4e2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -534,9 +534,9 @@ dependencies = [ [[package]] name = "libherokubuildpack" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45070d23cda8614758579eddae211a6267e86bcef8ab75a1cd239eac45a6778d" +checksum = "3a8dd4cecc7b0cf175eb115cf112e7e6b6ff900be9308b83ba3d5f3c14e59bb8" dependencies = [ "termcolor", ] @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.18" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", @@ -981,9 +981,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.10.1" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ "base64", "log", diff --git a/Cargo.toml b/Cargo.toml index 8741cd6..f9fcf08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ indoc = "2" # libcnb has a much bigger impact on buildpack behaviour than any other dependencies, # so it's pinned to an exact version to isolate it from lockfile refreshes. libcnb = "=0.26.0" -libherokubuildpack = { version = "=0.26.0", default-features = false, features = ["log"] } +libherokubuildpack = { version = "=0.26.1", default-features = false, features = ["log"] } serde = "1" tar = { version = "0.4", default-features = false } ureq = { version = "2", default-features = false, features = ["tls"] } From 5d25a20aae9f6ca3292aa5b4d4383e9425718471 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:03:40 +0000 Subject: [PATCH 2/4] Relax libcnb pins In the hope it fixes Dependabot being able to update them. --- Cargo.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f9fcf08..863ca18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,14 +22,12 @@ result_large_err = "allow" [dependencies] indoc = "2" -# libcnb has a much bigger impact on buildpack behaviour than any other dependencies, -# so it's pinned to an exact version to isolate it from lockfile refreshes. -libcnb = "=0.26.0" -libherokubuildpack = { version = "=0.26.1", default-features = false, features = ["log"] } +libcnb = "0.26" +libherokubuildpack = { version = "0.26", default-features = false, features = ["log"] } serde = "1" tar = { version = "0.4", default-features = false } ureq = { version = "2", default-features = false, features = ["tls"] } zstd = { version = "0.13", default-features = false } [dev-dependencies] -libcnb-test = "=0.26.0" +libcnb-test = "0.26" From 359b5c59632ab9bb77018d6bfd516c84068a6b00 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:03:47 +0000 Subject: [PATCH 3/4] Refresh lockfile --- Cargo.lock | 112 ++++++++++++++++++++++------------------------------- 1 file changed, 46 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41d4e2b..4306fa5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -59,32 +59,32 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "cc" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -147,12 +147,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" @@ -407,9 +407,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown", @@ -423,9 +423,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -444,54 +444,54 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libcnb" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98756d5a203c14dc67adc4e0419e83ddacaef6ef6bd9ac198cf55e310509ac1f" +checksum = "6d08771539bfa8546047d1e97604d934cc434666c95888bccc5160d842278ffe" dependencies = [ "libcnb-common", "libcnb-data", "libcnb-proc-macros", "serde", - "thiserror 2.0.3", + "thiserror", "toml", ] [[package]] name = "libcnb-common" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19256408316a00c350f6babf3a6ae974264e9440e5ac7bfe9649431bce97aaf4" +checksum = "837b27a670357054c97b755e948c17b0c7178779cd184ab829ee3b1509dff9e1" dependencies = [ "serde", - "thiserror 2.0.3", + "thiserror", "toml", ] [[package]] name = "libcnb-data" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3938870d11721a0d3466b7daefd09362b6851a3277b3930fc41e449185d7c553" +checksum = "0a6e0e25605a6da2a74d0330df8956c2c435025af45d916702b18122d111b3ae" dependencies = [ "fancy-regex", "libcnb-proc-macros", "serde", - "thiserror 2.0.3", + "thiserror", "toml", "uriparse", ] [[package]] name = "libcnb-package" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690a25b9a256a76c145fdd66a65277a099148a9a38ceec2eb2ebcb3a70ef1f41" +checksum = "ffb06ce67952c76d479680fbfc37454644131a105802757b4a5e30f00079c3fe" dependencies = [ "cargo_metadata", "ignore", @@ -499,16 +499,16 @@ dependencies = [ "libcnb-common", "libcnb-data", "petgraph", - "thiserror 2.0.3", + "thiserror", "uriparse", "which", ] [[package]] name = "libcnb-proc-macros" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be015e5279a2848ef937cc797cecf6432354b6a74c72530b0b07e6e36800f65" +checksum = "c0e218641e04ebb8400e838aa2a6d62a81cd44447bb0ba98aa36467a014d6a3a" dependencies = [ "cargo_metadata", "fancy-regex", @@ -518,9 +518,9 @@ dependencies = [ [[package]] name = "libcnb-test" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46991106f2bbe68e141ea3fbc02452493dc52677c39ede22a5918fc130e5c23" +checksum = "0f3311c2924ee267451cbf9fd67fedad4d3960f2819decc67b590255bd5cadd6" dependencies = [ "fastrand", "fs_extra", @@ -529,7 +529,7 @@ dependencies = [ "libcnb-package", "regex", "tempfile", - "thiserror 2.0.3", + "thiserror", ] [[package]] @@ -691,15 +691,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -831,9 +831,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -885,38 +885,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" -dependencies = [ - "thiserror-impl 2.0.3", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", From 1d385f72c1f360ce9d720db4ef6101358df4cb9c Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 10 Dec 2024 12:12:09 +0000 Subject: [PATCH 4/4] Add changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc0e873..bbcb5ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fixed colour resetting for build output header, error and warning messages. ([#303](https://github.com/heroku/buildpacks-python/pull/303) / [heroku/libcnb.rs#890](https://github.com/heroku/libcnb.rs/pull/890)) + ## [0.20.0] - 2024-12-10 ### Changed