git-ubuntu

Merge ~racb/git-ubuntu:snap-vendoring-updates into git-ubuntu:master

  1. Git
  2. lp:~racb/git-ubuntu
  3. snap-vendoring-updates
  4. Merge into master
Proposed by Robie Basak
Status: Merged
Merged at revision: 99d1d36771ec02ffa5763a3572626067603a79e4
Proposed branch: ~racb/git-ubuntu:snap-vendoring-updates
Merge into: git-ubuntu:master
Diff against target: 257 lines (+48/-25)
3 files modified
doc/STYLE.md (+3/-0)
setup.py (+1/-1)
snap/snapcraft.yaml (+44/-24)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Server Team CI bot continuous-integration Approve
git-ubuntu developers Pending
Review via email: mp+344705@code.launchpad.net

Description of the change

This fixes the currently broken snap build.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:99d1d36771ec02ffa5763a3572626067603a79e4
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/421/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/421/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1, thanks for organizing things

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/STYLE.md b/doc/STYLE.md
2index 4d88d5b..497edf0 100644
3--- a/doc/STYLE.md
4+++ b/doc/STYLE.md
5@@ -27,3 +27,6 @@
6 function a keyword parameter with a default instead.
7
8 * Subcommand modules must be leaves. No cycles in the import graphs.
9+
10+ * In snapcraft.yaml, cache external dependencies on our infrastructure
11+ wherever possible.
12diff --git a/setup.py b/setup.py
13index 0fcb081..0c2fcd5 100644
14--- a/setup.py
15+++ b/setup.py
16@@ -14,7 +14,7 @@ setup(name='gitubuntu',
17 'argcomplete==1.8.1',
18 'python-debian==0.1.31',
19 'pygit2==0.24.2',
20- 'launchpadlib==1.10.5',
21+ 'launchpadlib==1.10.6',
22 'petname',
23 'setuptools',
24 'keyrings.alt==2.2',
25diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
26index ccfcc3e..8afe338 100644
27--- a/snap/snapcraft.yaml
28+++ b/snap/snapcraft.yaml
29@@ -59,8 +59,10 @@ parts:
30 gbp:
31 plugin: python
32 python-version: python3
33- source: https://github.com/agx/git-buildpackage/archive/debian/0.9.6.tar.gz
34+ # from https://github.com/agx/git-buildpackage/archive/debian/0.9.6.tar.gz
35+ source: https://people.canonical.com/~rbasak/git-ubuntu/github-gbp-debian-0.9.6.tar.gz
36 source-type: tar
37+ source-checksum: sha384/5c9be5a0cdcd0c2a89de2470617361d5f891befa854f32a40e96b2443668fef2068456bf6bcb5ac11c92a0487531a782
38 requirements: requirements.txt
39 stage:
40 - -usr/bin/py*
41@@ -71,8 +73,10 @@ parts:
42 after: [git, pristine-tar, python3]
43 git:
44 plugin: autotools
45- source: https://github.com/git/git/archive/v2.14.3.tar.gz
46+ # from https://github.com/git/git/archive/v2.14.3.tar.gz
47+ source: https://people.canonical.com/~rbasak/git-ubuntu/github-git-v2.14.3.tar.gz
48 source-type: tar
49+ source-checksum: sha384/0d28faa4cc66b81ab262f44433b24261cbd39851648723d6701dd5463ab8fb6989b18d46523a4e238a697a1ef78db938
50 build-packages:
51 - libz-dev
52 - gettext
53@@ -88,14 +92,16 @@ parts:
54 - libio-pty-perl
55 dpkg:
56 plugin: autotools
57- # generated with
58+ # generated with, in a Bionic container:
59+ # sudo apt update && sudo apt -y install autoconf autopoint pkg-config libtool libncursesw5-dev gettext po4a
60 # git clone https://anonscm.debian.org/git/dpkg/dpkg.git -b 1.18.24
61 # cd dpkg
62 # autoreconf -f -i
63 # ./configure
64 # make dist
65- source: https://people.canonical.com/~nacc/dpkg-1.18.24.tar.xz
66+ source: https://people.canonical.com/~rbasak/git-ubuntu/dpkg-1.18.24.tar.xz
67 source-type: tar
68+ source-checksum: sha384/54539fcf0f303ac4a2cff70f3f8fcf01325d2f84e757de02812d54d7603475c750b72380fab41b135930d5726c7dc541
69 configflags:
70 - --prefix=/usr
71 - --sysconfdir=/etc
72@@ -107,14 +113,16 @@ parts:
73 - libncursesw5-dev
74 xz-utils:
75 plugin: autotools
76- source: https://github.com/xz-mirror/xz/releases/download/v5.2.2/xz-5.2.2.tar.xz
77+ # from https://github.com/xz-mirror/xz/releases/download/v5.2.2/xz-5.2.2.tar.xz
78+ source: https://people.canonical.com/~rbasak/git-ubuntu/xz-5.2.2.tar.xz
79 source-type: tar
80 source-checksum: sha384/ccb584d0325497eb4c7dbba930c0fff388efe2cbc3636507ba654084948965cc18325ca4835f972c8083db4e381fbbdc
81 configflags: [--prefix=/usr]
82 after: [dpkg]
83 tar:
84 plugin: x-tar
85- source: https://ftp.gnu.org/gnu/tar/tar-1.29.tar.xz
86+ # from https://ftp.gnu.org/gnu/tar/tar-1.29.tar.xz
87+ source: https://people.canonical.com/~rbasak/git-ubuntu/tar-1.29.tar.xz
88 source-type: tar
89 source-checksum: sha384/b7d517a81a74c649893cb56958a06edabca7e6c67df9ec5c9c67b974216a4ef2e0eb427dc6d1e1a80c91c89e0b6ac751
90 after: [xz-utils]
91@@ -124,7 +132,7 @@ parts:
92 # git clone https://anonscm.debian.org/git/users/lamont/xdelta.git -b v1.1.3-9
93 # cd xdelta
94 # git archive --prefix xdelta-$(git describe)/ -o ../xdelta-$(git describe).tar.gz HEAD
95- source: https://people.canonical.com/~nacc/xdelta-v1.1.3-9.tar.gz
96+ source: https://people.canonical.com/~rbasak/git-ubuntu/xdelta-v1.1.3-9.tar.gz
97 source-type: tar
98 source-checksum: sha384/441b051fb9a4941ffb49efb0e82184227c9a9299cdd63d5d814f27f0017bceb2ef624615448268d34edaf696604fe62e
99 build-packages:
100@@ -133,7 +141,8 @@ parts:
101 - zlib1g-dev
102 xdelta3:
103 plugin: autotools
104- source: https://github.com/jmacd/xdelta/archive/v3.0.11.tar.gz
105+ # from https://github.com/jmacd/xdelta/archive/v3.0.11.tar.gz
106+ source: https://people.canonical.com/~rbasak/git-ubuntu/github-jmacd-xdelta-v3.0.11.tar.gz
107 source-type: tar
108 source-checksum: sha384/c1c0b70aa064b5bd02857d3547720fb3581752882e1ebb7391afb8e270e10b654a8b7bcf114ac1073c2787c9a115c03b
109 build: |
110@@ -154,7 +163,7 @@ parts:
111 # cd pristine-tar
112 # # git describe can't be used due to upstream tag issue
113 # git archive --prefix pristine-tar-1.41/ -o ../pristine-tar-1.41.tar.gz HEAD
114- source: https://people.canonical.com/~nacc/pristine-tar-1.41.tar.gz
115+ source: https://people.canonical.com/~rbasak/git-ubuntu/pristine-tar-1.41.tar.gz
116 source-type: tar
117 source-checksum: sha384/0c202500d368051711bd7e827a29a6d93f9eba37ddee4950e1b24d510d9347635111b4e7dc716bd837a7f5c4d40e6238
118 prepare: |
119@@ -174,9 +183,10 @@ parts:
120 launchpadlib:
121 plugin: python
122 python-version: python3
123- source: https://github.com/nacc/launchpadlib.git
124- source-type: git
125- source-branch: master
126+ # from https://launchpad.net/ubuntu/+source/python-launchpadlib/1.10.6-1
127+ source: https://launchpad.net/ubuntu/+archive/primary/+files/python-launchpadlib_1.10.6.orig.tar.gz
128+ source-type: tar
129+ source-checksum: sha384/fd87f3f02e86179e8bc8e07f52ca8aad59db93c7dd53057198b77fe4591593cda4a29d935b6e8a8386f6f6ddb83d4762
130 stage:
131 - -usr/bin/py*
132 - -usr/bin/2to3*
133@@ -186,7 +196,8 @@ parts:
134 - -usr/lib/python3.6
135 after: [python3]
136 python2:
137- source: http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz
138+ # from http://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz
139+ source: https://people.canonical.com/~rbasak/git-ubuntu/Python-2.7.14.tar.xz
140 source-type: tar
141 source-checksum: sha384/b5f8304a9f3f368625798cb6c9ba0d1fa4b3142f83f5039d8de59e9f70a36c4250a734f27ec27c16268dc8f9502c007e
142 plugin: autotools
143@@ -201,7 +212,8 @@ parts:
144 # packages
145 after: [ubuntutools-python2]
146 python3:
147- source: http://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz
148+ # from http://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz
149+ source: https://people.canonical.com/~rbasak/git-ubuntu/Python-3.6.3.tar.xz
150 source-type: tar
151 source-checksum: sha384/72597cc86c893031af194404c97c5e15114cfb75833fab0dc53b4bc08f5928b094d5b4d405edc9543087970944790f70
152 plugin: autotools
153@@ -223,7 +235,7 @@ parts:
154 # git clone https://git.launchpad.net/ubuntu-dev-tools -b 0.161
155 # cd ubuntu-dev-tools
156 # git archive --prefix ubuntu-dev-tools-$(git describe)/ -o ../ubuntu-dev-tools-$(git describe).tar.gz HEAD
157- source: https://people.canonical.com/~nacc/ubuntu-dev-tools-0.161.tar.gz
158+ source: https://people.canonical.com/~rbasak/git-ubuntu/ubuntu-dev-tools-0.161.tar.gz
159 source-checksum: sha384/98fe630d6f644155b49b15c57b5d4f9f47bd918cc074359f5b5ac3fa283506b8fc2d557127f1b47dd2bd66e681c17104
160 stage:
161 - -usr/bin/py*
162@@ -238,7 +250,7 @@ parts:
163 # git clone https://git.launchpad.net/ubuntu-dev-tools -b 0.161
164 # cd ubuntu-dev-tools
165 # git archive --prefix ubuntu-dev-tools-$(git describe)/ -o ../ubuntu-dev-tools-$(git describe).tar.gz HEAD
166- source: https://people.canonical.com/~nacc/ubuntu-dev-tools-0.161.tar.gz
167+ source: https://people.canonical.com/~rbasak/git-ubuntu/ubuntu-dev-tools-0.161.tar.gz
168 source-checksum: sha384/98fe630d6f644155b49b15c57b5d4f9f47bd918cc074359f5b5ac3fa283506b8fc2d557127f1b47dd2bd66e681c17104
169 stage:
170 - -usr/bin/py*
171@@ -257,7 +269,7 @@ parts:
172 # cd distro-info
173 # #can't use git describe because of the upstream tag names
174 # git archive --prefix distro-info-0.17/ -o ../distro-info-0.17.tar.gz HEAD
175- source: https://people.canonical.com/~nacc/distro-info-0.17.tar.gz
176+ source: https://people.canonical.com/~rbasak/git-ubuntu/distro-info-0.17.tar.gz
177 source-checksum: sha384/2192b97c15a5c1669ac8acdcaa37766a3898b440b14156422bef322dc4f42b2159f2ec87e49e818801bde0f0c359cb38
178 source-subdir: python
179 stage:
180@@ -271,7 +283,8 @@ parts:
181 after: [python3]
182 libgpg-error:
183 plugin: autotools
184- source: https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
185+ # from https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
186+ source: https://people.canonical.com/~rbasak/git-ubuntu/libgpg-error-1.27.tar.bz2
187 source-type: tar
188 source-checksum: sha384/cf2e9e7ce6b5ed993b3f8f1d45f1d72b07a30544533142c48f1515d9fc1638fe976c639febca0b838489f6c34dc2f36d
189 configflags: [--prefix=/usr]
190@@ -279,7 +292,8 @@ parts:
191 - -usr/share/info
192 libgcrypt:
193 plugin: autotools
194- source: https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2
195+ # from https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2
196+ source: https://people.canonical.com/~rbasak/git-ubuntu/libgcrypt-1.8.1.tar.bz2
197 source-type: tar
198 source-checksum: sha384/823b1e4a0c8d5dad5aabe0b192a92734ed95ccb3ba468483b3b6cd2765157458b620db0b020739d15397ddad81a93a3e
199 configflags: [--prefix=/usr]
200@@ -287,7 +301,8 @@ parts:
201 - -usr/share/info
202 libassuan:
203 plugin: autotools
204- source: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
205+ # from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
206+ source: https://people.canonical.com/~rbasak/git-ubuntu/libassuan-2.5.1.tar.bz2
207 source-type: tar
208 source-checksum: sha384/e9bf675bd385e5bbe3fa8edf5632715b2fad67877c185ed12777caa6e985b2b967ccd836132ac3d28a10319057874d3d
209 configflags: [--prefix=/usr]
210@@ -296,7 +311,8 @@ parts:
211 - -usr/share/info
212 libksba:
213 plugin: autotools
214- source: https://gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2
215+ # from https://gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2
216+ source: https://people.canonical.com/~rbasak/git-ubuntu/libksba-1.3.5.tar.bz2
217 source-type: tar
218 source-checksum: sha384/7264394452d4ee0da9014949abd5b163d928a1c1216b7008653e04d6090d3cfad2a0a978e7159cee599a319cc5d7f574
219 configflags: [--prefix=/usr]
220@@ -304,7 +320,8 @@ parts:
221 - -usr/share/info
222 npth:
223 plugin: autotools
224- source: https://gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2
225+ # from https://gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2
226+ source: https://people.canonical.com/~rbasak/git-ubuntu/npth-1.5.tar.bz2
227 source-type: tar
228 source-checksum: sha384/48533ecf32da9b02a0f627c074479c211b75ee2bc005aa75157ea9e119e6ede38fe7dadfc0f64eb5b937edfec033a8bc
229 configflags: [--prefix=/usr]
230@@ -312,7 +329,8 @@ parts:
231 - -usr/share/info
232 gnupg2:
233 plugin: autotools
234- source: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
235+ # from https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.4.tar.bz2
236+ source: https://people.canonical.com/~rbasak/git-ubuntu/gnupg-2.2.4.tar.bz2
237 source-type: tar
238 source-checksum: sha384/94926c62260c2a9552015ca155935a61578b1f3b06d3dbf080414007b95ceb2008bf0f86f69e0ea22996d27974befd9c
239 configflags:
240@@ -348,7 +366,8 @@ parts:
241 pylint:
242 plugin: python
243 python-version: python3
244- source: https://github.com/PyCQA/pylint/archive/pylint-1.7.2.tar.gz
245+ # from https://github.com/PyCQA/pylint/archive/pylint-1.7.2.tar.gz
246+ source: https://people.canonical.com/~rbasak/git-ubuntu/pylint-1.7.2.tar.gz
247 source-type: tar
248 source-checksum: sha384/64b4f1fb40d80eb8cfbaa7aa9bf603e8194a882c2689b9a56157216244d834b0c9998467aeb093c8a3b478a10bfe3be6
249 stage:
250@@ -406,6 +425,7 @@ parts:
251 - ubuntutools-python3
252 - python3
253 - devscripts
254+ - launchpadlib
255 wrappers:
256 source: snap/
257 plugin: dump

Subscribers

People subscribed via source and target branches