Merge ~maxgmr/ubuntu/+source/ruby-scientist:merge-lp2133826 into ubuntu/+source/ruby-scientist:ubuntu/devel

Proposed by Max Gilmour
Status: Needs review
Proposed branch: ~maxgmr/ubuntu/+source/ruby-scientist:merge-lp2133826
Merge into: ubuntu/+source/ruby-scientist:ubuntu/devel
Diff against target: 61 lines (+27/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/series (+1/-0)
debian/patches/use-system-rake.patch (+17/-0)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+496923@code.launchpad.net

Description of the change

This fixes LP: #2133826. The autopkgtests were failing because they were trying to use the bundled rake instead of the system rake. I patched the test so it uses the system rake.

The previously-failing autopkgtests now pass, which will allow this package to migrate: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-maxgmr-plusone/resolute/amd64/r/ruby-scientist/20251204_000255_942b5@/log.gz

To post a comment you must log in.
Revision history for this message
Max Gilmour (maxgmr) wrote :

I forwarded the patch to Debian here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121922

Unmerged commits

d6dcefa... by Max Gilmour

Update changelog

edb7e45... by Max Gilmour

Update maintainers

c0221dc... by Max Gilmour

d/p/{series,use-system-rake.patch}: Use system-wide rake for tests

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 8f9685c..98f7524 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+ruby-scientist (1.6.5-1ubuntu1) resolute; urgency=medium
7+
8+ * d/p/{series,use-system-rake.patch}: Use system-wide rake for tests
9+ (LP: #2133826)
10+
11+ -- Max Gilmour <max.gilmour@canonical.com> Wed, 03 Dec 2025 13:51:43 -0800
12+
13 ruby-scientist (1.6.5-1) unstable; urgency=medium
14
15 * Team upload.
16diff --git a/debian/control b/debian/control
17index ce1e397..f4dd2ed 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,7 +1,8 @@
21 Source: ruby-scientist
22 Section: ruby
23 Priority: optional
24-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
27 Uploaders: Pirate Praveen <praveen@debian.org>
28 Build-Depends: debhelper-compat (= 13),
29 gem2deb (>= 1),
30diff --git a/debian/patches/series b/debian/patches/series
31index 2e87fab..ce977bc 100644
32--- a/debian/patches/series
33+++ b/debian/patches/series
34@@ -2,3 +2,4 @@ remove-bundler.patch
35 disable-failing-test.patch
36 no-git-in-gemspec.patch
37 adjust-gemfile-for-autopkgtest.patch
38+use-system-rake.patch
39diff --git a/debian/patches/use-system-rake.patch b/debian/patches/use-system-rake.patch
40new file mode 100644
41index 0000000..adb7684
42--- /dev/null
43+++ b/debian/patches/use-system-rake.patch
44@@ -0,0 +1,17 @@
45+Description: Use system rake instead of bundled rake
46+ This package is configured to use apt installed build dependencies, so the
47+ bundler can't find rake because it's installed system-wide.
48+ .
49+ This patch fixes that issue by using the system rake instead of a bundled one.
50+Author: Max Gilmour <max.gilmour@canonical.com>
51+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ruby-scientist/+bug/2133826
52+Last-Update: 2025-12-03
53+---
54+--- a/script/test
55++++ b/script/test
56+@@ -4,4 +4,4 @@
57+ set -e
58+
59+ cd $(dirname "$0")/..
60+- script/bootstrap && bundle exec rake test
61++ script/bootstrap && rake test

Subscribers

People subscribed via source and target branches