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

[Michael Nelson]

Move the sourcepackagerecipe classes from soyuz to code domain.

[Michael Nelson (michael.nelson)]

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

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2010-01-22 04:01:17 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2010-02-05 15:45:26 +0000
@@ -14,11 +14,11 @@
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces import ILaunchpadCelebrities
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuildSource)
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildSource)
 
 
 # Number of seconds in an hour (used later)

=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2010-01-18 01:39:16 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2010-02-05 15:45:26 +0000
@@ -16,11 +16,11 @@
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior)
 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuildSource)
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildSource)
 from lp.soyuz.model.binarypackagebuildbehavior import (
     BinaryPackageBuildBehavior)
 from lp.soyuz.model.buildqueue import BuildQueue

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-01-29 17:15:31 +0000
+++ lib/lp/code/configure.zcml	2010-02-05 15:45:26 +0000
@@ -937,6 +937,67 @@
       interface="lp.code.interfaces.diff.IStaticDiffSource" />
   </securedutility>
 
+  <!-- SourcePackageRecipe -->
+
+  <securedutility
+     component="lp.code.model.sourcepackagerecipe.SourcePackageRecipe"
+     provides="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource">
+    <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
+  </securedutility>
+
+  <class
+     class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild">
+    <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/>
+  </class>
+
+  <securedutility
+     component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
+     provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource">
+    <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/>
+  </securedutility>
+
+  <class
+     class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob">
+    <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/>
+  </class>
+
+  <securedutility
+     component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
+     provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource">
+    <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/>
+  </securedutility>
+
+  <adapter factory="lp.code.model.recipebuilder.RecipeBuildBehavior"
+           permission="zope.Public" />
+
+  <!-- SourcePackageRecipe -->
+  <class
+     class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe">
+    <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
+    <require
+       permission="launchpad.Edit"
+       set_attributes="builder_recipe"/>
+  </class>
+  <class
+     class="bzrlib.plugins.builder.recipe.BaseRecipeBranch">
+    <allow attributes="name url revspec revid child_branches deb_version __str__" />
+  </class>
+  <class
+     class="bzrlib.plugins.builder.recipe.RecipeBranch">
+    <allow attributes="name url revspec revid child_branches __str__" />
+  </class>
+  <class
+     class="bzrlib.plugins.builder.recipe.MergeInstruction">
+    <allow attributes="as_tuple recipe_branch nest_path" />
+  </class>
+  <class
+     class="bzrlib.plugins.builder.recipe.NestInstruction">
+    <allow attributes="as_tuple recipe_branch nest_path" />
+  </class>
+
+  <utility component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
+        name="RECIPEBRANCHBUILD"
+        provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
   <webservice:register module="lp.code.interfaces.webservice" />
 
 </configure>

=== renamed file 'lib/lp/soyuz/interfaces/sourcepackagerecipe.py' => 'lib/lp/code/interfaces/sourcepackagerecipe.py'
=== renamed file 'lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py' => 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py	2010-01-20 22:09:26 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-02-05 15:45:26 +0000
@@ -20,11 +20,11 @@
 
 from lp.buildmaster.interfaces.buildbase import IBuildBase
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipe
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.sourcepackagename import ISourcePackageName
 from lp.services.job.interfaces.job import IJob
-from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipe
 
 
 class ISourcePackageRecipeBuild(IBuildBase):

=== renamed file 'lib/lp/soyuz/model/recipebuilder.py' => 'lib/lp/code/model/recipebuilder.py'
--- lib/lp/soyuz/model/recipebuilder.py	2010-01-20 22:09:26 +0000
+++ lib/lp/code/model/recipebuilder.py	2010-02-05 15:45:26 +0000
@@ -17,11 +17,11 @@
 from lp.buildmaster.interfaces.builder import CannotBuild
 from lp.buildmaster.model.buildfarmjobbehavior import (
     BuildFarmJobBehaviorBase)
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuildJob)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.archivedependencies import (
     get_primary_current_component, get_sources_list_for_building)
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildJob)
 
 
 class RecipeBuildBehavior(BuildFarmJobBehaviorBase):

=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipe.py' => 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/soyuz/model/sourcepackagerecipe.py	2010-02-03 16:21:57 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-02-05 15:45:26 +0000
@@ -16,14 +16,14 @@
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 
-from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.component import IComponentSet
 from lp.archiveuploader.permission import check_upload_to_archive
-from lp.soyuz.interfaces.sourcepackagerecipe import (
+from lp.code.interfaces.sourcepackagerecipe import (
     ISourcePackageRecipe, ISourcePackageRecipeSource)
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
+from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource)
-from lp.soyuz.model.sourcepackagerecipedata import _SourcePackageRecipeData
+from lp.code.model.sourcepackagerecipedata import _SourcePackageRecipeData
+from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.component import IComponentSet
 
 
 class NonPPABuildRequest(Exception):

=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipebuild.py' => 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/soyuz/model/sourcepackagerecipebuild.py	2010-02-02 16:04:03 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-02-05 15:45:26 +0000
@@ -25,15 +25,15 @@
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildbase import BuildBase
 from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
+    ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.model.job import Job
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name,)
 from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.component import IComponentSet
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource,
-    ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource)
 from lp.soyuz.model.buildqueue import BuildQueue
 
 

=== renamed file 'lib/lp/soyuz/model/sourcepackagerecipedata.py' => 'lib/lp/code/model/sourcepackagerecipedata.py'
--- lib/lp/soyuz/model/sourcepackagerecipedata.py	2010-01-20 23:29:20 +0000
+++ lib/lp/code/model/sourcepackagerecipedata.py	2010-02-05 15:45:26 +0000
@@ -25,7 +25,7 @@
 
 from lp.code.model.branch import Branch
 from lp.code.interfaces.branchlookup import IBranchLookup
-from lp.soyuz.interfaces.sourcepackagerecipe import (
+from lp.code.interfaces.sourcepackagerecipe import (
     ForbiddenInstruction, TooNewRecipeFormat)
 
 

=== renamed file 'lib/lp/soyuz/tests/test_recipebuilder.py' => 'lib/lp/code/tests/test_recipebuilder.py'
--- lib/lp/soyuz/tests/test_recipebuilder.py	2010-01-22 04:01:17 +0000
+++ lib/lp/code/tests/test_recipebuilder.py	2010-02-05 15:45:26 +0000
@@ -15,11 +15,11 @@
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior)
 from lp.buildmaster.manager import RecordingSlave
+from lp.code.model.recipebuilder import RecipeBuildBehavior
+from lp.code.model.sourcepackagerecipebuild import (
+    SourcePackageRecipeBuild)
 from lp.soyuz.adapters.archivedependencies import get_sources_list_for_building
 from lp.soyuz.model.processor import ProcessorFamilySet
-from lp.soyuz.model.recipebuilder import RecipeBuildBehavior
-from lp.soyuz.model.sourcepackagerecipebuild import (
-    SourcePackageRecipeBuild)
 from lp.soyuz.tests.soyuzbuilddhelpers import (MockBuilder,
     SaneBuildingSlave,)
 from lp.soyuz.tests.test_binarypackagebuildbehavior import (

=== renamed file 'lib/lp/soyuz/tests/test_sourcepackagerecipe.py' => 'lib/lp/code/tests/test_sourcepackagerecipe.py'
--- lib/lp/soyuz/tests/test_sourcepackagerecipe.py	2010-02-02 14:44:51 +0000
+++ lib/lp/code/tests/test_sourcepackagerecipe.py	2010-02-05 15:45:26 +0000
@@ -20,23 +20,23 @@
 
 from lp.archiveuploader.permission import (
     ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA)
-from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.services.job.interfaces.job import (
-    IJob, JobStatus)
-from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.buildqueue import (
-    IBuildQueue)
-from lp.soyuz.interfaces.sourcepackagerecipe import (
+from lp.code.interfaces.sourcepackagerecipe import (
     ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource,
     TooNewRecipeFormat)
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
+from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob)
 from lp.soyuz.model.buildqueue import (
     BuildQueue)
-from lp.soyuz.model.sourcepackagerecipebuild import (
+from lp.code.model.sourcepackagerecipebuild import (
     SourcePackageRecipeBuildJob)
-from lp.soyuz.model.sourcepackagerecipe import (
+from lp.code.model.sourcepackagerecipe import (
     NonPPABuildRequest)
+from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.job.interfaces.job import (
+    IJob, JobStatus)
+from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.buildqueue import (
+    IBuildQueue)
 from lp.testing import login_person, TestCaseWithFactory
 
 

=== renamed file 'lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py' => 'lib/lp/code/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py	2010-02-02 16:04:03 +0000
+++ lib/lp/code/tests/test_sourcepackagerecipebuild.py	2010-02-05 15:45:26 +0000
@@ -14,10 +14,10 @@
 from canonical.testing.layers import DatabaseFunctionalLayer
 
 from lp.buildmaster.interfaces.buildbase import IBuildBase
-from lp.soyuz.interfaces.buildqueue import IBuildQueue
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
+from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild,
     ISourcePackageRecipeBuildSource)
+from lp.soyuz.interfaces.buildqueue import IBuildQueue
 from lp.testing import TestCaseWithFactory
 
 

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-01-20 23:55:38 +0000
+++ lib/lp/soyuz/configure.zcml	2010-02-05 15:45:26 +0000
@@ -929,66 +929,4 @@
         factory="lp.soyuz.model.binarypackagebuildbehavior.BinaryPackageBuildBehavior"
         permission="zope.Public" />
 
-    <!-- SourcePackageRecipe -->
-
-    <securedutility
-       component="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe"
-       provides="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/>
-    </securedutility>
-
-    <class
-       class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/>
-    </class>
-
-    <securedutility
-       component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"
-       provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/>
-    </securedutility>
-
-    <class
-       class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/>
-    </class>
-
-    <securedutility
-       component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
-       provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/>
-    </securedutility>
-
-    <adapter factory="lp.soyuz.model.recipebuilder.RecipeBuildBehavior"
-             permission="zope.Public" />
-
-    <!-- SourcePackageRecipe -->
-    <class
-       class="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe">
-      <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/>
-      <require
-         permission="launchpad.Edit"
-         set_attributes="builder_recipe"/>
-    </class>
-    <class
-       class="bzrlib.plugins.builder.recipe.BaseRecipeBranch">
-      <allow attributes="name url revspec revid child_branches deb_version __str__" />
-    </class>
-    <class
-       class="bzrlib.plugins.builder.recipe.RecipeBranch">
-      <allow attributes="name url revspec revid child_branches __str__" />
-    </class>
-    <class
-       class="bzrlib.plugins.builder.recipe.MergeInstruction">
-      <allow attributes="as_tuple recipe_branch nest_path" />
-    </class>
-    <class
-       class="bzrlib.plugins.builder.recipe.NestInstruction">
-      <allow attributes="as_tuple recipe_branch nest_path" />
-    </class>
-
-    <utility component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"
-        name="RECIPEBRANCHBUILD"
-        provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
-
 </configure>

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-02-03 12:37:34 +0000
+++ lib/lp/testing/factory.py	2010-02-05 15:45:26 +0000
@@ -36,15 +36,15 @@
 from canonical.autodecorate import AutoDecorate
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
+from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
+from lp.code.interfaces.sourcepackagerecipebuild import (
+    ISourcePackageRecipeBuildSource,
+    )
 from lp.codehosting.codeimport.worker import CodeImportSourceDetails
 from canonical.database.sqlbase import flush_database_updates
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.section import ISectionSet
-from lp.soyuz.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildSource,
-    )
-from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
 from canonical.launchpad.database.account import Account
 from canonical.launchpad.database.emailaddress import EmailAddress
 from canonical.launchpad.database.message import Message, MessageChunk