Merge lp:~dholbach/click-reviewers-tools/packaging into lp:click-reviewers-tools
- packaging
- Merge into trunk
Proposed by
Daniel Holbach
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 72 | ||||
Proposed branch: | lp:~dholbach/click-reviewers-tools/packaging | ||||
Merge into: | lp:click-reviewers-tools | ||||
Diff against target: |
1205 lines (+882/-54) 24 files modified
.bzr-builddeb/default.conf (+2/-0) COPYING (+674/-0) README (+7/-7) bin/click-check-desktop (+8/-4) bin/click-check-lint (+6/-2) bin/click-check-security (+6/-2) bin/click-check-skeleton (+6/-2) bin/click-run-checks (+22/-13) bin/repack-click (+7/-3) bin/show-click-files (+8/-5) bin/unpack-click (+5/-1) clickreviews/cr_desktop.py (+1/-1) clickreviews/cr_lint.py (+1/-1) clickreviews/cr_security.py (+2/-2) clickreviews/cr_skeleton.py (+1/-1) clickreviews/tests/test_cr_lint.py (+9/-9) debian/changelog (+5/-0) debian/compat (+1/-0) debian/control (+22/-0) debian/copyright (+20/-0) debian/docs (+1/-0) debian/rules (+45/-0) run-tests (+1/-1) setup.py (+22/-0) |
||||
To merge this branch: | bzr merge lp:~dholbach/click-reviewers-tools/packaging | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge (community) | Approve | ||
Review via email: mp+187716@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote : | # |
Revision history for this message
Jamie Strandboge (jdstrand) wrote : | # |
Committed with several changes. Highlights include:
bzr ignore various build files
don't install bin/click-
finetune README for latest commits
bin/click-
bin/click-
various 'import' adjustments for move to clickreviews/
add bin/clickreviews symlink to ../clickreviews
remove sys.path code in bin/*
rename bin/show-
setup.py: only install ./bin/click-*
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory '.bzr-builddeb' |
2 | === added file '.bzr-builddeb/default.conf' |
3 | --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000 |
4 | +++ .bzr-builddeb/default.conf 2013-09-26 11:05:18 +0000 |
5 | @@ -0,0 +1,2 @@ |
6 | +[BUILDDEB] |
7 | +split = True |
8 | |
9 | === added file 'COPYING' |
10 | --- COPYING 1970-01-01 00:00:00 +0000 |
11 | +++ COPYING 2013-09-26 11:05:18 +0000 |
12 | @@ -0,0 +1,674 @@ |
13 | + GNU GENERAL PUBLIC LICENSE |
14 | + Version 3, 29 June 2007 |
15 | + |
16 | + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
17 | + Everyone is permitted to copy and distribute verbatim copies |
18 | + of this license document, but changing it is not allowed. |
19 | + |
20 | + Preamble |
21 | + |
22 | + The GNU General Public License is a free, copyleft license for |
23 | +software and other kinds of works. |
24 | + |
25 | + The licenses for most software and other practical works are designed |
26 | +to take away your freedom to share and change the works. By contrast, |
27 | +the GNU General Public License is intended to guarantee your freedom to |
28 | +share and change all versions of a program--to make sure it remains free |
29 | +software for all its users. We, the Free Software Foundation, use the |
30 | +GNU General Public License for most of our software; it applies also to |
31 | +any other work released this way by its authors. You can apply it to |
32 | +your programs, too. |
33 | + |
34 | + When we speak of free software, we are referring to freedom, not |
35 | +price. Our General Public Licenses are designed to make sure that you |
36 | +have the freedom to distribute copies of free software (and charge for |
37 | +them if you wish), that you receive source code or can get it if you |
38 | +want it, that you can change the software or use pieces of it in new |
39 | +free programs, and that you know you can do these things. |
40 | + |
41 | + To protect your rights, we need to prevent others from denying you |
42 | +these rights or asking you to surrender the rights. Therefore, you have |
43 | +certain responsibilities if you distribute copies of the software, or if |
44 | +you modify it: responsibilities to respect the freedom of others. |
45 | + |
46 | + For example, if you distribute copies of such a program, whether |
47 | +gratis or for a fee, you must pass on to the recipients the same |
48 | +freedoms that you received. You must make sure that they, too, receive |
49 | +or can get the source code. And you must show them these terms so they |
50 | +know their rights. |
51 | + |
52 | + Developers that use the GNU GPL protect your rights with two steps: |
53 | +(1) assert copyright on the software, and (2) offer you this License |
54 | +giving you legal permission to copy, distribute and/or modify it. |
55 | + |
56 | + For the developers' and authors' protection, the GPL clearly explains |
57 | +that there is no warranty for this free software. For both users' and |
58 | +authors' sake, the GPL requires that modified versions be marked as |
59 | +changed, so that their problems will not be attributed erroneously to |
60 | +authors of previous versions. |
61 | + |
62 | + Some devices are designed to deny users access to install or run |
63 | +modified versions of the software inside them, although the manufacturer |
64 | +can do so. This is fundamentally incompatible with the aim of |
65 | +protecting users' freedom to change the software. The systematic |
66 | +pattern of such abuse occurs in the area of products for individuals to |
67 | +use, which is precisely where it is most unacceptable. Therefore, we |
68 | +have designed this version of the GPL to prohibit the practice for those |
69 | +products. If such problems arise substantially in other domains, we |
70 | +stand ready to extend this provision to those domains in future versions |
71 | +of the GPL, as needed to protect the freedom of users. |
72 | + |
73 | + Finally, every program is threatened constantly by software patents. |
74 | +States should not allow patents to restrict development and use of |
75 | +software on general-purpose computers, but in those that do, we wish to |
76 | +avoid the special danger that patents applied to a free program could |
77 | +make it effectively proprietary. To prevent this, the GPL assures that |
78 | +patents cannot be used to render the program non-free. |
79 | + |
80 | + The precise terms and conditions for copying, distribution and |
81 | +modification follow. |
82 | + |
83 | + TERMS AND CONDITIONS |
84 | + |
85 | + 0. Definitions. |
86 | + |
87 | + "This License" refers to version 3 of the GNU General Public License. |
88 | + |
89 | + "Copyright" also means copyright-like laws that apply to other kinds of |
90 | +works, such as semiconductor masks. |
91 | + |
92 | + "The Program" refers to any copyrightable work licensed under this |
93 | +License. Each licensee is addressed as "you". "Licensees" and |
94 | +"recipients" may be individuals or organizations. |
95 | + |
96 | + To "modify" a work means to copy from or adapt all or part of the work |
97 | +in a fashion requiring copyright permission, other than the making of an |
98 | +exact copy. The resulting work is called a "modified version" of the |
99 | +earlier work or a work "based on" the earlier work. |
100 | + |
101 | + A "covered work" means either the unmodified Program or a work based |
102 | +on the Program. |
103 | + |
104 | + To "propagate" a work means to do anything with it that, without |
105 | +permission, would make you directly or secondarily liable for |
106 | +infringement under applicable copyright law, except executing it on a |
107 | +computer or modifying a private copy. Propagation includes copying, |
108 | +distribution (with or without modification), making available to the |
109 | +public, and in some countries other activities as well. |
110 | + |
111 | + To "convey" a work means any kind of propagation that enables other |
112 | +parties to make or receive copies. Mere interaction with a user through |
113 | +a computer network, with no transfer of a copy, is not conveying. |
114 | + |
115 | + An interactive user interface displays "Appropriate Legal Notices" |
116 | +to the extent that it includes a convenient and prominently visible |
117 | +feature that (1) displays an appropriate copyright notice, and (2) |
118 | +tells the user that there is no warranty for the work (except to the |
119 | +extent that warranties are provided), that licensees may convey the |
120 | +work under this License, and how to view a copy of this License. If |
121 | +the interface presents a list of user commands or options, such as a |
122 | +menu, a prominent item in the list meets this criterion. |
123 | + |
124 | + 1. Source Code. |
125 | + |
126 | + The "source code" for a work means the preferred form of the work |
127 | +for making modifications to it. "Object code" means any non-source |
128 | +form of a work. |
129 | + |
130 | + A "Standard Interface" means an interface that either is an official |
131 | +standard defined by a recognized standards body, or, in the case of |
132 | +interfaces specified for a particular programming language, one that |
133 | +is widely used among developers working in that language. |
134 | + |
135 | + The "System Libraries" of an executable work include anything, other |
136 | +than the work as a whole, that (a) is included in the normal form of |
137 | +packaging a Major Component, but which is not part of that Major |
138 | +Component, and (b) serves only to enable use of the work with that |
139 | +Major Component, or to implement a Standard Interface for which an |
140 | +implementation is available to the public in source code form. A |
141 | +"Major Component", in this context, means a major essential component |
142 | +(kernel, window system, and so on) of the specific operating system |
143 | +(if any) on which the executable work runs, or a compiler used to |
144 | +produce the work, or an object code interpreter used to run it. |
145 | + |
146 | + The "Corresponding Source" for a work in object code form means all |
147 | +the source code needed to generate, install, and (for an executable |
148 | +work) run the object code and to modify the work, including scripts to |
149 | +control those activities. However, it does not include the work's |
150 | +System Libraries, or general-purpose tools or generally available free |
151 | +programs which are used unmodified in performing those activities but |
152 | +which are not part of the work. For example, Corresponding Source |
153 | +includes interface definition files associated with source files for |
154 | +the work, and the source code for shared libraries and dynamically |
155 | +linked subprograms that the work is specifically designed to require, |
156 | +such as by intimate data communication or control flow between those |
157 | +subprograms and other parts of the work. |
158 | + |
159 | + The Corresponding Source need not include anything that users |
160 | +can regenerate automatically from other parts of the Corresponding |
161 | +Source. |
162 | + |
163 | + The Corresponding Source for a work in source code form is that |
164 | +same work. |
165 | + |
166 | + 2. Basic Permissions. |
167 | + |
168 | + All rights granted under this License are granted for the term of |
169 | +copyright on the Program, and are irrevocable provided the stated |
170 | +conditions are met. This License explicitly affirms your unlimited |
171 | +permission to run the unmodified Program. The output from running a |
172 | +covered work is covered by this License only if the output, given its |
173 | +content, constitutes a covered work. This License acknowledges your |
174 | +rights of fair use or other equivalent, as provided by copyright law. |
175 | + |
176 | + You may make, run and propagate covered works that you do not |
177 | +convey, without conditions so long as your license otherwise remains |
178 | +in force. You may convey covered works to others for the sole purpose |
179 | +of having them make modifications exclusively for you, or provide you |
180 | +with facilities for running those works, provided that you comply with |
181 | +the terms of this License in conveying all material for which you do |
182 | +not control copyright. Those thus making or running the covered works |
183 | +for you must do so exclusively on your behalf, under your direction |
184 | +and control, on terms that prohibit them from making any copies of |
185 | +your copyrighted material outside their relationship with you. |
186 | + |
187 | + Conveying under any other circumstances is permitted solely under |
188 | +the conditions stated below. Sublicensing is not allowed; section 10 |
189 | +makes it unnecessary. |
190 | + |
191 | + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. |
192 | + |
193 | + No covered work shall be deemed part of an effective technological |
194 | +measure under any applicable law fulfilling obligations under article |
195 | +11 of the WIPO copyright treaty adopted on 20 December 1996, or |
196 | +similar laws prohibiting or restricting circumvention of such |
197 | +measures. |
198 | + |
199 | + When you convey a covered work, you waive any legal power to forbid |
200 | +circumvention of technological measures to the extent such circumvention |
201 | +is effected by exercising rights under this License with respect to |
202 | +the covered work, and you disclaim any intention to limit operation or |
203 | +modification of the work as a means of enforcing, against the work's |
204 | +users, your or third parties' legal rights to forbid circumvention of |
205 | +technological measures. |
206 | + |
207 | + 4. Conveying Verbatim Copies. |
208 | + |
209 | + You may convey verbatim copies of the Program's source code as you |
210 | +receive it, in any medium, provided that you conspicuously and |
211 | +appropriately publish on each copy an appropriate copyright notice; |
212 | +keep intact all notices stating that this License and any |
213 | +non-permissive terms added in accord with section 7 apply to the code; |
214 | +keep intact all notices of the absence of any warranty; and give all |
215 | +recipients a copy of this License along with the Program. |
216 | + |
217 | + You may charge any price or no price for each copy that you convey, |
218 | +and you may offer support or warranty protection for a fee. |
219 | + |
220 | + 5. Conveying Modified Source Versions. |
221 | + |
222 | + You may convey a work based on the Program, or the modifications to |
223 | +produce it from the Program, in the form of source code under the |
224 | +terms of section 4, provided that you also meet all of these conditions: |
225 | + |
226 | + a) The work must carry prominent notices stating that you modified |
227 | + it, and giving a relevant date. |
228 | + |
229 | + b) The work must carry prominent notices stating that it is |
230 | + released under this License and any conditions added under section |
231 | + 7. This requirement modifies the requirement in section 4 to |
232 | + "keep intact all notices". |
233 | + |
234 | + c) You must license the entire work, as a whole, under this |
235 | + License to anyone who comes into possession of a copy. This |
236 | + License will therefore apply, along with any applicable section 7 |
237 | + additional terms, to the whole of the work, and all its parts, |
238 | + regardless of how they are packaged. This License gives no |
239 | + permission to license the work in any other way, but it does not |
240 | + invalidate such permission if you have separately received it. |
241 | + |
242 | + d) If the work has interactive user interfaces, each must display |
243 | + Appropriate Legal Notices; however, if the Program has interactive |
244 | + interfaces that do not display Appropriate Legal Notices, your |
245 | + work need not make them do so. |
246 | + |
247 | + A compilation of a covered work with other separate and independent |
248 | +works, which are not by their nature extensions of the covered work, |
249 | +and which are not combined with it such as to form a larger program, |
250 | +in or on a volume of a storage or distribution medium, is called an |
251 | +"aggregate" if the compilation and its resulting copyright are not |
252 | +used to limit the access or legal rights of the compilation's users |
253 | +beyond what the individual works permit. Inclusion of a covered work |
254 | +in an aggregate does not cause this License to apply to the other |
255 | +parts of the aggregate. |
256 | + |
257 | + 6. Conveying Non-Source Forms. |
258 | + |
259 | + You may convey a covered work in object code form under the terms |
260 | +of sections 4 and 5, provided that you also convey the |
261 | +machine-readable Corresponding Source under the terms of this License, |
262 | +in one of these ways: |
263 | + |
264 | + a) Convey the object code in, or embodied in, a physical product |
265 | + (including a physical distribution medium), accompanied by the |
266 | + Corresponding Source fixed on a durable physical medium |
267 | + customarily used for software interchange. |
268 | + |
269 | + b) Convey the object code in, or embodied in, a physical product |
270 | + (including a physical distribution medium), accompanied by a |
271 | + written offer, valid for at least three years and valid for as |
272 | + long as you offer spare parts or customer support for that product |
273 | + model, to give anyone who possesses the object code either (1) a |
274 | + copy of the Corresponding Source for all the software in the |
275 | + product that is covered by this License, on a durable physical |
276 | + medium customarily used for software interchange, for a price no |
277 | + more than your reasonable cost of physically performing this |
278 | + conveying of source, or (2) access to copy the |
279 | + Corresponding Source from a network server at no charge. |
280 | + |
281 | + c) Convey individual copies of the object code with a copy of the |
282 | + written offer to provide the Corresponding Source. This |
283 | + alternative is allowed only occasionally and noncommercially, and |
284 | + only if you received the object code with such an offer, in accord |
285 | + with subsection 6b. |
286 | + |
287 | + d) Convey the object code by offering access from a designated |
288 | + place (gratis or for a charge), and offer equivalent access to the |
289 | + Corresponding Source in the same way through the same place at no |
290 | + further charge. You need not require recipients to copy the |
291 | + Corresponding Source along with the object code. If the place to |
292 | + copy the object code is a network server, the Corresponding Source |
293 | + may be on a different server (operated by you or a third party) |
294 | + that supports equivalent copying facilities, provided you maintain |
295 | + clear directions next to the object code saying where to find the |
296 | + Corresponding Source. Regardless of what server hosts the |
297 | + Corresponding Source, you remain obligated to ensure that it is |
298 | + available for as long as needed to satisfy these requirements. |
299 | + |
300 | + e) Convey the object code using peer-to-peer transmission, provided |
301 | + you inform other peers where the object code and Corresponding |
302 | + Source of the work are being offered to the general public at no |
303 | + charge under subsection 6d. |
304 | + |
305 | + A separable portion of the object code, whose source code is excluded |
306 | +from the Corresponding Source as a System Library, need not be |
307 | +included in conveying the object code work. |
308 | + |
309 | + A "User Product" is either (1) a "consumer product", which means any |
310 | +tangible personal property which is normally used for personal, family, |
311 | +or household purposes, or (2) anything designed or sold for incorporation |
312 | +into a dwelling. In determining whether a product is a consumer product, |
313 | +doubtful cases shall be resolved in favor of coverage. For a particular |
314 | +product received by a particular user, "normally used" refers to a |
315 | +typical or common use of that class of product, regardless of the status |
316 | +of the particular user or of the way in which the particular user |
317 | +actually uses, or expects or is expected to use, the product. A product |
318 | +is a consumer product regardless of whether the product has substantial |
319 | +commercial, industrial or non-consumer uses, unless such uses represent |
320 | +the only significant mode of use of the product. |
321 | + |
322 | + "Installation Information" for a User Product means any methods, |
323 | +procedures, authorization keys, or other information required to install |
324 | +and execute modified versions of a covered work in that User Product from |
325 | +a modified version of its Corresponding Source. The information must |
326 | +suffice to ensure that the continued functioning of the modified object |
327 | +code is in no case prevented or interfered with solely because |
328 | +modification has been made. |
329 | + |
330 | + If you convey an object code work under this section in, or with, or |
331 | +specifically for use in, a User Product, and the conveying occurs as |
332 | +part of a transaction in which the right of possession and use of the |
333 | +User Product is transferred to the recipient in perpetuity or for a |
334 | +fixed term (regardless of how the transaction is characterized), the |
335 | +Corresponding Source conveyed under this section must be accompanied |
336 | +by the Installation Information. But this requirement does not apply |
337 | +if neither you nor any third party retains the ability to install |
338 | +modified object code on the User Product (for example, the work has |
339 | +been installed in ROM). |
340 | + |
341 | + The requirement to provide Installation Information does not include a |
342 | +requirement to continue to provide support service, warranty, or updates |
343 | +for a work that has been modified or installed by the recipient, or for |
344 | +the User Product in which it has been modified or installed. Access to a |
345 | +network may be denied when the modification itself materially and |
346 | +adversely affects the operation of the network or violates the rules and |
347 | +protocols for communication across the network. |
348 | + |
349 | + Corresponding Source conveyed, and Installation Information provided, |
350 | +in accord with this section must be in a format that is publicly |
351 | +documented (and with an implementation available to the public in |
352 | +source code form), and must require no special password or key for |
353 | +unpacking, reading or copying. |
354 | + |
355 | + 7. Additional Terms. |
356 | + |
357 | + "Additional permissions" are terms that supplement the terms of this |
358 | +License by making exceptions from one or more of its conditions. |
359 | +Additional permissions that are applicable to the entire Program shall |
360 | +be treated as though they were included in this License, to the extent |
361 | +that they are valid under applicable law. If additional permissions |
362 | +apply only to part of the Program, that part may be used separately |
363 | +under those permissions, but the entire Program remains governed by |
364 | +this License without regard to the additional permissions. |
365 | + |
366 | + When you convey a copy of a covered work, you may at your option |
367 | +remove any additional permissions from that copy, or from any part of |
368 | +it. (Additional permissions may be written to require their own |
369 | +removal in certain cases when you modify the work.) You may place |
370 | +additional permissions on material, added by you to a covered work, |
371 | +for which you have or can give appropriate copyright permission. |
372 | + |
373 | + Notwithstanding any other provision of this License, for material you |
374 | +add to a covered work, you may (if authorized by the copyright holders of |
375 | +that material) supplement the terms of this License with terms: |
376 | + |
377 | + a) Disclaiming warranty or limiting liability differently from the |
378 | + terms of sections 15 and 16 of this License; or |
379 | + |
380 | + b) Requiring preservation of specified reasonable legal notices or |
381 | + author attributions in that material or in the Appropriate Legal |
382 | + Notices displayed by works containing it; or |
383 | + |
384 | + c) Prohibiting misrepresentation of the origin of that material, or |
385 | + requiring that modified versions of such material be marked in |
386 | + reasonable ways as different from the original version; or |
387 | + |
388 | + d) Limiting the use for publicity purposes of names of licensors or |
389 | + authors of the material; or |
390 | + |
391 | + e) Declining to grant rights under trademark law for use of some |
392 | + trade names, trademarks, or service marks; or |
393 | + |
394 | + f) Requiring indemnification of licensors and authors of that |
395 | + material by anyone who conveys the material (or modified versions of |
396 | + it) with contractual assumptions of liability to the recipient, for |
397 | + any liability that these contractual assumptions directly impose on |
398 | + those licensors and authors. |
399 | + |
400 | + All other non-permissive additional terms are considered "further |
401 | +restrictions" within the meaning of section 10. If the Program as you |
402 | +received it, or any part of it, contains a notice stating that it is |
403 | +governed by this License along with a term that is a further |
404 | +restriction, you may remove that term. If a license document contains |
405 | +a further restriction but permits relicensing or conveying under this |
406 | +License, you may add to a covered work material governed by the terms |
407 | +of that license document, provided that the further restriction does |
408 | +not survive such relicensing or conveying. |
409 | + |
410 | + If you add terms to a covered work in accord with this section, you |
411 | +must place, in the relevant source files, a statement of the |
412 | +additional terms that apply to those files, or a notice indicating |
413 | +where to find the applicable terms. |
414 | + |
415 | + Additional terms, permissive or non-permissive, may be stated in the |
416 | +form of a separately written license, or stated as exceptions; |
417 | +the above requirements apply either way. |
418 | + |
419 | + 8. Termination. |
420 | + |
421 | + You may not propagate or modify a covered work except as expressly |
422 | +provided under this License. Any attempt otherwise to propagate or |
423 | +modify it is void, and will automatically terminate your rights under |
424 | +this License (including any patent licenses granted under the third |
425 | +paragraph of section 11). |
426 | + |
427 | + However, if you cease all violation of this License, then your |
428 | +license from a particular copyright holder is reinstated (a) |
429 | +provisionally, unless and until the copyright holder explicitly and |
430 | +finally terminates your license, and (b) permanently, if the copyright |
431 | +holder fails to notify you of the violation by some reasonable means |
432 | +prior to 60 days after the cessation. |
433 | + |
434 | + Moreover, your license from a particular copyright holder is |
435 | +reinstated permanently if the copyright holder notifies you of the |
436 | +violation by some reasonable means, this is the first time you have |
437 | +received notice of violation of this License (for any work) from that |
438 | +copyright holder, and you cure the violation prior to 30 days after |
439 | +your receipt of the notice. |
440 | + |
441 | + Termination of your rights under this section does not terminate the |
442 | +licenses of parties who have received copies or rights from you under |
443 | +this License. If your rights have been terminated and not permanently |
444 | +reinstated, you do not qualify to receive new licenses for the same |
445 | +material under section 10. |
446 | + |
447 | + 9. Acceptance Not Required for Having Copies. |
448 | + |
449 | + You are not required to accept this License in order to receive or |
450 | +run a copy of the Program. Ancillary propagation of a covered work |
451 | +occurring solely as a consequence of using peer-to-peer transmission |
452 | +to receive a copy likewise does not require acceptance. However, |
453 | +nothing other than this License grants you permission to propagate or |
454 | +modify any covered work. These actions infringe copyright if you do |
455 | +not accept this License. Therefore, by modifying or propagating a |
456 | +covered work, you indicate your acceptance of this License to do so. |
457 | + |
458 | + 10. Automatic Licensing of Downstream Recipients. |
459 | + |
460 | + Each time you convey a covered work, the recipient automatically |
461 | +receives a license from the original licensors, to run, modify and |
462 | +propagate that work, subject to this License. You are not responsible |
463 | +for enforcing compliance by third parties with this License. |
464 | + |
465 | + An "entity transaction" is a transaction transferring control of an |
466 | +organization, or substantially all assets of one, or subdividing an |
467 | +organization, or merging organizations. If propagation of a covered |
468 | +work results from an entity transaction, each party to that |
469 | +transaction who receives a copy of the work also receives whatever |
470 | +licenses to the work the party's predecessor in interest had or could |
471 | +give under the previous paragraph, plus a right to possession of the |
472 | +Corresponding Source of the work from the predecessor in interest, if |
473 | +the predecessor has it or can get it with reasonable efforts. |
474 | + |
475 | + You may not impose any further restrictions on the exercise of the |
476 | +rights granted or affirmed under this License. For example, you may |
477 | +not impose a license fee, royalty, or other charge for exercise of |
478 | +rights granted under this License, and you may not initiate litigation |
479 | +(including a cross-claim or counterclaim in a lawsuit) alleging that |
480 | +any patent claim is infringed by making, using, selling, offering for |
481 | +sale, or importing the Program or any portion of it. |
482 | + |
483 | + 11. Patents. |
484 | + |
485 | + A "contributor" is a copyright holder who authorizes use under this |
486 | +License of the Program or a work on which the Program is based. The |
487 | +work thus licensed is called the contributor's "contributor version". |
488 | + |
489 | + A contributor's "essential patent claims" are all patent claims |
490 | +owned or controlled by the contributor, whether already acquired or |
491 | +hereafter acquired, that would be infringed by some manner, permitted |
492 | +by this License, of making, using, or selling its contributor version, |
493 | +but do not include claims that would be infringed only as a |
494 | +consequence of further modification of the contributor version. For |
495 | +purposes of this definition, "control" includes the right to grant |
496 | +patent sublicenses in a manner consistent with the requirements of |
497 | +this License. |
498 | + |
499 | + Each contributor grants you a non-exclusive, worldwide, royalty-free |
500 | +patent license under the contributor's essential patent claims, to |
501 | +make, use, sell, offer for sale, import and otherwise run, modify and |
502 | +propagate the contents of its contributor version. |
503 | + |
504 | + In the following three paragraphs, a "patent license" is any express |
505 | +agreement or commitment, however denominated, not to enforce a patent |
506 | +(such as an express permission to practice a patent or covenant not to |
507 | +sue for patent infringement). To "grant" such a patent license to a |
508 | +party means to make such an agreement or commitment not to enforce a |
509 | +patent against the party. |
510 | + |
511 | + If you convey a covered work, knowingly relying on a patent license, |
512 | +and the Corresponding Source of the work is not available for anyone |
513 | +to copy, free of charge and under the terms of this License, through a |
514 | +publicly available network server or other readily accessible means, |
515 | +then you must either (1) cause the Corresponding Source to be so |
516 | +available, or (2) arrange to deprive yourself of the benefit of the |
517 | +patent license for this particular work, or (3) arrange, in a manner |
518 | +consistent with the requirements of this License, to extend the patent |
519 | +license to downstream recipients. "Knowingly relying" means you have |
520 | +actual knowledge that, but for the patent license, your conveying the |
521 | +covered work in a country, or your recipient's use of the covered work |
522 | +in a country, would infringe one or more identifiable patents in that |
523 | +country that you have reason to believe are valid. |
524 | + |
525 | + If, pursuant to or in connection with a single transaction or |
526 | +arrangement, you convey, or propagate by procuring conveyance of, a |
527 | +covered work, and grant a patent license to some of the parties |
528 | +receiving the covered work authorizing them to use, propagate, modify |
529 | +or convey a specific copy of the covered work, then the patent license |
530 | +you grant is automatically extended to all recipients of the covered |
531 | +work and works based on it. |
532 | + |
533 | + A patent license is "discriminatory" if it does not include within |
534 | +the scope of its coverage, prohibits the exercise of, or is |
535 | +conditioned on the non-exercise of one or more of the rights that are |
536 | +specifically granted under this License. You may not convey a covered |
537 | +work if you are a party to an arrangement with a third party that is |
538 | +in the business of distributing software, under which you make payment |
539 | +to the third party based on the extent of your activity of conveying |
540 | +the work, and under which the third party grants, to any of the |
541 | +parties who would receive the covered work from you, a discriminatory |
542 | +patent license (a) in connection with copies of the covered work |
543 | +conveyed by you (or copies made from those copies), or (b) primarily |
544 | +for and in connection with specific products or compilations that |
545 | +contain the covered work, unless you entered into that arrangement, |
546 | +or that patent license was granted, prior to 28 March 2007. |
547 | + |
548 | + Nothing in this License shall be construed as excluding or limiting |
549 | +any implied license or other defenses to infringement that may |
550 | +otherwise be available to you under applicable patent law. |
551 | + |
552 | + 12. No Surrender of Others' Freedom. |
553 | + |
554 | + If conditions are imposed on you (whether by court order, agreement or |
555 | +otherwise) that contradict the conditions of this License, they do not |
556 | +excuse you from the conditions of this License. If you cannot convey a |
557 | +covered work so as to satisfy simultaneously your obligations under this |
558 | +License and any other pertinent obligations, then as a consequence you may |
559 | +not convey it at all. For example, if you agree to terms that obligate you |
560 | +to collect a royalty for further conveying from those to whom you convey |
561 | +the Program, the only way you could satisfy both those terms and this |
562 | +License would be to refrain entirely from conveying the Program. |
563 | + |
564 | + 13. Use with the GNU Affero General Public License. |
565 | + |
566 | + Notwithstanding any other provision of this License, you have |
567 | +permission to link or combine any covered work with a work licensed |
568 | +under version 3 of the GNU Affero General Public License into a single |
569 | +combined work, and to convey the resulting work. The terms of this |
570 | +License will continue to apply to the part which is the covered work, |
571 | +but the special requirements of the GNU Affero General Public License, |
572 | +section 13, concerning interaction through a network will apply to the |
573 | +combination as such. |
574 | + |
575 | + 14. Revised Versions of this License. |
576 | + |
577 | + The Free Software Foundation may publish revised and/or new versions of |
578 | +the GNU General Public License from time to time. Such new versions will |
579 | +be similar in spirit to the present version, but may differ in detail to |
580 | +address new problems or concerns. |
581 | + |
582 | + Each version is given a distinguishing version number. If the |
583 | +Program specifies that a certain numbered version of the GNU General |
584 | +Public License "or any later version" applies to it, you have the |
585 | +option of following the terms and conditions either of that numbered |
586 | +version or of any later version published by the Free Software |
587 | +Foundation. If the Program does not specify a version number of the |
588 | +GNU General Public License, you may choose any version ever published |
589 | +by the Free Software Foundation. |
590 | + |
591 | + If the Program specifies that a proxy can decide which future |
592 | +versions of the GNU General Public License can be used, that proxy's |
593 | +public statement of acceptance of a version permanently authorizes you |
594 | +to choose that version for the Program. |
595 | + |
596 | + Later license versions may give you additional or different |
597 | +permissions. However, no additional obligations are imposed on any |
598 | +author or copyright holder as a result of your choosing to follow a |
599 | +later version. |
600 | + |
601 | + 15. Disclaimer of Warranty. |
602 | + |
603 | + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY |
604 | +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT |
605 | +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY |
606 | +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, |
607 | +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
608 | +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM |
609 | +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF |
610 | +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
611 | + |
612 | + 16. Limitation of Liability. |
613 | + |
614 | + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
615 | +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS |
616 | +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY |
617 | +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE |
618 | +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF |
619 | +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD |
620 | +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), |
621 | +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF |
622 | +SUCH DAMAGES. |
623 | + |
624 | + 17. Interpretation of Sections 15 and 16. |
625 | + |
626 | + If the disclaimer of warranty and limitation of liability provided |
627 | +above cannot be given local legal effect according to their terms, |
628 | +reviewing courts shall apply local law that most closely approximates |
629 | +an absolute waiver of all civil liability in connection with the |
630 | +Program, unless a warranty or assumption of liability accompanies a |
631 | +copy of the Program in return for a fee. |
632 | + |
633 | + END OF TERMS AND CONDITIONS |
634 | + |
635 | + How to Apply These Terms to Your New Programs |
636 | + |
637 | + If you develop a new program, and you want it to be of the greatest |
638 | +possible use to the public, the best way to achieve this is to make it |
639 | +free software which everyone can redistribute and change under these terms. |
640 | + |
641 | + To do so, attach the following notices to the program. It is safest |
642 | +to attach them to the start of each source file to most effectively |
643 | +state the exclusion of warranty; and each file should have at least |
644 | +the "copyright" line and a pointer to where the full notice is found. |
645 | + |
646 | + <one line to give the program's name and a brief idea of what it does.> |
647 | + Copyright (C) <year> <name of author> |
648 | + |
649 | + This program is free software: you can redistribute it and/or modify |
650 | + it under the terms of the GNU General Public License as published by |
651 | + the Free Software Foundation, either version 3 of the License, or |
652 | + (at your option) any later version. |
653 | + |
654 | + This program is distributed in the hope that it will be useful, |
655 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
656 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
657 | + GNU General Public License for more details. |
658 | + |
659 | + You should have received a copy of the GNU General Public License |
660 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
661 | + |
662 | +Also add information on how to contact you by electronic and paper mail. |
663 | + |
664 | + If the program does terminal interaction, make it output a short |
665 | +notice like this when it starts in an interactive mode: |
666 | + |
667 | + <program> Copyright (C) <year> <name of author> |
668 | + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
669 | + This is free software, and you are welcome to redistribute it |
670 | + under certain conditions; type `show c' for details. |
671 | + |
672 | +The hypothetical commands `show w' and `show c' should show the appropriate |
673 | +parts of the General Public License. Of course, your program's commands |
674 | +might be different; for a GUI interface, you would use an "about box". |
675 | + |
676 | + You should also get your employer (if you work as a programmer) or school, |
677 | +if any, to sign a "copyright disclaimer" for the program, if necessary. |
678 | +For more information on this, and how to apply and follow the GNU GPL, see |
679 | +<http://www.gnu.org/licenses/>. |
680 | + |
681 | + The GNU General Public License does not permit incorporating your program |
682 | +into proprietary programs. If your program is a subroutine library, you |
683 | +may consider it more useful to permit linking proprietary applications with |
684 | +the library. If this is what you want to do, use the GNU Lesser General |
685 | +Public License instead of this License. But first, please read |
686 | +<http://www.gnu.org/philosophy/why-not-lgpl.html>. |
687 | |
688 | === modified file 'README' |
689 | --- README 2013-09-20 19:44:42 +0000 |
690 | +++ README 2013-09-26 11:05:18 +0000 |
691 | @@ -1,13 +1,13 @@ |
692 | Runnable tests: |
693 | -- check-lint: lint tests |
694 | -- check-security: security hook tests |
695 | -- check-desktop: desktop hook tests |
696 | -- run-checks.sh: all tests |
697 | +- click-check-lint: lint tests |
698 | +- click-check-security: security hook tests |
699 | +- click-check-desktop: desktop hook tests |
700 | +- click-run-checks: all tests |
701 | |
702 | Importable tests: |
703 | -- cr_lint.py: lint tests |
704 | -- cr_security.py: security hook tests |
705 | -- cr_desktop.py: desktop hook tests |
706 | +- clickreviews/cr_lint.py: lint tests |
707 | +- clickreviews/cr_security.py: security hook tests |
708 | +- clickreviews/cr_desktop.py: desktop hook tests |
709 | |
710 | In general, add or modify tests and report by using: |
711 | self._add_result(<type>, <name>, <message>) |
712 | |
713 | === added directory 'bin' |
714 | === renamed file 'check-desktop' => 'bin/click-check-desktop' |
715 | --- check-desktop 2013-08-19 13:08:43 +0000 |
716 | +++ bin/click-check-desktop 2013-09-26 11:05:18 +0000 |
717 | @@ -1,5 +1,5 @@ |
718 | #!/usr/bin/python3 |
719 | -'''check-desktop: perform click desktop checks''' |
720 | +'''click-check-desktop: perform click desktop checks''' |
721 | # |
722 | # Copyright (C) 2013 Canonical Ltd. |
723 | # |
724 | @@ -16,10 +16,14 @@ |
725 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
726 | |
727 | from __future__ import print_function |
728 | - |
729 | -import cr_common |
730 | -import cr_desktop |
731 | import sys |
732 | +import os |
733 | + |
734 | +# Support running from the build tree. |
735 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
736 | + |
737 | +from clickreviews import cr_common |
738 | +from clickreviews import cr_desktop |
739 | |
740 | if __name__ == "__main__": |
741 | if len(sys.argv) < 2: |
742 | |
743 | === renamed file 'check-lint' => 'bin/click-check-lint' |
744 | --- check-lint 2013-08-19 04:13:46 +0000 |
745 | +++ bin/click-check-lint 2013-09-26 11:05:18 +0000 |
746 | @@ -1,5 +1,5 @@ |
747 | #!/usr/bin/python3 |
748 | -'''check-lint: perform click lint checks''' |
749 | +'''click-check-lint: perform click lint checks''' |
750 | # |
751 | # Copyright (C) 2013 Canonical Ltd. |
752 | # |
753 | @@ -16,10 +16,14 @@ |
754 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
755 | |
756 | from __future__ import print_function |
757 | +import sys |
758 | +import os |
759 | + |
760 | +# Support running from the build tree. |
761 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
762 | |
763 | import cr_common |
764 | import cr_lint |
765 | -import sys |
766 | |
767 | if __name__ == "__main__": |
768 | if len(sys.argv) < 2: |
769 | |
770 | === renamed file 'check-security' => 'bin/click-check-security' |
771 | --- check-security 2013-08-19 04:13:46 +0000 |
772 | +++ bin/click-check-security 2013-09-26 11:05:18 +0000 |
773 | @@ -1,5 +1,5 @@ |
774 | #!/usr/bin/python3 |
775 | -'''check-security: perform click security checks''' |
776 | +'''click-check-security: perform click security checks''' |
777 | # |
778 | # Copyright (C) 2013 Canonical Ltd. |
779 | # |
780 | @@ -16,10 +16,14 @@ |
781 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
782 | |
783 | from __future__ import print_function |
784 | +import sys |
785 | +import os |
786 | + |
787 | +# Support running from the build tree. |
788 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
789 | |
790 | import cr_common |
791 | import cr_security |
792 | -import sys |
793 | |
794 | if __name__ == "__main__": |
795 | if len(sys.argv) < 2: |
796 | |
797 | === renamed file 'check-skeleton' => 'bin/click-check-skeleton' |
798 | --- check-skeleton 2013-08-19 04:13:46 +0000 |
799 | +++ bin/click-check-skeleton 2013-09-26 11:05:18 +0000 |
800 | @@ -1,5 +1,5 @@ |
801 | #!/usr/bin/python3 |
802 | -'''check-skeleton: perform click skeleton checks''' |
803 | +'''click-check-skeleton: perform click skeleton checks''' |
804 | # |
805 | # Copyright (C) 2013 Canonical Ltd. |
806 | # |
807 | @@ -16,10 +16,14 @@ |
808 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
809 | |
810 | from __future__ import print_function |
811 | +import sys |
812 | +import os |
813 | + |
814 | +# Support running from the build tree. |
815 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
816 | |
817 | import cr_common |
818 | import cr_skeleton |
819 | -import sys |
820 | |
821 | if __name__ == "__main__": |
822 | if len(sys.argv) < 2: |
823 | |
824 | === renamed file 'run-checks.sh' => 'bin/click-run-checks' |
825 | --- run-checks.sh 2013-08-19 22:53:41 +0000 |
826 | +++ bin/click-run-checks 2013-09-26 11:05:18 +0000 |
827 | @@ -10,6 +10,15 @@ |
828 | exit 1 |
829 | fi |
830 | |
831 | +# prefer local script for testing, otherwise use system location |
832 | +prefer_local() { |
833 | + path="$(dirname $(readlink -f "$0"))/$1" |
834 | + if [ -x $path ]; then |
835 | + exec $path "$2" |
836 | + fi |
837 | + exec "$(which $1)" "$2" |
838 | +} |
839 | + |
840 | rc="0" |
841 | set_rc() { |
842 | # return worst offending rc |
843 | @@ -23,19 +32,19 @@ |
844 | |
845 | } |
846 | |
847 | -./show-click-files "$c" || set_rc "$?" |
848 | - |
849 | -echo "" |
850 | -echo "= check-lint =" |
851 | -./check-lint "$c" || set_rc "$?" |
852 | - |
853 | -echo "" |
854 | -echo "= check-desktop =" |
855 | -./check-desktop "$c" || set_rc "$?" |
856 | - |
857 | -echo "" |
858 | -echo "= check-security =" |
859 | -./check-security "$c" || set_rc "$?" |
860 | +prefer_local show-click-files "$c" || set_rc "$?" |
861 | + |
862 | +echo "" |
863 | +echo "= click-check-lint =" |
864 | +prefer_local click-check-lint "$c" || set_rc "$?" |
865 | + |
866 | +echo "" |
867 | +echo "= click-check-desktop =" |
868 | +prefer_local click-check-desktop "$c" || set_rc "$?" |
869 | + |
870 | +echo "" |
871 | +echo "= click-check-security =" |
872 | +prefer_local click-check-security "$c" || set_rc "$?" |
873 | |
874 | echo "" |
875 | echo "" |
876 | |
877 | === renamed file 'empty-click' => 'bin/empty-click' |
878 | === renamed file 'repack-click' => 'bin/repack-click' |
879 | --- repack-click 2013-08-20 17:54:41 +0000 |
880 | +++ bin/repack-click 2013-09-26 11:05:18 +0000 |
881 | @@ -3,12 +3,16 @@ |
882 | # Repack a click package by using lowlevel tools so as not to change anything |
883 | # in the package (ie, don't use 'click build .' to avoid updating DEBIAN/, etc) |
884 | |
885 | -import cr_common |
886 | +import sys |
887 | +import os |
888 | + |
889 | +# Support running from the build tree. |
890 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
891 | + |
892 | +from clickreviews import cr_common |
893 | from debian.deb822 import Deb822 |
894 | import glob |
895 | -import os |
896 | import shutil |
897 | -import sys |
898 | import tempfile |
899 | |
900 | |
901 | |
902 | === renamed file 'show-click-files' => 'bin/show-click-files' |
903 | --- show-click-files 2013-08-20 17:54:41 +0000 |
904 | +++ bin/show-click-files 2013-09-26 11:05:18 +0000 |
905 | @@ -16,14 +16,17 @@ |
906 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
907 | |
908 | from __future__ import print_function |
909 | - |
910 | -import cr_common |
911 | -import cr_desktop |
912 | -import cr_lint |
913 | -import cr_security |
914 | import os |
915 | import sys |
916 | |
917 | +# Support running from the build tree. |
918 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
919 | + |
920 | +from clickreviews import cr_common |
921 | +from clickreviews import cr_desktop |
922 | +from clickreviews import cr_lint |
923 | +from clickreviews import cr_security |
924 | + |
925 | # This script just dumps important files to stdout |
926 | |
927 | if __name__ == "__main__": |
928 | |
929 | === renamed file 'unpack-click' => 'bin/unpack-click' |
930 | --- unpack-click 2013-08-20 16:25:15 +0000 |
931 | +++ bin/unpack-click 2013-09-26 11:05:18 +0000 |
932 | @@ -1,9 +1,13 @@ |
933 | #!/usr/bin/python3 |
934 | |
935 | -import cr_common |
936 | import os |
937 | import sys |
938 | |
939 | +# Support running from the build tree. |
940 | +sys.path.insert(0, os.path.join(sys.path[0], os.pardir)) |
941 | + |
942 | +from clickreviews import cr_common |
943 | + |
944 | if __name__ == '__main__': |
945 | if len(sys.argv) != 3: |
946 | cr_common.error("%s <clickpkg> <dir>" % os.path.basename(sys.argv[0])) |
947 | |
948 | === added directory 'clickreviews' |
949 | === added file 'clickreviews/__init__.py' |
950 | === renamed file 'cr_common.py' => 'clickreviews/cr_common.py' |
951 | === renamed file 'cr_desktop.py' => 'clickreviews/cr_desktop.py' |
952 | --- cr_desktop.py 2013-09-24 20:01:32 +0000 |
953 | +++ clickreviews/cr_desktop.py 2013-09-26 11:05:18 +0000 |
954 | @@ -16,7 +16,7 @@ |
955 | |
956 | from __future__ import print_function |
957 | |
958 | -from cr_common import ClickReview, error, open_file_read |
959 | +from clickreviews.cr_common import ClickReview, error, open_file_read |
960 | import os |
961 | import re |
962 | from urllib.parse import urlsplit |
963 | |
964 | === renamed file 'cr_lint.py' => 'clickreviews/cr_lint.py' |
965 | --- cr_lint.py 2013-09-24 20:38:12 +0000 |
966 | +++ clickreviews/cr_lint.py 2013-09-26 11:05:18 +0000 |
967 | @@ -16,7 +16,7 @@ |
968 | |
969 | from __future__ import print_function |
970 | |
971 | -from cr_common import ClickReview, open_file_read, cmd |
972 | +from clickreviews.cr_common import ClickReview, open_file_read, cmd |
973 | import glob |
974 | import magic |
975 | import os |
976 | |
977 | === renamed file 'cr_security.py' => 'clickreviews/cr_security.py' |
978 | --- cr_security.py 2013-09-24 16:07:01 +0000 |
979 | +++ clickreviews/cr_security.py 2013-09-26 11:05:18 +0000 |
980 | @@ -16,8 +16,8 @@ |
981 | |
982 | from __future__ import print_function |
983 | |
984 | -from cr_common import ClickReview, error, warn |
985 | -import cr_common |
986 | +from clickreviews.cr_common import ClickReview, error, warn |
987 | +import clickreviews.cr_common as clickreviews |
988 | import glob |
989 | import json |
990 | import os |
991 | |
992 | === renamed file 'cr_skeleton.py' => 'clickreviews/cr_skeleton.py' |
993 | --- cr_skeleton.py 2013-08-19 14:19:20 +0000 |
994 | +++ clickreviews/cr_skeleton.py 2013-09-26 11:05:18 +0000 |
995 | @@ -16,7 +16,7 @@ |
996 | |
997 | from __future__ import print_function |
998 | |
999 | -from cr_common import ClickReview |
1000 | +from clickreviews.cr_common import ClickReview |
1001 | |
1002 | |
1003 | class ClickReviewSkeleton(ClickReview): |
1004 | |
1005 | === renamed directory 'tests' => 'clickreviews/tests' |
1006 | === modified file 'clickreviews/tests/test_cr_lint.py' |
1007 | --- tests/test_cr_lint.py 2013-09-24 20:19:15 +0000 |
1008 | +++ clickreviews/tests/test_cr_lint.py 2013-09-26 11:05:18 +0000 |
1009 | @@ -19,8 +19,8 @@ |
1010 | from unittest.mock import patch |
1011 | from unittest import TestCase |
1012 | |
1013 | -from cr_lint import ClickReviewLint |
1014 | -from cr_common import ClickReview |
1015 | +from clickreviews.cr_lint import ClickReviewLint |
1016 | +from clickreviews.cr_common import ClickReview |
1017 | |
1018 | |
1019 | TEST_CONTROL = """Package: net.launchpad.click-webapps.test-app |
1020 | @@ -60,13 +60,13 @@ |
1021 | |
1022 | |
1023 | # Patch all methods that call out to disk |
1024 | -@patch('cr_common.ClickReview._check_path_exists', _mock_func) |
1025 | -@patch('cr_common.ClickReview._extract_control_file', _extract_control_file) |
1026 | -@patch('cr_common.ClickReview._extract_manifest_file', _extract_manifest_file) |
1027 | -@patch('cr_common.unpack_click', _mock_func) |
1028 | -@patch('cr_common.ClickReview.__del__', _mock_func) |
1029 | -@patch('cr_lint.ClickReviewLint._list_control_files', _mock_func) |
1030 | -@patch('cr_lint.ClickReviewLint._list_all_files', _mock_func) |
1031 | +@patch('clickreviews.cr_common.ClickReview._check_path_exists', _mock_func) |
1032 | +@patch('clickreviews.cr_common.ClickReview._extract_control_file', _extract_control_file) |
1033 | +@patch('clickreviews.cr_common.ClickReview._extract_manifest_file', _extract_manifest_file) |
1034 | +@patch('clickreviews.cr_common.unpack_click', _mock_func) |
1035 | +@patch('clickreviews.cr_common.ClickReview.__del__', _mock_func) |
1036 | +@patch('clickreviews.cr_lint.ClickReviewLint._list_control_files', _mock_func) |
1037 | +@patch('clickreviews.cr_lint.ClickReviewLint._list_all_files', _mock_func) |
1038 | class TestClickReviewLint(TestCase): |
1039 | """Tests for the lint review tool.""" |
1040 | |
1041 | |
1042 | === added directory 'debian' |
1043 | === added file 'debian/changelog' |
1044 | --- debian/changelog 1970-01-01 00:00:00 +0000 |
1045 | +++ debian/changelog 2013-09-26 11:05:18 +0000 |
1046 | @@ -0,0 +1,5 @@ |
1047 | +click-reviewers-tools (0.1) saucy; urgency=low |
1048 | + |
1049 | + * Initial release (LP: #1230248) |
1050 | + |
1051 | + -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 25 Sep 2013 14:32:32 +0200 |
1052 | |
1053 | === added file 'debian/compat' |
1054 | --- debian/compat 1970-01-01 00:00:00 +0000 |
1055 | +++ debian/compat 2013-09-26 11:05:18 +0000 |
1056 | @@ -0,0 +1,1 @@ |
1057 | +8 |
1058 | |
1059 | === added file 'debian/control' |
1060 | --- debian/control 1970-01-01 00:00:00 +0000 |
1061 | +++ debian/control 2013-09-26 11:05:18 +0000 |
1062 | @@ -0,0 +1,22 @@ |
1063 | +Source: click-reviewers-tools |
1064 | +Section: devel |
1065 | +Priority: optional |
1066 | +Maintainer: Ubuntu Daniel Holbach <daniel.holbach@ubuntu.com> |
1067 | +Build-Depends: debhelper (>= 9~), |
1068 | + python3-all (>= 3.2~), |
1069 | + python3-debian, |
1070 | + python3-magic, |
1071 | + python3-setuptools |
1072 | +Standards-Version: 3.9.4 |
1073 | +Homepage: https://launchpad.net/click-reviewers-tools |
1074 | +Vcs-Bzr: lp:ubuntu-dev-tools |
1075 | +Vcs-Browser: http://bazaar.launchpad.net/~click-reviewers/click-reviewers-tools/trunk/files |
1076 | +X-Python-Version: >= 2.7 |
1077 | +X-Python3-Version: >= 3.2 |
1078 | + |
1079 | +Package: click-reviewers-tools |
1080 | +Architecture: all |
1081 | +Depends: python3-debian, python3-magic, ${misc:Depends}, ${python3:Depends} |
1082 | +Description: tools to review click packages |
1083 | + These scripts can be used to review click packages both manually and in a |
1084 | + programmatical fashion. |
1085 | |
1086 | === added file 'debian/copyright' |
1087 | --- debian/copyright 1970-01-01 00:00:00 +0000 |
1088 | +++ debian/copyright 2013-09-26 11:05:18 +0000 |
1089 | @@ -0,0 +1,20 @@ |
1090 | +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
1091 | +Upstream-Name: click-reviewers-tools |
1092 | +Upstream-Contact: Ubuntu App Developers <ubuntu-app-devel@lists.ubuntu.com> |
1093 | +Source: https://launchpad.net/click-reviewers-tools |
1094 | + |
1095 | +Files: * |
1096 | +Copyright: 2013 Canonical Ltd. |
1097 | +License: GPL-3+ |
1098 | + This program is free software; you can redistribute it and/or modify |
1099 | + it under the terms of the GNU General Public License as published by |
1100 | + the Free Software Foundation; either version 3 of the License, or |
1101 | + (at your option) any later version. |
1102 | + . |
1103 | + This program is distributed in the hope that it will be useful, |
1104 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
1105 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
1106 | + General Public License for more details. |
1107 | + . |
1108 | + On Debian systems, the complete text of the GNU General Public License |
1109 | + version 3 can be found in the /usr/share/common-licenses/GPL-3 file. |
1110 | |
1111 | === added file 'debian/docs' |
1112 | --- debian/docs 1970-01-01 00:00:00 +0000 |
1113 | +++ debian/docs 2013-09-26 11:05:18 +0000 |
1114 | @@ -0,0 +1,1 @@ |
1115 | +README |
1116 | |
1117 | === added file 'debian/rules' |
1118 | --- debian/rules 1970-01-01 00:00:00 +0000 |
1119 | +++ debian/rules 2013-09-26 11:05:18 +0000 |
1120 | @@ -0,0 +1,45 @@ |
1121 | +#!/usr/bin/make -f |
1122 | +# -*- makefile -*- |
1123 | + |
1124 | +# Uncomment this to turn on verbose mode. |
1125 | +export DH_VERBOSE=1 |
1126 | + |
1127 | +%: |
1128 | + dh $@ --with python3 --buildsystem pybuild |
1129 | + |
1130 | +PY3REQUESTED := $(shell py3versions -r) |
1131 | +PY3DEFAULT := $(shell py3versions -d) |
1132 | +# Run setup.py with the default python3 last so that the scripts use |
1133 | +# #!/usr/bin/python3 and not #!/usr/bin/python3.X. |
1134 | +PY3 := $(filter-out $(PY3DEFAULT),$(PY3REQUESTED)) python3 |
1135 | + |
1136 | +override_dh_auto_clean: |
1137 | + dh_clean |
1138 | + rm -rf build *.egg-info .pybuild |
1139 | + find -name \*.pyc -print0 | xargs -0r rm -f |
1140 | + find -name __pycache__ -print0 | xargs -0r rm -rf |
1141 | + |
1142 | + |
1143 | +override_dh_auto_build: |
1144 | + dh_auto_build |
1145 | + set -ex; for python in $(PY3); do \ |
1146 | + $$python setup.py build; \ |
1147 | + done |
1148 | + |
1149 | +override_dh_auto_install: |
1150 | + # setuptools likes to leave some debris around, which confuses things. |
1151 | + find build -name \*.pyc -print0 | xargs -0r rm -f |
1152 | + find build -name __pycache__ -print0 | xargs -0r rm -rf |
1153 | + find build -name \*.egg-info -print0 | xargs -0r rm -rf |
1154 | + dh_auto_install |
1155 | + set -ex; for python in $(PY3); do \ |
1156 | + $$python setup.py install --install-layout=deb \ |
1157 | + --root=$(CURDIR)/debian/tmp; \ |
1158 | + done |
1159 | + |
1160 | +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) |
1161 | +override_dh_auto_test: |
1162 | + set -ex; for python in $(PY3); do \ |
1163 | + $$python setup.py test; \ |
1164 | + done |
1165 | +endif |
1166 | |
1167 | === modified file 'run-tests' |
1168 | --- run-tests 2013-09-20 19:43:48 +0000 |
1169 | +++ run-tests 2013-09-26 11:05:18 +0000 |
1170 | @@ -17,7 +17,7 @@ |
1171 | |
1172 | import unittest |
1173 | |
1174 | -test_directory = 'tests/' |
1175 | +test_directory = 'clickreviews/tests/' |
1176 | test_filename = 'test_*' |
1177 | |
1178 | suite = unittest.TestLoader().discover(test_directory, pattern=test_filename) |
1179 | |
1180 | === added file 'setup.py' |
1181 | --- setup.py 1970-01-01 00:00:00 +0000 |
1182 | +++ setup.py 2013-09-26 11:05:18 +0000 |
1183 | @@ -0,0 +1,22 @@ |
1184 | +#! /usr/bin/env python3 |
1185 | + |
1186 | +from setuptools import setup, find_packages |
1187 | +import glob |
1188 | +import os |
1189 | +import re |
1190 | + |
1191 | +# look/set what version we have |
1192 | +changelog = 'debian/changelog' |
1193 | +if os.path.exists(changelog): |
1194 | + head = open(changelog).readline() |
1195 | + match = re.compile('.*\((.*)\).*').match(head) |
1196 | + if match: |
1197 | + version = match.group(1) |
1198 | + |
1199 | +scripts = glob.glob('bin/*') |
1200 | +setup(name='click-reviewers-tools', |
1201 | + version=version, |
1202 | + scripts=scripts, |
1203 | + packages=find_packages(), |
1204 | + test_suite='clickreviews.tests' |
1205 | +) |
It largely works as expected, but I might need some help to fix this:
= hooks =
ERROR: Could not load 'Managana.json'. Is it properly formatted?