Launchpad itself

Merge lp:~michael.nelson/launchpad/513201-move-recipe-to-code into lp:launchpad

  1. 513201-move-recipe-to-code
  2. Merge into devel
Proposed by Michael Nelson
Status: Merged
Approved by: Guilherme Salgado
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~michael.nelson/launchpad/513201-move-recipe-to-code
Merge into: lp:launchpad
Diff against target: 372 lines (+96/-97)
13 files modified
lib/lp/archiveuploader/uploadpolicy.py (+2/-2)
lib/lp/buildmaster/tests/test_builder.py (+2/-2)
lib/lp/code/configure.zcml (+61/-0)
lib/lp/code/interfaces/sourcepackagerecipebuild.py (+1/-1)
lib/lp/code/model/recipebuilder.py (+2/-2)
lib/lp/code/model/sourcepackagerecipe.py (+5/-5)
lib/lp/code/model/sourcepackagerecipebuild.py (+3/-3)
lib/lp/code/model/sourcepackagerecipedata.py (+1/-1)
lib/lp/code/tests/test_recipebuilder.py (+3/-3)
lib/lp/code/tests/test_sourcepackagerecipe.py (+10/-10)
lib/lp/code/tests/test_sourcepackagerecipebuild.py (+2/-2)
lib/lp/soyuz/configure.zcml (+0/-62)
lib/lp/testing/factory.py (+4/-4)
To merge this branch: bzr merge lp:~michael.nelson/launchpad/513201-move-recipe-to-code
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) code Approve
Review via email: mp+18703@code.launchpad.net

Commit message

Move the sourcepackagerecipe classes from soyuz to code domain.

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

This branch has no logic changes, but simply moves the sourcepackagerecipe classes into the lp.code domain for bug 513201 (before adding more code soon for API exposure tests etc.)

Pre-imp: we chatted about this as the buildfrombranch sprint.

To test:
bin/test -t test_recipe -t test_sourcepackagerecipe

Revision history for this message
Guilherme Salgado (salgado) wrote :

Looks good to me

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
2--- lib/lp/archiveuploader/uploadpolicy.py 2010-01-22 04:01:17 +0000
3+++ lib/lp/archiveuploader/uploadpolicy.py 2010-02-05 15:45:26 +0000
4@@ -14,11 +14,11 @@
5 from zope.component import getUtility
6
7 from canonical.launchpad.interfaces import ILaunchpadCelebrities
8+from lp.code.interfaces.sourcepackagerecipebuild import (
9+ ISourcePackageRecipeBuildSource)
10 from lp.registry.interfaces.distribution import IDistributionSet
11 from lp.registry.interfaces.series import SeriesStatus
12 from lp.registry.interfaces.pocket import PackagePublishingPocket
13-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
14- ISourcePackageRecipeBuildSource)
15
16
17 # Number of seconds in an hour (used later)
18
19=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
20--- lib/lp/buildmaster/tests/test_builder.py 2010-01-18 01:39:16 +0000
21+++ lib/lp/buildmaster/tests/test_builder.py 2010-02-05 15:45:26 +0000
22@@ -16,11 +16,11 @@
23 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
24 IBuildFarmJobBehavior)
25 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
26+from lp.code.interfaces.sourcepackagerecipebuild import (
27+ ISourcePackageRecipeBuildSource)
28 from lp.soyuz.interfaces.archive import ArchivePurpose
29 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
30 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
31-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
32- ISourcePackageRecipeBuildSource)
33 from lp.soyuz.model.binarypackagebuildbehavior import (
34 BinaryPackageBuildBehavior)
35 from lp.soyuz.model.buildqueue import BuildQueue
36
37=== modified file 'lib/lp/code/configure.zcml'
38--- lib/lp/code/configure.zcml 2010-01-29 17:15:31 +0000
39+++ lib/lp/code/configure.zcml 2010-02-05 15:45:26 +0000
40@@ -937,6 +937,67 @@
41 interface="lp.code.interfaces.diff.IStaticDiffSource" />
42 </securedutility>
43
44+ <!-- SourcePackageRecipe -->
45+
46+ <securedutility
47+ component="lp.code.model.sourcepackagerecipe.SourcePackageRecipe"
48+ provides="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource">
49+ <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
50+ </securedutility>
51+
52+ <class
53+ class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild">
54+ <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/>
55+ </class>
56+
57+ <securedutility
58+ component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
59+ provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource">
60+ <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/>
61+ </securedutility>
62+
63+ <class
64+ class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob">
65+ <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/>
66+ </class>
67+
68+ <securedutility
69+ component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
70+ provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource">
71+ <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/>
72+ </securedutility>
73+
74+ <adapter factory="lp.code.model.recipebuilder.RecipeBuildBehavior"
75+ permission="zope.Public" />
76+
77+ <!-- SourcePackageRecipe -->
78+ <class
79+ class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe">
80+ <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
81+ <require
82+ permission="launchpad.Edit"
83+ set_attributes="builder_recipe"/>
84+ </class>
85+ <class
86+ class="bzrlib.plugins.builder.recipe.BaseRecipeBranch">
87+ <allow attributes="name url revspec revid child_branches deb_version __str__" />
88+ </class>
89+ <class
90+ class="bzrlib.plugins.builder.recipe.RecipeBranch">
91+ <allow attributes="name url revspec revid child_branches __str__" />
92+ </class>
93+ <class
94+ class="bzrlib.plugins.builder.recipe.MergeInstruction">
95+ <allow attributes="as_tuple recipe_branch nest_path" />
96+ </class>
97+ <class
98+ class="bzrlib.plugins.builder.recipe.NestInstruction">
99+ <allow attributes="as_tuple recipe_branch nest_path" />
100+ </class>
101+
102+ <utility component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
103+ name="RECIPEBRANCHBUILD"
104+ provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
105 <webservice:register module="lp.code.interfaces.webservice" />
106
107 </configure>
108
109=== renamed file 'lib/lp/soyuz/interfaces/sourcepackagerecipe.py' => 'lib/lp/code/interfaces/sourcepackagerecipe.py'
110=== renamed file 'lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py' => 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
111--- lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py 2010-01-20 22:09:26 +0000
112+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py 2010-02-05 15:45:26 +0000
113@@ -20,11 +20,11 @@
114
115 from lp.buildmaster.interfaces.buildbase import IBuildBase
116 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
117+from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipe
118 from lp.registry.interfaces.person import IPerson
119 from lp.registry.interfaces.distroseries import IDistroSeries
120 from lp.registry.interfaces.sourcepackagename import ISourcePackageName
121 from lp.services.job.interfaces.job import IJob
122-from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipe
123
124
125 class ISourcePackageRecipeBuild(IBuildBase):
126
127=== renamed file 'lib/lp/soyuz/model/recipebuilder.py' => 'lib/lp/code/model/recipebuilder.py'
128--- lib/lp/soyuz/model/recipebuilder.py 2010-01-20 22:09:26 +0000
129+++ lib/lp/code/model/recipebuilder.py 2010-02-05 15:45:26 +0000
130@@ -17,11 +17,11 @@
131 from lp.buildmaster.interfaces.builder import CannotBuild
132 from lp.buildmaster.model.buildfarmjobbehavior import (
133 BuildFarmJobBehaviorBase)
134+from lp.code.interfaces.sourcepackagerecipebuild import (
135+ ISourcePackageRecipeBuildJob)
136 from lp.registry.interfaces.pocket import PackagePublishingPocket
137 from lp.soyuz.adapters.archivedependencies import (
138 get_primary_current_component, get_sources_list_for_building)
139-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
140- ISourcePackageRecipeBuildJob)
141
142
143 class RecipeBuildBehavior(BuildFarmJobBehaviorBase):
144
145=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipe.py' => 'lib/lp/code/model/sourcepackagerecipe.py'
146--- lib/lp/soyuz/model/sourcepackagerecipe.py 2010-02-03 16:21:57 +0000
147+++ lib/lp/code/model/sourcepackagerecipe.py 2010-02-05 15:45:26 +0000
148@@ -16,14 +16,14 @@
149 from canonical.database.datetimecol import UtcDateTimeCol
150 from canonical.launchpad.interfaces.lpstorm import IMasterStore
151
152-from lp.soyuz.interfaces.archive import ArchivePurpose
153-from lp.soyuz.interfaces.component import IComponentSet
154 from lp.archiveuploader.permission import check_upload_to_archive
155-from lp.soyuz.interfaces.sourcepackagerecipe import (
156+from lp.code.interfaces.sourcepackagerecipe import (
157 ISourcePackageRecipe, ISourcePackageRecipeSource)
158-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
159+from lp.code.interfaces.sourcepackagerecipebuild import (
160 ISourcePackageRecipeBuildSource)
161-from lp.soyuz.model.sourcepackagerecipedata import _SourcePackageRecipeData
162+from lp.code.model.sourcepackagerecipedata import _SourcePackageRecipeData
163+from lp.soyuz.interfaces.archive import ArchivePurpose
164+from lp.soyuz.interfaces.component import IComponentSet
165
166
167 class NonPPABuildRequest(Exception):
168
169=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipebuild.py' => 'lib/lp/code/model/sourcepackagerecipebuild.py'
170--- lib/lp/soyuz/model/sourcepackagerecipebuild.py 2010-02-02 16:04:03 +0000
171+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-02-05 15:45:26 +0000
172@@ -25,15 +25,15 @@
173 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
174 from lp.buildmaster.model.buildbase import BuildBase
175 from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
176+from lp.code.interfaces.sourcepackagerecipebuild import (
177+ ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
178+ ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
179 from lp.registry.interfaces.pocket import PackagePublishingPocket
180 from lp.services.job.model.job import Job
181 from lp.soyuz.adapters.archivedependencies import (
182 default_component_dependency_name,)
183 from lp.soyuz.interfaces.build import BuildStatus
184 from lp.soyuz.interfaces.component import IComponentSet
185-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
186- ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
187- ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
188 from lp.soyuz.model.buildqueue import BuildQueue
189
190
191
192=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipedata.py' => 'lib/lp/code/model/sourcepackagerecipedata.py'
193--- lib/lp/soyuz/model/sourcepackagerecipedata.py 2010-01-20 23:29:20 +0000
194+++ lib/lp/code/model/sourcepackagerecipedata.py 2010-02-05 15:45:26 +0000
195@@ -25,7 +25,7 @@
196
197 from lp.code.model.branch import Branch
198 from lp.code.interfaces.branchlookup import IBranchLookup
199-from lp.soyuz.interfaces.sourcepackagerecipe import (
200+from lp.code.interfaces.sourcepackagerecipe import (
201 ForbiddenInstruction, TooNewRecipeFormat)
202
203
204
205=== renamed file 'lib/lp/soyuz/tests/test_recipebuilder.py' => 'lib/lp/code/tests/test_recipebuilder.py'
206--- lib/lp/soyuz/tests/test_recipebuilder.py 2010-01-22 04:01:17 +0000
207+++ lib/lp/code/tests/test_recipebuilder.py 2010-02-05 15:45:26 +0000
208@@ -15,11 +15,11 @@
209 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
210 IBuildFarmJobBehavior)
211 from lp.buildmaster.manager import RecordingSlave
212+from lp.code.model.recipebuilder import RecipeBuildBehavior
213+from lp.code.model.sourcepackagerecipebuild import (
214+ SourcePackageRecipeBuild)
215 from lp.soyuz.adapters.archivedependencies import get_sources_list_for_building
216 from lp.soyuz.model.processor import ProcessorFamilySet
217-from lp.soyuz.model.recipebuilder import RecipeBuildBehavior
218-from lp.soyuz.model.sourcepackagerecipebuild import (
219- SourcePackageRecipeBuild)
220 from lp.soyuz.tests.soyuzbuilddhelpers import (MockBuilder,
221 SaneBuildingSlave,)
222 from lp.soyuz.tests.test_binarypackagebuildbehavior import (
223
224=== renamed file 'lib/lp/soyuz/tests/test_sourcepackagerecipe.py' => 'lib/lp/code/tests/test_sourcepackagerecipe.py'
225--- lib/lp/soyuz/tests/test_sourcepackagerecipe.py 2010-02-02 14:44:51 +0000
226+++ lib/lp/code/tests/test_sourcepackagerecipe.py 2010-02-05 15:45:26 +0000
227@@ -20,23 +20,23 @@
228
229 from lp.archiveuploader.permission import (
230 ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA)
231-from lp.registry.interfaces.pocket import PackagePublishingPocket
232-from lp.services.job.interfaces.job import (
233- IJob, JobStatus)
234-from lp.soyuz.interfaces.archive import ArchivePurpose
235-from lp.soyuz.interfaces.buildqueue import (
236- IBuildQueue)
237-from lp.soyuz.interfaces.sourcepackagerecipe import (
238+from lp.code.interfaces.sourcepackagerecipe import (
239 ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource,
240 TooNewRecipeFormat)
241-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
242+from lp.code.interfaces.sourcepackagerecipebuild import (
243 ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob)
244 from lp.soyuz.model.buildqueue import (
245 BuildQueue)
246-from lp.soyuz.model.sourcepackagerecipebuild import (
247+from lp.code.model.sourcepackagerecipebuild import (
248 SourcePackageRecipeBuildJob)
249-from lp.soyuz.model.sourcepackagerecipe import (
250+from lp.code.model.sourcepackagerecipe import (
251 NonPPABuildRequest)
252+from lp.registry.interfaces.pocket import PackagePublishingPocket
253+from lp.services.job.interfaces.job import (
254+ IJob, JobStatus)
255+from lp.soyuz.interfaces.archive import ArchivePurpose
256+from lp.soyuz.interfaces.buildqueue import (
257+ IBuildQueue)
258 from lp.testing import login_person, TestCaseWithFactory
259
260
261
262=== renamed file 'lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py' => 'lib/lp/code/tests/test_sourcepackagerecipebuild.py'
263--- lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py 2010-02-02 16:04:03 +0000
264+++ lib/lp/code/tests/test_sourcepackagerecipebuild.py 2010-02-05 15:45:26 +0000
265@@ -14,10 +14,10 @@
266 from canonical.testing.layers import DatabaseFunctionalLayer
267
268 from lp.buildmaster.interfaces.buildbase import IBuildBase
269-from lp.soyuz.interfaces.buildqueue import IBuildQueue
270-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
271+from lp.code.interfaces.sourcepackagerecipebuild import (
272 ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,
273 ISourcePackageRecipeBuildSource)
274+from lp.soyuz.interfaces.buildqueue import IBuildQueue
275 from lp.testing import TestCaseWithFactory
276
277
278
279=== modified file 'lib/lp/soyuz/configure.zcml'
280--- lib/lp/soyuz/configure.zcml 2010-01-20 23:55:38 +0000
281+++ lib/lp/soyuz/configure.zcml 2010-02-05 15:45:26 +0000
282@@ -929,66 +929,4 @@
283 factory="lp.soyuz.model.binarypackagebuildbehavior.BinaryPackageBuildBehavior"
284 permission="zope.Public" />
285
286- <!-- SourcePackageRecipe -->
287-
288- <securedutility
289- component="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe"
290- provides="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource">
291- <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
292- </securedutility>
293-
294- <class
295- class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild">
296- <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/>
297- </class>
298-
299- <securedutility
300- component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
301- provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource">
302- <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/>
303- </securedutility>
304-
305- <class
306- class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob">
307- <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/>
308- </class>
309-
310- <securedutility
311- component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
312- provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource">
313- <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/>
314- </securedutility>
315-
316- <adapter factory="lp.soyuz.model.recipebuilder.RecipeBuildBehavior"
317- permission="zope.Public" />
318-
319- <!-- SourcePackageRecipe -->
320- <class
321- class="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe">
322- <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
323- <require
324- permission="launchpad.Edit"
325- set_attributes="builder_recipe"/>
326- </class>
327- <class
328- class="bzrlib.plugins.builder.recipe.BaseRecipeBranch">
329- <allow attributes="name url revspec revid child_branches deb_version __str__" />
330- </class>
331- <class
332- class="bzrlib.plugins.builder.recipe.RecipeBranch">
333- <allow attributes="name url revspec revid child_branches __str__" />
334- </class>
335- <class
336- class="bzrlib.plugins.builder.recipe.MergeInstruction">
337- <allow attributes="as_tuple recipe_branch nest_path" />
338- </class>
339- <class
340- class="bzrlib.plugins.builder.recipe.NestInstruction">
341- <allow attributes="as_tuple recipe_branch nest_path" />
342- </class>
343-
344- <utility component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
345- name="RECIPEBRANCHBUILD"
346- provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
347-
348 </configure>
349
350=== modified file 'lib/lp/testing/factory.py'
351--- lib/lp/testing/factory.py 2010-02-03 12:37:34 +0000
352+++ lib/lp/testing/factory.py 2010-02-05 15:45:26 +0000
353@@ -36,15 +36,15 @@
354 from canonical.autodecorate import AutoDecorate
355 from canonical.config import config
356 from canonical.database.constants import UTC_NOW
357+from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
358+from lp.code.interfaces.sourcepackagerecipebuild import (
359+ ISourcePackageRecipeBuildSource,
360+ )
361 from lp.codehosting.codeimport.worker import CodeImportSourceDetails
362 from canonical.database.sqlbase import flush_database_updates
363 from lp.soyuz.adapters.packagelocation import PackageLocation
364 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
365 from lp.soyuz.interfaces.section import ISectionSet
366-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
367- ISourcePackageRecipeBuildSource,
368- )
369-from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
370 from canonical.launchpad.database.account import Account
371 from canonical.launchpad.database.emailaddress import EmailAddress
372 from canonical.launchpad.database.message import Message, MessageChunk