Merge lp:~michael.nelson/launchpad/513201-move-recipe-to-code into lp:launchpad
- 513201-move-recipe-to-code
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guilherme Salgado (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Move the sourcepackagerecipe classes from soyuz to code domain.
Description of the change
To post a comment you must log in.
Revision history for this message
| Michael Nelson (michael.nelson) wrote : | # |
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 | 14 | from zope.component import getUtility | 14 | from zope.component import getUtility |
| 6 | 15 | 15 | ||
| 7 | 16 | from canonical.launchpad.interfaces import ILaunchpadCelebrities | 16 | from canonical.launchpad.interfaces import ILaunchpadCelebrities |
| 8 | 17 | from lp.code.interfaces.sourcepackagerecipebuild import ( | ||
| 9 | 18 | ISourcePackageRecipeBuildSource) | ||
| 10 | 17 | from lp.registry.interfaces.distribution import IDistributionSet | 19 | from lp.registry.interfaces.distribution import IDistributionSet |
| 11 | 18 | from lp.registry.interfaces.series import SeriesStatus | 20 | from lp.registry.interfaces.series import SeriesStatus |
| 12 | 19 | from lp.registry.interfaces.pocket import PackagePublishingPocket | 21 | from lp.registry.interfaces.pocket import PackagePublishingPocket |
| 13 | 20 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 14 | 21 | ISourcePackageRecipeBuildSource) | ||
| 15 | 22 | 22 | ||
| 16 | 23 | 23 | ||
| 17 | 24 | # Number of seconds in an hour (used later) | 24 | # Number of seconds in an hour (used later) |
| 18 | 25 | 25 | ||
| 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 | 16 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( | 16 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( |
| 24 | 17 | IBuildFarmJobBehavior) | 17 | IBuildFarmJobBehavior) |
| 25 | 18 | from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior | 18 | from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior |
| 26 | 19 | from lp.code.interfaces.sourcepackagerecipebuild import ( | ||
| 27 | 20 | ISourcePackageRecipeBuildSource) | ||
| 28 | 19 | from lp.soyuz.interfaces.archive import ArchivePurpose | 21 | from lp.soyuz.interfaces.archive import ArchivePurpose |
| 29 | 20 | from lp.soyuz.interfaces.build import BuildStatus, IBuildSet | 22 | from lp.soyuz.interfaces.build import BuildStatus, IBuildSet |
| 30 | 21 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus | 23 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus |
| 31 | 22 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 32 | 23 | ISourcePackageRecipeBuildSource) | ||
| 33 | 24 | from lp.soyuz.model.binarypackagebuildbehavior import ( | 24 | from lp.soyuz.model.binarypackagebuildbehavior import ( |
| 34 | 25 | BinaryPackageBuildBehavior) | 25 | BinaryPackageBuildBehavior) |
| 35 | 26 | from lp.soyuz.model.buildqueue import BuildQueue | 26 | from lp.soyuz.model.buildqueue import BuildQueue |
| 36 | 27 | 27 | ||
| 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 | 937 | interface="lp.code.interfaces.diff.IStaticDiffSource" /> | 937 | interface="lp.code.interfaces.diff.IStaticDiffSource" /> |
| 42 | 938 | </securedutility> | 938 | </securedutility> |
| 43 | 939 | 939 | ||
| 44 | 940 | <!-- SourcePackageRecipe --> | ||
| 45 | 941 | |||
| 46 | 942 | <securedutility | ||
| 47 | 943 | component="lp.code.model.sourcepackagerecipe.SourcePackageRecipe" | ||
| 48 | 944 | provides="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"> | ||
| 49 | 945 | <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/> | ||
| 50 | 946 | </securedutility> | ||
| 51 | 947 | |||
| 52 | 948 | <class | ||
| 53 | 949 | class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"> | ||
| 54 | 950 | <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/> | ||
| 55 | 951 | </class> | ||
| 56 | 952 | |||
| 57 | 953 | <securedutility | ||
| 58 | 954 | component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuild" | ||
| 59 | 955 | provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"> | ||
| 60 | 956 | <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/> | ||
| 61 | 957 | </securedutility> | ||
| 62 | 958 | |||
| 63 | 959 | <class | ||
| 64 | 960 | class="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"> | ||
| 65 | 961 | <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/> | ||
| 66 | 962 | </class> | ||
| 67 | 963 | |||
| 68 | 964 | <securedutility | ||
| 69 | 965 | component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob" | ||
| 70 | 966 | provides="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"> | ||
| 71 | 967 | <allow interface="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/> | ||
| 72 | 968 | </securedutility> | ||
| 73 | 969 | |||
| 74 | 970 | <adapter factory="lp.code.model.recipebuilder.RecipeBuildBehavior" | ||
| 75 | 971 | permission="zope.Public" /> | ||
| 76 | 972 | |||
| 77 | 973 | <!-- SourcePackageRecipe --> | ||
| 78 | 974 | <class | ||
| 79 | 975 | class="lp.code.model.sourcepackagerecipe.SourcePackageRecipe"> | ||
| 80 | 976 | <allow interface="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/> | ||
| 81 | 977 | <require | ||
| 82 | 978 | permission="launchpad.Edit" | ||
| 83 | 979 | set_attributes="builder_recipe"/> | ||
| 84 | 980 | </class> | ||
| 85 | 981 | <class | ||
| 86 | 982 | class="bzrlib.plugins.builder.recipe.BaseRecipeBranch"> | ||
| 87 | 983 | <allow attributes="name url revspec revid child_branches deb_version __str__" /> | ||
| 88 | 984 | </class> | ||
| 89 | 985 | <class | ||
| 90 | 986 | class="bzrlib.plugins.builder.recipe.RecipeBranch"> | ||
| 91 | 987 | <allow attributes="name url revspec revid child_branches __str__" /> | ||
| 92 | 988 | </class> | ||
| 93 | 989 | <class | ||
| 94 | 990 | class="bzrlib.plugins.builder.recipe.MergeInstruction"> | ||
| 95 | 991 | <allow attributes="as_tuple recipe_branch nest_path" /> | ||
| 96 | 992 | </class> | ||
| 97 | 993 | <class | ||
| 98 | 994 | class="bzrlib.plugins.builder.recipe.NestInstruction"> | ||
| 99 | 995 | <allow attributes="as_tuple recipe_branch nest_path" /> | ||
| 100 | 996 | </class> | ||
| 101 | 997 | |||
| 102 | 998 | <utility component="lp.code.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob" | ||
| 103 | 999 | name="RECIPEBRANCHBUILD" | ||
| 104 | 1000 | provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/> | ||
| 105 | 940 | <webservice:register module="lp.code.interfaces.webservice" /> | 1001 | <webservice:register module="lp.code.interfaces.webservice" /> |
| 106 | 941 | 1002 | ||
| 107 | 942 | </configure> | 1003 | </configure> |
| 108 | 943 | 1004 | ||
| 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 | 20 | 20 | ||
| 115 | 21 | from lp.buildmaster.interfaces.buildbase import IBuildBase | 21 | from lp.buildmaster.interfaces.buildbase import IBuildBase |
| 116 | 22 | from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob | 22 | from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob |
| 117 | 23 | from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipe | ||
| 118 | 23 | from lp.registry.interfaces.person import IPerson | 24 | from lp.registry.interfaces.person import IPerson |
| 119 | 24 | from lp.registry.interfaces.distroseries import IDistroSeries | 25 | from lp.registry.interfaces.distroseries import IDistroSeries |
| 120 | 25 | from lp.registry.interfaces.sourcepackagename import ISourcePackageName | 26 | from lp.registry.interfaces.sourcepackagename import ISourcePackageName |
| 121 | 26 | from lp.services.job.interfaces.job import IJob | 27 | from lp.services.job.interfaces.job import IJob |
| 122 | 27 | from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipe | ||
| 123 | 28 | 28 | ||
| 124 | 29 | 29 | ||
| 125 | 30 | class ISourcePackageRecipeBuild(IBuildBase): | 30 | class ISourcePackageRecipeBuild(IBuildBase): |
| 126 | 31 | 31 | ||
| 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 | 17 | from lp.buildmaster.interfaces.builder import CannotBuild | 17 | from lp.buildmaster.interfaces.builder import CannotBuild |
| 132 | 18 | from lp.buildmaster.model.buildfarmjobbehavior import ( | 18 | from lp.buildmaster.model.buildfarmjobbehavior import ( |
| 133 | 19 | BuildFarmJobBehaviorBase) | 19 | BuildFarmJobBehaviorBase) |
| 134 | 20 | from lp.code.interfaces.sourcepackagerecipebuild import ( | ||
| 135 | 21 | ISourcePackageRecipeBuildJob) | ||
| 136 | 20 | from lp.registry.interfaces.pocket import PackagePublishingPocket | 22 | from lp.registry.interfaces.pocket import PackagePublishingPocket |
| 137 | 21 | from lp.soyuz.adapters.archivedependencies import ( | 23 | from lp.soyuz.adapters.archivedependencies import ( |
| 138 | 22 | get_primary_current_component, get_sources_list_for_building) | 24 | get_primary_current_component, get_sources_list_for_building) |
| 139 | 23 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 140 | 24 | ISourcePackageRecipeBuildJob) | ||
| 141 | 25 | 25 | ||
| 142 | 26 | 26 | ||
| 143 | 27 | class RecipeBuildBehavior(BuildFarmJobBehaviorBase): | 27 | class RecipeBuildBehavior(BuildFarmJobBehaviorBase): |
| 144 | 28 | 28 | ||
| 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 | 16 | from canonical.database.datetimecol import UtcDateTimeCol | 16 | from canonical.database.datetimecol import UtcDateTimeCol |
| 150 | 17 | from canonical.launchpad.interfaces.lpstorm import IMasterStore | 17 | from canonical.launchpad.interfaces.lpstorm import IMasterStore |
| 151 | 18 | 18 | ||
| 152 | 19 | from lp.soyuz.interfaces.archive import ArchivePurpose | ||
| 153 | 20 | from lp.soyuz.interfaces.component import IComponentSet | ||
| 154 | 21 | from lp.archiveuploader.permission import check_upload_to_archive | 19 | from lp.archiveuploader.permission import check_upload_to_archive |
| 156 | 22 | from lp.soyuz.interfaces.sourcepackagerecipe import ( | 20 | from lp.code.interfaces.sourcepackagerecipe import ( |
| 157 | 23 | ISourcePackageRecipe, ISourcePackageRecipeSource) | 21 | ISourcePackageRecipe, ISourcePackageRecipeSource) |
| 159 | 24 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | 22 | from lp.code.interfaces.sourcepackagerecipebuild import ( |
| 160 | 25 | ISourcePackageRecipeBuildSource) | 23 | ISourcePackageRecipeBuildSource) |
| 162 | 26 | from lp.soyuz.model.sourcepackagerecipedata import _SourcePackageRecipeData | 24 | from lp.code.model.sourcepackagerecipedata import _SourcePackageRecipeData |
| 163 | 25 | from lp.soyuz.interfaces.archive import ArchivePurpose | ||
| 164 | 26 | from lp.soyuz.interfaces.component import IComponentSet | ||
| 165 | 27 | 27 | ||
| 166 | 28 | 28 | ||
| 167 | 29 | class NonPPABuildRequest(Exception): | 29 | class NonPPABuildRequest(Exception): |
| 168 | 30 | 30 | ||
| 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 | 25 | from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType | 25 | from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType |
| 174 | 26 | from lp.buildmaster.model.buildbase import BuildBase | 26 | from lp.buildmaster.model.buildbase import BuildBase |
| 175 | 27 | from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob | 27 | from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob |
| 176 | 28 | from lp.code.interfaces.sourcepackagerecipebuild import ( | ||
| 177 | 29 | ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource, | ||
| 178 | 30 | ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource) | ||
| 179 | 28 | from lp.registry.interfaces.pocket import PackagePublishingPocket | 31 | from lp.registry.interfaces.pocket import PackagePublishingPocket |
| 180 | 29 | from lp.services.job.model.job import Job | 32 | from lp.services.job.model.job import Job |
| 181 | 30 | from lp.soyuz.adapters.archivedependencies import ( | 33 | from lp.soyuz.adapters.archivedependencies import ( |
| 182 | 31 | default_component_dependency_name,) | 34 | default_component_dependency_name,) |
| 183 | 32 | from lp.soyuz.interfaces.build import BuildStatus | 35 | from lp.soyuz.interfaces.build import BuildStatus |
| 184 | 33 | from lp.soyuz.interfaces.component import IComponentSet | 36 | from lp.soyuz.interfaces.component import IComponentSet |
| 185 | 34 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 186 | 35 | ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildJobSource, | ||
| 187 | 36 | ISourcePackageRecipeBuild, ISourcePackageRecipeBuildSource) | ||
| 188 | 37 | from lp.soyuz.model.buildqueue import BuildQueue | 37 | from lp.soyuz.model.buildqueue import BuildQueue |
| 189 | 38 | 38 | ||
| 190 | 39 | 39 | ||
| 191 | 40 | 40 | ||
| 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 | 25 | 25 | ||
| 197 | 26 | from lp.code.model.branch import Branch | 26 | from lp.code.model.branch import Branch |
| 198 | 27 | from lp.code.interfaces.branchlookup import IBranchLookup | 27 | from lp.code.interfaces.branchlookup import IBranchLookup |
| 200 | 28 | from lp.soyuz.interfaces.sourcepackagerecipe import ( | 28 | from lp.code.interfaces.sourcepackagerecipe import ( |
| 201 | 29 | ForbiddenInstruction, TooNewRecipeFormat) | 29 | ForbiddenInstruction, TooNewRecipeFormat) |
| 202 | 30 | 30 | ||
| 203 | 31 | 31 | ||
| 204 | 32 | 32 | ||
| 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 | 15 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( | 15 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( |
| 210 | 16 | IBuildFarmJobBehavior) | 16 | IBuildFarmJobBehavior) |
| 211 | 17 | from lp.buildmaster.manager import RecordingSlave | 17 | from lp.buildmaster.manager import RecordingSlave |
| 212 | 18 | from lp.code.model.recipebuilder import RecipeBuildBehavior | ||
| 213 | 19 | from lp.code.model.sourcepackagerecipebuild import ( | ||
| 214 | 20 | SourcePackageRecipeBuild) | ||
| 215 | 18 | from lp.soyuz.adapters.archivedependencies import get_sources_list_for_building | 21 | from lp.soyuz.adapters.archivedependencies import get_sources_list_for_building |
| 216 | 19 | from lp.soyuz.model.processor import ProcessorFamilySet | 22 | from lp.soyuz.model.processor import ProcessorFamilySet |
| 217 | 20 | from lp.soyuz.model.recipebuilder import RecipeBuildBehavior | ||
| 218 | 21 | from lp.soyuz.model.sourcepackagerecipebuild import ( | ||
| 219 | 22 | SourcePackageRecipeBuild) | ||
| 220 | 23 | from lp.soyuz.tests.soyuzbuilddhelpers import (MockBuilder, | 23 | from lp.soyuz.tests.soyuzbuilddhelpers import (MockBuilder, |
| 221 | 24 | SaneBuildingSlave,) | 24 | SaneBuildingSlave,) |
| 222 | 25 | from lp.soyuz.tests.test_binarypackagebuildbehavior import ( | 25 | from lp.soyuz.tests.test_binarypackagebuildbehavior import ( |
| 223 | 26 | 26 | ||
| 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 | 20 | 20 | ||
| 229 | 21 | from lp.archiveuploader.permission import ( | 21 | from lp.archiveuploader.permission import ( |
| 230 | 22 | ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA) | 22 | ArchiveDisabled, CannotUploadToArchive, InvalidPocketForPPA) |
| 238 | 23 | from lp.registry.interfaces.pocket import PackagePublishingPocket | 23 | from lp.code.interfaces.sourcepackagerecipe import ( |
| 232 | 24 | from lp.services.job.interfaces.job import ( | ||
| 233 | 25 | IJob, JobStatus) | ||
| 234 | 26 | from lp.soyuz.interfaces.archive import ArchivePurpose | ||
| 235 | 27 | from lp.soyuz.interfaces.buildqueue import ( | ||
| 236 | 28 | IBuildQueue) | ||
| 237 | 29 | from lp.soyuz.interfaces.sourcepackagerecipe import ( | ||
| 239 | 30 | ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource, | 24 | ForbiddenInstruction, ISourcePackageRecipe, ISourcePackageRecipeSource, |
| 240 | 31 | TooNewRecipeFormat) | 25 | TooNewRecipeFormat) |
| 242 | 32 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | 26 | from lp.code.interfaces.sourcepackagerecipebuild import ( |
| 243 | 33 | ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob) | 27 | ISourcePackageRecipeBuild, ISourcePackageRecipeBuildJob) |
| 244 | 34 | from lp.soyuz.model.buildqueue import ( | 28 | from lp.soyuz.model.buildqueue import ( |
| 245 | 35 | BuildQueue) | 29 | BuildQueue) |
| 247 | 36 | from lp.soyuz.model.sourcepackagerecipebuild import ( | 30 | from lp.code.model.sourcepackagerecipebuild import ( |
| 248 | 37 | SourcePackageRecipeBuildJob) | 31 | SourcePackageRecipeBuildJob) |
| 250 | 38 | from lp.soyuz.model.sourcepackagerecipe import ( | 32 | from lp.code.model.sourcepackagerecipe import ( |
| 251 | 39 | NonPPABuildRequest) | 33 | NonPPABuildRequest) |
| 252 | 34 | from lp.registry.interfaces.pocket import PackagePublishingPocket | ||
| 253 | 35 | from lp.services.job.interfaces.job import ( | ||
| 254 | 36 | IJob, JobStatus) | ||
| 255 | 37 | from lp.soyuz.interfaces.archive import ArchivePurpose | ||
| 256 | 38 | from lp.soyuz.interfaces.buildqueue import ( | ||
| 257 | 39 | IBuildQueue) | ||
| 258 | 40 | from lp.testing import login_person, TestCaseWithFactory | 40 | from lp.testing import login_person, TestCaseWithFactory |
| 259 | 41 | 41 | ||
| 260 | 42 | 42 | ||
| 261 | 43 | 43 | ||
| 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 | 14 | from canonical.testing.layers import DatabaseFunctionalLayer | 14 | from canonical.testing.layers import DatabaseFunctionalLayer |
| 267 | 15 | 15 | ||
| 268 | 16 | from lp.buildmaster.interfaces.buildbase import IBuildBase | 16 | from lp.buildmaster.interfaces.buildbase import IBuildBase |
| 271 | 17 | from lp.soyuz.interfaces.buildqueue import IBuildQueue | 17 | from lp.code.interfaces.sourcepackagerecipebuild import ( |
| 270 | 18 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 272 | 19 | ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild, | 18 | ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuild, |
| 273 | 20 | ISourcePackageRecipeBuildSource) | 19 | ISourcePackageRecipeBuildSource) |
| 274 | 20 | from lp.soyuz.interfaces.buildqueue import IBuildQueue | ||
| 275 | 21 | from lp.testing import TestCaseWithFactory | 21 | from lp.testing import TestCaseWithFactory |
| 276 | 22 | 22 | ||
| 277 | 23 | 23 | ||
| 278 | 24 | 24 | ||
| 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 | 929 | factory="lp.soyuz.model.binarypackagebuildbehavior.BinaryPackageBuildBehavior" | 929 | factory="lp.soyuz.model.binarypackagebuildbehavior.BinaryPackageBuildBehavior" |
| 284 | 930 | permission="zope.Public" /> | 930 | permission="zope.Public" /> |
| 285 | 931 | 931 | ||
| 286 | 932 | <!-- SourcePackageRecipe --> | ||
| 287 | 933 | |||
| 288 | 934 | <securedutility | ||
| 289 | 935 | component="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe" | ||
| 290 | 936 | provides="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"> | ||
| 291 | 937 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipeSource"/> | ||
| 292 | 938 | </securedutility> | ||
| 293 | 939 | |||
| 294 | 940 | <class | ||
| 295 | 941 | class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild"> | ||
| 296 | 942 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"/> | ||
| 297 | 943 | </class> | ||
| 298 | 944 | |||
| 299 | 945 | <securedutility | ||
| 300 | 946 | component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuild" | ||
| 301 | 947 | provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"> | ||
| 302 | 948 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildSource"/> | ||
| 303 | 949 | </securedutility> | ||
| 304 | 950 | |||
| 305 | 951 | <class | ||
| 306 | 952 | class="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob"> | ||
| 307 | 953 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJob"/> | ||
| 308 | 954 | </class> | ||
| 309 | 955 | |||
| 310 | 956 | <securedutility | ||
| 311 | 957 | component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob" | ||
| 312 | 958 | provides="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"> | ||
| 313 | 959 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuildJobSource"/> | ||
| 314 | 960 | </securedutility> | ||
| 315 | 961 | |||
| 316 | 962 | <adapter factory="lp.soyuz.model.recipebuilder.RecipeBuildBehavior" | ||
| 317 | 963 | permission="zope.Public" /> | ||
| 318 | 964 | |||
| 319 | 965 | <!-- SourcePackageRecipe --> | ||
| 320 | 966 | <class | ||
| 321 | 967 | class="lp.soyuz.model.sourcepackagerecipe.SourcePackageRecipe"> | ||
| 322 | 968 | <allow interface="lp.soyuz.interfaces.sourcepackagerecipe.ISourcePackageRecipe"/> | ||
| 323 | 969 | <require | ||
| 324 | 970 | permission="launchpad.Edit" | ||
| 325 | 971 | set_attributes="builder_recipe"/> | ||
| 326 | 972 | </class> | ||
| 327 | 973 | <class | ||
| 328 | 974 | class="bzrlib.plugins.builder.recipe.BaseRecipeBranch"> | ||
| 329 | 975 | <allow attributes="name url revspec revid child_branches deb_version __str__" /> | ||
| 330 | 976 | </class> | ||
| 331 | 977 | <class | ||
| 332 | 978 | class="bzrlib.plugins.builder.recipe.RecipeBranch"> | ||
| 333 | 979 | <allow attributes="name url revspec revid child_branches __str__" /> | ||
| 334 | 980 | </class> | ||
| 335 | 981 | <class | ||
| 336 | 982 | class="bzrlib.plugins.builder.recipe.MergeInstruction"> | ||
| 337 | 983 | <allow attributes="as_tuple recipe_branch nest_path" /> | ||
| 338 | 984 | </class> | ||
| 339 | 985 | <class | ||
| 340 | 986 | class="bzrlib.plugins.builder.recipe.NestInstruction"> | ||
| 341 | 987 | <allow attributes="as_tuple recipe_branch nest_path" /> | ||
| 342 | 988 | </class> | ||
| 343 | 989 | |||
| 344 | 990 | <utility component="lp.soyuz.model.sourcepackagerecipebuild.SourcePackageRecipeBuildJob" | ||
| 345 | 991 | name="RECIPEBRANCHBUILD" | ||
| 346 | 992 | provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/> | ||
| 347 | 993 | |||
| 348 | 994 | </configure> | 932 | </configure> |
| 349 | 995 | 933 | ||
| 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 | 36 | from canonical.autodecorate import AutoDecorate | 36 | from canonical.autodecorate import AutoDecorate |
| 355 | 37 | from canonical.config import config | 37 | from canonical.config import config |
| 356 | 38 | from canonical.database.constants import UTC_NOW | 38 | from canonical.database.constants import UTC_NOW |
| 357 | 39 | from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource | ||
| 358 | 40 | from lp.code.interfaces.sourcepackagerecipebuild import ( | ||
| 359 | 41 | ISourcePackageRecipeBuildSource, | ||
| 360 | 42 | ) | ||
| 361 | 39 | from lp.codehosting.codeimport.worker import CodeImportSourceDetails | 43 | from lp.codehosting.codeimport.worker import CodeImportSourceDetails |
| 362 | 40 | from canonical.database.sqlbase import flush_database_updates | 44 | from canonical.database.sqlbase import flush_database_updates |
| 363 | 41 | from lp.soyuz.adapters.packagelocation import PackageLocation | 45 | from lp.soyuz.adapters.packagelocation import PackageLocation |
| 364 | 42 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus | 46 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus |
| 365 | 43 | from lp.soyuz.interfaces.section import ISectionSet | 47 | from lp.soyuz.interfaces.section import ISectionSet |
| 366 | 44 | from lp.soyuz.interfaces.sourcepackagerecipebuild import ( | ||
| 367 | 45 | ISourcePackageRecipeBuildSource, | ||
| 368 | 46 | ) | ||
| 369 | 47 | from lp.soyuz.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource | ||
| 370 | 48 | from canonical.launchpad.database.account import Account | 48 | from canonical.launchpad.database.account import Account |
| 371 | 49 | from canonical.launchpad.database.emailaddress import EmailAddress | 49 | from canonical.launchpad.database.emailaddress import EmailAddress |
| 372 | 50 | from canonical.launchpad.database.message import Message, MessageChunk | 50 | from canonical.launchpad.database.message import Message, MessageChunk |
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_sourcepack