Merge lp:~ricardokirkner/click-toolbelt/debian into lp:click-toolbelt

Proposed by Ricardo Kirkner on 2015-12-28
Status: Merged
Approved by: Colin Watson on 2016-01-08
Approved revision: 59
Merged at revision: 52
Proposed branch: lp:~ricardokirkner/click-toolbelt/debian
Merge into: lp:click-toolbelt
Diff against target: 174 lines (+75/-13)
10 files modified
debian/changelog (+5/-0)
debian/compat (+1/-0)
debian/control (+23/-0)
debian/copyright (+22/-0)
debian/rules (+7/-0)
debian/source/format (+1/-0)
debian/source/options (+2/-0)
debian/tests/control (+1/-0)
requirements.txt (+8/-8)
storeapi/tests/test_common.py (+5/-5)
To merge this branch: bzr merge lp:~ricardokirkner/click-toolbelt/debian
Reviewer Review Type Date Requested Status
Colin Watson 2015-12-28 Approve on 2016-01-08
Review via email: mp+281390@code.launchpad.net

Commit message

added debian packaging support

Description of the change

Prepare project to be packaged for Ubuntu.

click-toolbelt is going to be a dependency of snapcraft, and therefore must be packaged in order to land the branch that adds the code depending on click-toolbelt.

To post a comment you must log in.
52. By Ricardo Kirkner on 2016-01-05

better dependency tracking in control file

53. By Ricardo Kirkner on 2016-01-05

better debian rules for pybuild

54. By Ricardo Kirkner on 2016-01-05

added test for DEP-8 smoketest

55. By Ricardo Kirkner on 2016-01-08

remove pre-packaging history

56. By Ricardo Kirkner on 2016-01-08

merged in latest trunk

57. By Ricardo Kirkner on 2016-01-08

merged in latest trunk

58. By Ricardo Kirkner on 2016-01-08

updated changelog for 0.5.0 release

Colin Watson (cjwatson) :
review: Approve
59. By Ricardo Kirkner on 2016-01-08

fixed debian changelog entry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== added file 'debian/changelog'
3--- debian/changelog 1970-01-01 00:00:00 +0000
4+++ debian/changelog 2016-01-08 15:42:28 +0000
5@@ -0,0 +1,5 @@
6+click-toolbelt (0.5.0) xenial; urgency=low
7+
8+ * Initial release.
9+
10+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 08 Jan 2016 12:27:00 -0300
11
12=== added file 'debian/compat'
13--- debian/compat 1970-01-01 00:00:00 +0000
14+++ debian/compat 2016-01-08 15:42:28 +0000
15@@ -0,0 +1,1 @@
16+9
17
18=== added file 'debian/control'
19--- debian/control 1970-01-01 00:00:00 +0000
20+++ debian/control 2016-01-08 15:42:28 +0000
21@@ -0,0 +1,23 @@
22+Source: click-toolbelt
23+Section: utils
24+Priority: extra
25+Maintainer: Canonical Online Services <onlineservices@lists.launchpad.net>
26+Build-Depends: debhelper (>= 9),
27+ dh-python,
28+ python3-all (>= 3.4),
29+ python3-mock,
30+ python3-responses
31+Homepage: https://launchpad.net/click-toolbelt
32+Standards-Version: 3.9.6
33+
34+Package: click-toolbelt
35+Architecture: all
36+Depends: python3-cliff,
37+ python3-requests-oauthlib,
38+ python3-requests,
39+ python3-xdg,
40+ python3-ssoclient,
41+ ${misc:Depends},
42+ ${python3:Depends}
43+Description: set of tools to work with click packages
44+ Click Toolbelt is a set of tools to make it easier to work with click (and snap) packages.
45
46=== added file 'debian/copyright'
47--- debian/copyright 1970-01-01 00:00:00 +0000
48+++ debian/copyright 2016-01-08 15:42:28 +0000
49@@ -0,0 +1,22 @@
50+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
51+Upstream-Name: click-toolbelt
52+Upstream-Contact: Canonical Online Services <onlineservices@lists.launchpad.net>
53+Source: https://launchpad.net/click-toolbelt
54+
55+Files: *
56+Copyright: 2015 Canonical Ltd
57+License: GPL-3
58+ This program is free software: you can redistribute it and/or modify
59+ it under the terms of the GNU General Public License version 3 as
60+ published by the Free Software Foundation.
61+ .
62+ This program is distributed in the hope that it will be useful,
63+ but WITHOUT ANY WARRANTY; without even the implied warranty of
64+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
65+ GNU General Public License for more details.
66+ .
67+ You should have received a copy of the GNU General Public License
68+ along with this program. If not, see <http://www.gnu.org/licenses/>.
69+ .
70+ On Debian systems, the full text of the GNU General Public License
71+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
72
73=== added file 'debian/rules'
74--- debian/rules 1970-01-01 00:00:00 +0000
75+++ debian/rules 2016-01-08 15:42:28 +0000
76@@ -0,0 +1,7 @@
77+#!/usr/bin/make -f
78+# -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-
79+
80+export PYBUILD_NAME = click-toolbelt
81+
82+%:
83+ dh $@ --with python3 --buildsystem=pybuild
84
85=== added directory 'debian/source'
86=== added file 'debian/source/format'
87--- debian/source/format 1970-01-01 00:00:00 +0000
88+++ debian/source/format 2016-01-08 15:42:28 +0000
89@@ -0,0 +1,1 @@
90+3.0 (native)
91
92=== added file 'debian/source/options'
93--- debian/source/options 1970-01-01 00:00:00 +0000
94+++ debian/source/options 2016-01-08 15:42:28 +0000
95@@ -0,0 +1,2 @@
96+# Ignore standard files (like .bzr)
97+tar-ignore
98
99=== added directory 'debian/tests'
100=== added file 'debian/tests/control'
101--- debian/tests/control 1970-01-01 00:00:00 +0000
102+++ debian/tests/control 2016-01-08 15:42:28 +0000
103@@ -0,0 +1,1 @@
104+Test-Command: python3 -c "import click_toolbelt; print(click_toolbelt.__version__)"
105
106=== modified file 'requirements.txt'
107--- requirements.txt 2015-12-09 19:10:19 +0000
108+++ requirements.txt 2016-01-08 15:42:28 +0000
109@@ -1,8 +1,8 @@
110-cliff==1.15.0
111-coverage==4.0.1
112-mock==1.0.1
113-pyxdg==0.25
114-requests==2.8.1
115-requests-oauthlib==0.5.0
116-ssoclient==2.1
117-responses==0.5.0
118+cliff
119+coverage
120+mock
121+pyxdg
122+requests
123+requests-oauthlib
124+ssoclient
125+responses
126
127=== modified file 'storeapi/tests/test_common.py'
128--- storeapi/tests/test_common.py 2016-01-08 14:20:13 +0000
129+++ storeapi/tests/test_common.py 2016-01-08 15:42:28 +0000
130@@ -58,7 +58,7 @@
131 def test_get_success(self):
132 response_data = {'response': 'value'}
133 responses.add(responses.GET, 'http://example.com/path',
134- json=response_data)
135+ body=json.dumps(response_data))
136
137 result = myapps_api_call('/path')
138 self.assertEqual(result, {
139@@ -71,7 +71,7 @@
140 def test_get_error(self):
141 response_data = {'response': 'error'}
142 responses.add(responses.GET, 'http://example.com/path',
143- json=response_data, status=500)
144+ body=json.dumps(response_data), status=500)
145
146 result = myapps_api_call('/path')
147 self.assertEqual(result, {
148@@ -84,7 +84,7 @@
149 def test_post_success(self):
150 response_data = {'response': 'value'}
151 responses.add(responses.POST, 'http://example.com/path',
152- json=response_data)
153+ body=json.dumps(response_data))
154
155 result = myapps_api_call('/path', method='POST')
156 self.assertEqual(result, {
157@@ -97,7 +97,7 @@
158 def test_post_error(self):
159 response_data = {'response': 'value'}
160 responses.add(responses.POST, 'http://example.com/path',
161- json=response_data, status=500)
162+ body=json.dumps(response_data), status=500)
163
164 result = myapps_api_call('/path', method='POST')
165 self.assertEqual(result, {
166@@ -125,7 +125,7 @@
167 def test_post_with_data(self):
168 response_data = {'response': 'value'}
169 responses.add(responses.POST, 'http://example.com/path',
170- json=response_data)
171+ body=json.dumps(response_data))
172
173 result = myapps_api_call(
174 '/path', method='POST', data={'request': 'value'})

Subscribers

People subscribed via source and target branches