Merge ~liushuyu-011/ubuntu/+source/python-cramjam:ubuntu/devel into ubuntu/+source/python-cramjam:ubuntu/devel

Proposed by Zixing Liu
Status: Merged
Merged at revision: 07b413e9baf933b9588058f84de0d87f8b13ac45
Proposed branch: ~liushuyu-011/ubuntu/+source/python-cramjam:ubuntu/devel
Merge into: ubuntu/+source/python-cramjam:ubuntu/devel
Diff against target: 76 lines (+28/-16)
2 files modified
debian/changelog (+7/-0)
debian/patches/0001-Tweak-versioned-dependencies.patch (+21/-16)
Reviewer Review Type Date Requested Status
Graham Inggs (community) Approve
Benjamin Drung (community) Needs Fixing
Review via email: mp+467617@code.launchpad.net

Description of the change

This MP fixes the build by matching the Rust crate versions of the package with the versions available in the archive.

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :
Revision history for this message
Benjamin Drung (bdrung) wrote (last edit ):

It does not build (anymore) with librust-brotli-dev 6.0.0-1:
```
error: failed to select a version for the requirement `brotli = "^3"`
candidate versions found which didn't match: 6.0.0
```

review: Needs Fixing
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

Done. Revised the patch to upgrade `brotli` to `^6`

Revision history for this message
Graham Inggs (ginggs) wrote :

Looks good to me, uploaded!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 5ba5c1e..d22300b 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+python-cramjam (2.7.0.1+ds1-2ubuntu1) oracular; urgency=medium
7+
8+ * d/p/0001-Tweak-versioned-dependencies.patch: further upgrades pyo3 and zstd
9+ in Cargo.toml to match the versions available in the archive.
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Mon, 17 Jun 2024 14:01:52 -0600
12+
13 python-cramjam (2.7.0.1+ds1-2) unstable; urgency=medium
14
15 * Increase timeout to improve testsuite reliability
16diff --git a/debian/patches/0001-Tweak-versioned-dependencies.patch b/debian/patches/0001-Tweak-versioned-dependencies.patch
17index ea00662..8a9acb6 100644
18--- a/debian/patches/0001-Tweak-versioned-dependencies.patch
19+++ b/debian/patches/0001-Tweak-versioned-dependencies.patch
20@@ -8,10 +8,10 @@ Subject: Tweak versioned dependencies
21 libcramjam/Cargo.toml | 2 +-
22 3 files changed, 3 insertions(+), 3 deletions(-)
23
24-diff --git a/Cargo.lock b/Cargo.lock
25-index e668d71..d41b316 100644
26---- a/Cargo.lock
27-+++ b/Cargo.lock
28+Index: python-cramjam/Cargo.lock
29+===================================================================
30+--- python-cramjam.orig/Cargo.lock
31++++ python-cramjam/Cargo.lock
32 @@ -244,7 +244,7 @@ dependencies = [
33
34 [[package]]
35@@ -21,24 +21,29 @@ index e668d71..d41b316 100644
36 source = "registry+https://github.com/rust-lang/crates.io-index"
37 checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
38 dependencies = [
39-diff --git a/cramjam-python/Cargo.toml b/cramjam-python/Cargo.toml
40-index 611042d..3c20597 100644
41---- a/cramjam-python/Cargo.toml
42-+++ b/cramjam-python/Cargo.toml
43-@@ -19,5 +19,5 @@ extension-module = ["pyo3/extension-module"]
44+Index: python-cramjam/cramjam-python/Cargo.toml
45+===================================================================
46+--- python-cramjam.orig/cramjam-python/Cargo.toml
47++++ python-cramjam/cramjam-python/Cargo.toml
48+@@ -19,5 +19,5 @@ extension-module = ["pyo3/extension-modu
49
50 [dependencies]
51 # Python 3.12 support not officially released yet
52 -pyo3 = { git = "https://github.com/PyO3/pyo3.git", rev="90cc69b", default-features = false, features = ["macros"] }
53-+pyo3 = { version = "^0.19", default-features = false, features = ["macros"] }
54++pyo3 = { version = "^0.20", default-features = false, features = ["macros"] }
55 libcramjam = { path = "../libcramjam" }
56-diff --git a/libcramjam/Cargo.toml b/libcramjam/Cargo.toml
57-index f85e86b..a1c1eec 100644
58---- a/libcramjam/Cargo.toml
59-+++ b/libcramjam/Cargo.toml
60-@@ -11,4 +11,4 @@ brotli = { version = "^3", default-features = false, features = ["std"] }
61+Index: python-cramjam/libcramjam/Cargo.toml
62+===================================================================
63+--- python-cramjam.orig/libcramjam/Cargo.toml
64++++ python-cramjam/libcramjam/Cargo.toml
65+@@ -7,8 +7,8 @@ edition = "2021"
66+
67+ [dependencies]
68+ snap = "^1"
69+-brotli = { version = "^3", default-features = false, features = ["std"] }
70++brotli = { version = "^6", default-features = false, features = ["std"] }
71 bzip2 = "^0.4"
72 lz4 = "^1"
73 flate2 = "^1"
74 -zstd = "0.11.1+zstd.1.5.2"
75-+zstd = "0.12.1+zstd.1.5.2"
76++zstd = "^0.13"

Subscribers

People subscribed via source and target branches

to all changes: