From cdaac5cbe742881d7fee58cae682897968bcddef Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 15 Nov 2024 11:51:35 -0500 Subject: [PATCH] Allow rstest 0.23 and rstest_reuse 0.7.0 --- rust-time.spec | 2 ++ rust2rpm.toml | 1 + time-fix-metadata-auto.diff | 2 +- time-fix-metadata.diff | 16 +++++++++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/rust-time.spec b/rust-time.spec index b2e3eef..e208ace 100644 --- a/rust-time.spec +++ b/rust-time.spec @@ -17,6 +17,8 @@ Patch: time-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * remove WASM-specific features # * remove references to tests that are not included in published crates +# * allow rstest 0.23.0 and rstest_reuse 0.7.0: +# https://github.com/time-rs/time/pull/716 Patch: time-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 diff --git a/rust2rpm.toml b/rust2rpm.toml index e747d44..ca3754a 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -2,5 +2,6 @@ cargo-toml-patch-comments = [ "remove WASM-specific features", "remove references to tests that are not included in published crates", + "allow rstest 0.23.0 and rstest_reuse 0.7.0: https://github.com/time-rs/time/pull/716", ] diff --git a/time-fix-metadata-auto.diff b/time-fix-metadata-auto.diff index 8239afe..894a25e 100644 --- a/time-fix-metadata-auto.diff +++ b/time-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- time-0.3.36/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ time-0.3.36/Cargo.toml 2024-04-16T18:10:30.905494+00:00 ++++ time-0.3.36/Cargo.toml 2024-11-15T16:49:54.222829+00:00 @@ -175,18 +175,7 @@ "alloc", "deranged/std", diff --git a/time-fix-metadata.diff b/time-fix-metadata.diff index ee163c7..fe04bdc 100644 --- a/time-fix-metadata.diff +++ b/time-fix-metadata.diff @@ -1,5 +1,5 @@ --- time-0.3.36/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ time-0.3.36/Cargo.toml 2024-04-16T18:11:27.146149+00:00 ++++ time-0.3.36/Cargo.toml 2024-11-15T16:51:13.742970+00:00 @@ -53,15 +53,6 @@ [lib] bench = false @@ -16,6 +16,20 @@ [dependencies.deranged] version = "0.3.9" features = ["powerfmt"] +@@ -111,11 +102,11 @@ + default-features = false + + [dev-dependencies.rstest] +-version = "0.18.2" ++version = ">=0.18.2, <0.24.0" + default-features = false + + [dev-dependencies.rstest_reuse] +-version = "0.6.0" ++version = ">=0.6.0, <0.8.0" + + [dev-dependencies.serde] + version = "1.0.184" @@ -175,7 +166,6 @@ "alloc", "deranged/std",