Launchpad itself

Merge lp:~wgrant/launchpad/buildstatus-to-buildmaster into lp:launchpad

  1. buildstatus-to-buildmaster
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Michael Nelson
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/buildstatus-to-buildmaster
Merge into: lp:launchpad
Prerequisite: lp:~wgrant/launchpad/buildqueue-to-buildmaster
Diff against target: 1503 lines (+244/-256)
61 files modified
lib/canonical/launchpad/doc/tales.txt (+1/-1)
lib/canonical/launchpad/interfaces/_schema_circular_imports.py (+2/-5)
lib/canonical/launchpad/webapp/tales.py (+11/-11)
lib/lp/archiveuploader/dscfile.py (+6/-6)
lib/lp/archiveuploader/nascentuploadfile.py (+2/-2)
lib/lp/archiveuploader/tests/test_recipeuploads.py (+1/-1)
lib/lp/buildmaster/interfaces/buildbase.py (+87/-4)
lib/lp/buildmaster/master.py (+2/-1)
lib/lp/buildmaster/model/buildbase.py (+1/-1)
lib/lp/buildmaster/model/builder.py (+2/-1)
lib/lp/buildmaster/model/buildqueue.py (+5/-8)
lib/lp/buildmaster/model/packagebuildfarmjob.py (+1/-1)
lib/lp/buildmaster/tests/queuebuilder.txt (+2/-1)
lib/lp/buildmaster/tests/test_builder.py (+2/-1)
lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py (+1/-1)
lib/lp/buildmaster/tests/test_buildqueue.py (+1/-1)
lib/lp/buildmaster/tests/test_manager.py (+2/-1)
lib/lp/code/model/sourcepackagerecipebuild.py (+1/-2)
lib/lp/registry/browser/person.py (+2/-2)
lib/lp/registry/model/sourcepackage.py (+1/-1)
lib/lp/soyuz/browser/archive.py (+3/-4)
lib/lp/soyuz/browser/build.py (+2/-2)
lib/lp/soyuz/browser/tests/archive-views.txt (+2/-1)
lib/lp/soyuz/browser/tests/build-views.txt (+1/-1)
lib/lp/soyuz/browser/tests/builder-views.txt (+1/-1)
lib/lp/soyuz/doc/archive.txt (+1/-2)
lib/lp/soyuz/doc/build-estimated-dispatch-time.txt (+1/-2)
lib/lp/soyuz/doc/build-notification.txt (+4/-4)
lib/lp/soyuz/doc/build.txt (+2/-1)
lib/lp/soyuz/doc/buildd-dispatching.txt (+1/-1)
lib/lp/soyuz/doc/buildd-slavescanner.txt (+1/-1)
lib/lp/soyuz/doc/hasbuildrecords.txt (+1/-1)
lib/lp/soyuz/doc/packageupload-lookups.txt (+1/-1)
lib/lp/soyuz/doc/publishing.txt (+1/-1)
lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt (+1/-1)
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+3/-2)
lib/lp/soyuz/interfaces/build.py (+1/-89)
lib/lp/soyuz/model/archive.py (+2/-1)
lib/lp/soyuz/model/build.py (+2/-1)
lib/lp/soyuz/model/buildpackagejob.py (+2/-1)
lib/lp/soyuz/model/publishing.py (+10/-9)
lib/lp/soyuz/model/sourcepackagerelease.py (+6/-6)
lib/lp/soyuz/scripts/gina/handlers.py (+12/-17)
lib/lp/soyuz/scripts/packagecopier.py (+8/-13)
lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py (+6/-7)
lib/lp/soyuz/scripts/tests/test_copypackage.py (+2/-2)
lib/lp/soyuz/scripts/tests/test_populatearchive.py (+3/-2)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+3/-2)
lib/lp/soyuz/stories/soyuz/xx-build-record.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-builds.txt (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+1/-1)
lib/lp/soyuz/tests/test_build.py (+3/-3)
lib/lp/soyuz/tests/test_buildpackagejob.py (+1/-1)
lib/lp/soyuz/tests/test_packageupload.py (+1/-1)
lib/lp/soyuz/tests/test_publishing.py (+10/-10)
lib/lp/soyuz/tests/test_publishing_models.py (+1/-1)
lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py (+1/-1)
scripts/ftpmaster-tools/buildd-mass-retry.py (+3/-3)
scripts/ftpmaster-tools/initialise-from-parent.py (+3/-3)
To merge this branch: bzr merge lp:~wgrant/launchpad/buildstatus-to-buildmaster
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+20892@code.launchpad.net

Commit message

Move BuildStatus from lp.soyuz to lp.buildmaster, and drop unused lp.soyuz.interfaces.build.incomplete_build_status.

Description of the change

This branch does the following:

 - Moves lp.soyuz.interfaces.build.BuildStatus to lp.buildmaster.interfaces.buildbase, where we would have moved it during the spring if it wasn't such a huge diff.
 - Removes the IBuildBase['buildstatus'] circular import hack from _schema_circular_imports, since BuildStatus is now in the same file.
 - Removes lp.soyuz.interfaces.build.incomplete_building_status, since it's unused, and would otherwise itself need to be moved.
 - Fixes all of the BuildStatus imports to point at the new location. THERE ARE LOTS.

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

Thanks for the other cleanups along the way too (moving imports from canonical.launchpad to lp.registry etc., and various re-orderings.)

I'll send this off to ec2 land now.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt 2010-03-06 21:38:23 +0000
+++ lib/canonical/launchpad/doc/tales.txt 2010-03-09 20:58:30 +0000
@@ -197,7 +197,7 @@
197197
198The 'building' build is 14x14:198The 'building' build is 14x14:
199199
200 >>> from lp.soyuz.interfaces.build import BuildStatus200 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
201 >>> build.buildstate = BuildStatus.BUILDING201 >>> build.buildstate = BuildStatus.BUILDING
202 >>> print test_tales("build/image:icon", build=build)202 >>> print test_tales("build/image:icon", build=build)
203 <img width="14" height="14"...src="/@@/processing" />203 <img width="14" height="14"...src="/@@/processing" />
204204
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-02-27 21:18:10 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-03-09 20:58:30 +0000
@@ -31,13 +31,12 @@
31from lp.bugs.interfaces.bugtarget import IHasBugs, IBugTarget31from lp.bugs.interfaces.bugtarget import IHasBugs, IBugTarget
32from lp.bugs.interfaces.bugtracker import IBugTracker32from lp.bugs.interfaces.bugtracker import IBugTracker
33from lp.bugs.interfaces.bugwatch import IBugWatch33from lp.bugs.interfaces.bugwatch import IBugWatch
34from lp.soyuz.interfaces.build import (34from lp.buildmaster.interfaces.buildbase import BuildStatus
35 BuildStatus, IBuild)35from lp.soyuz.interfaces.build import IBuild
36from lp.soyuz.interfaces.buildrecords import IHasBuildRecords36from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
37from lp.blueprints.interfaces.specification import ISpecification37from lp.blueprints.interfaces.specification import ISpecification
38from lp.blueprints.interfaces.specificationbranch import (38from lp.blueprints.interfaces.specificationbranch import (
39 ISpecificationBranch)39 ISpecificationBranch)
40from lp.buildmaster.interfaces.buildbase import IBuildBase
41from lp.code.interfaces.branch import IBranch40from lp.code.interfaces.branch import IBranch
42from lp.code.interfaces.branchmergeproposal import IBranchMergeProposal41from lp.code.interfaces.branchmergeproposal import IBranchMergeProposal
43from lp.code.interfaces.branchsubscription import IBranchSubscription42from lp.code.interfaces.branchsubscription import IBranchSubscription
@@ -322,8 +321,6 @@
322 IStructuralSubscriptionTarget, 'parent_subscription_target',321 IStructuralSubscriptionTarget, 'parent_subscription_target',
323 IStructuralSubscriptionTarget)322 IStructuralSubscriptionTarget)
324323
325IBuildBase['buildstate'].vocabulary = BuildStatus
326
327patch_reference_property(324patch_reference_property(
328 ISourcePackageRelease, 'source_package_recipe_build', ISourcePackageRecipeBuild)325 ISourcePackageRelease, 'source_package_recipe_build', ISourcePackageRecipeBuild)
329326
330327
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py 2010-03-08 13:51:22 +0000
+++ lib/canonical/launchpad/webapp/tales.py 2010-03-09 20:58:30 +0000
@@ -21,6 +21,7 @@
21from xml.sax.saxutils import unescape as xml_unescape21from xml.sax.saxutils import unescape as xml_unescape
22from datetime import datetime, timedelta22from datetime import datetime, timedelta
23from lazr.enum import enumerated_type_registry23from lazr.enum import enumerated_type_registry
24from lazr.uri import URI
2425
25from zope.interface import Interface, Attribute, implements26from zope.interface import Interface, Attribute, implements
26from zope.component import getUtility, queryAdapter, getMultiAdapter27from zope.component import getUtility, queryAdapter, getMultiAdapter
@@ -42,27 +43,26 @@
42 IBug, IBugSet, IDistribution, IFAQSet,43 IBug, IBugSet, IDistribution, IFAQSet,
43 IProduct, IProjectGroup, IDistributionSourcePackage, ISprint,44 IProduct, IProjectGroup, IDistributionSourcePackage, ISprint,
44 LicenseStatus, NotFoundError)45 LicenseStatus, NotFoundError)
45from lp.blueprints.interfaces.specification import ISpecification
46from lp.code.interfaces.branch import IBranch
47from lp.soyuz.interfaces.archive import ArchivePurpose, IPPA
48from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
49from canonical.launchpad.interfaces.launchpad import (46from canonical.launchpad.interfaces.launchpad import (
50 IHasIcon, IHasLogo, IHasMugshot, IPrivacy)47 IHasIcon, IHasLogo, IHasMugshot, IPrivacy)
51from lp.registry.interfaces.person import IPerson, IPersonSet48import canonical.launchpad.pagetitles
49from canonical.launchpad.webapp import canonical_url, urlappend
50from canonical.launchpad.webapp.authorization import check_permission
51from canonical.launchpad.webapp.badge import IHasBadges
52from canonical.launchpad.webapp.interfaces import (52from canonical.launchpad.webapp.interfaces import (
53 IApplicationMenu, IContextMenu, IFacetMenu, ILaunchBag, INavigationMenu,53 IApplicationMenu, IContextMenu, IFacetMenu, ILaunchBag, INavigationMenu,
54 IPrimaryContext, NoCanonicalUrl)54 IPrimaryContext, NoCanonicalUrl)
55import canonical.launchpad.pagetitles
56from canonical.launchpad.webapp import canonical_url, urlappend
57from lazr.uri import URI
58from canonical.launchpad.webapp.menu import get_current_view, get_facet55from canonical.launchpad.webapp.menu import get_current_view, get_facet
59from canonical.launchpad.webapp.publisher import (56from canonical.launchpad.webapp.publisher import (
60 get_current_browser_request, LaunchpadView, nearest)57 get_current_browser_request, LaunchpadView, nearest)
61from canonical.launchpad.webapp.authorization import check_permission
62from canonical.launchpad.webapp.badge import IHasBadges
63from canonical.launchpad.webapp.session import get_cookie_domain58from canonical.launchpad.webapp.session import get_cookie_domain
64from canonical.lazr.canonicalurl import nearest_adapter59from canonical.lazr.canonicalurl import nearest_adapter
65from lp.soyuz.interfaces.build import BuildStatus60from lp.blueprints.interfaces.specification import ISpecification
61from lp.buildmaster.interfaces.buildbase import BuildStatus
62from lp.code.interfaces.branch import IBranch
63from lp.soyuz.interfaces.archive import ArchivePurpose, IPPA
64from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
65from lp.registry.interfaces.person import IPerson, IPersonSet
6666
6767
68SEPARATOR = ' : '68SEPARATOR = ' : '
6969
=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py 2010-02-16 02:30:15 +0000
+++ lib/lp/archiveuploader/dscfile.py 2010-03-09 20:58:30 +0000
@@ -25,6 +25,11 @@
2525
26from zope.component import getUtility26from zope.component import getUtility
2727
28from canonical.encoding import guess as guess_encoding
29from canonical.launchpad.interfaces import (
30 GPGVerificationError, IGPGHandler, IGPGKeySet,
31 ISourcePackageNameSet, NotFoundError)
32from canonical.librarian.utils import copy_and_close
28from lp.archiveuploader.nascentuploadfile import (33from lp.archiveuploader.nascentuploadfile import (
29 UploadWarning, UploadError, NascentUploadFile, SourceUploadFile)34 UploadWarning, UploadError, NascentUploadFile, SourceUploadFile)
30from lp.archiveuploader.tagfiles import (35from lp.archiveuploader.tagfiles import (
@@ -33,18 +38,13 @@
33 determine_source_file_type, get_source_file_extension,38 determine_source_file_type, get_source_file_extension,
34 ParseMaintError, prefix_multi_line_string, re_is_component_orig_tar_ext,39 ParseMaintError, prefix_multi_line_string, re_is_component_orig_tar_ext,
35 re_issource, re_valid_pkg_name, re_valid_version, safe_fix_maintainer)40 re_issource, re_valid_pkg_name, re_valid_version, safe_fix_maintainer)
36from canonical.encoding import guess as guess_encoding41from lp.buildmaster.interfaces.buildbase import BuildStatus
37from lp.code.interfaces.sourcepackagerecipebuild import (42from lp.code.interfaces.sourcepackagerecipebuild import (
38 ISourcePackageRecipeBuildSource)43 ISourcePackageRecipeBuildSource)
39from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale44from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
40from lp.registry.interfaces.sourcepackage import SourcePackageFileType45from lp.registry.interfaces.sourcepackage import SourcePackageFileType
41from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet46from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
42from lp.soyuz.interfaces.build import BuildStatus
43from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat47from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
44from canonical.launchpad.interfaces import (
45 GPGVerificationError, IGPGHandler, IGPGKeySet,
46 ISourcePackageNameSet, NotFoundError)
47from canonical.librarian.utils import copy_and_close
4848
4949
50class SignableTagFile:50class SignableTagFile:
5151
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py 2010-02-09 00:17:40 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py 2010-03-09 20:58:30 +0000
@@ -34,12 +34,12 @@
34 re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,34 re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,
35 re_extract_src_version, determine_source_file_type)35 re_extract_src_version, determine_source_file_type)
36from canonical.encoding import guess as guess_encoding36from canonical.encoding import guess as guess_encoding
37from lp.buildmaster.interfaces.buildbase import BuildStatus
37from lp.soyuz.interfaces.binarypackagename import (38from lp.soyuz.interfaces.binarypackagename import (
38 IBinaryPackageNameSet)39 IBinaryPackageNameSet)
39from lp.soyuz.interfaces.binarypackagerelease import (40from lp.soyuz.interfaces.binarypackagerelease import (
40 BinaryPackageFormat)41 BinaryPackageFormat)
41from lp.soyuz.interfaces.build import (42from lp.soyuz.interfaces.build import IBuildSet
42 BuildStatus, IBuildSet)
43from lp.soyuz.interfaces.component import IComponentSet43from lp.soyuz.interfaces.component import IComponentSet
44from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet44from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
45from lp.soyuz.interfaces.queue import (45from lp.soyuz.interfaces.queue import (
4646
=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-02-22 11:16:49 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-03-09 20:58:30 +0000
@@ -14,9 +14,9 @@
14from lp.archiveuploader.tests.test_uploadprocessor import (14from lp.archiveuploader.tests.test_uploadprocessor import (
15 TestUploadProcessorBase)15 TestUploadProcessorBase)
16from lp.archiveuploader.uploadprocessor import UploadProcessor16from lp.archiveuploader.uploadprocessor import UploadProcessor
17from lp.buildmaster.interfaces.buildbase import BuildStatus
17from lp.code.interfaces.sourcepackagerecipebuild import (18from lp.code.interfaces.sourcepackagerecipebuild import (
18 ISourcePackageRecipeBuildSource)19 ISourcePackageRecipeBuildSource)
19from lp.soyuz.interfaces.build import BuildStatus
20from lp.soyuz.interfaces.queue import PackageUploadStatus20from lp.soyuz.interfaces.queue import PackageUploadStatus
2121
2222
2323
=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py 2010-03-09 20:58:30 +0000
@@ -7,11 +7,15 @@
77
8__metaclass__ = type8__metaclass__ = type
99
10__all__ = ['BUILDD_MANAGER_LOG_NAME', 'IBuildBase']10__all__ = [
11 'BUILDD_MANAGER_LOG_NAME',
12 'BuildStatus',
13 'IBuildBase',
14 ]
1115
12from zope.interface import Attribute, Interface16from zope.interface import Attribute, Interface
13from zope.schema import Choice, Datetime, Object, TextLine, Timedelta17from zope.schema import Choice, Datetime, Object, TextLine, Timedelta
14from lazr.enum import DBEnumeratedType18from lazr.enum import DBEnumeratedType, DBItem
15from lazr.restful.declarations import exported19from lazr.restful.declarations import exported
16from lazr.restful.fields import Reference20from lazr.restful.fields import Reference
1721
@@ -27,6 +31,86 @@
27BUILDD_MANAGER_LOG_NAME = "slave-scanner"31BUILDD_MANAGER_LOG_NAME = "slave-scanner"
2832
2933
34class BuildStatus(DBEnumeratedType):
35 """Build status type
36
37 Builds exist in the database in a number of states such as 'complete',
38 'needs build' and 'dependency wait'. We need to track these states in
39 order to correctly manage the autobuilder queues in the BuildQueue table.
40 """
41
42 NEEDSBUILD = DBItem(0, """
43 Needs building
44
45 Build record is fresh and needs building. Nothing is yet known to
46 block this build and it is a candidate for building on any free
47 builder of the relevant architecture
48 """)
49
50 FULLYBUILT = DBItem(1, """
51 Successfully built
52
53 Build record is an historic account of the build. The build is complete
54 and needs no further work to complete it. The build log etc are all
55 in place if available.
56 """)
57
58 FAILEDTOBUILD = DBItem(2, """
59 Failed to build
60
61 Build record is an historic account of the build. The build failed and
62 cannot be automatically retried. Either a new upload will be needed
63 or the build will have to be manually reset into 'NEEDSBUILD' when
64 the issue is corrected
65 """)
66
67 MANUALDEPWAIT = DBItem(3, """
68 Dependency wait
69
70 Build record represents a package whose build dependencies cannot
71 currently be satisfied within the relevant DistroArchSeries. This
72 build will have to be manually given back (put into 'NEEDSBUILD') when
73 the dependency issue is resolved.
74 """)
75
76 CHROOTWAIT = DBItem(4, """
77 Chroot problem
78
79 Build record represents a build which needs a chroot currently known
80 to be damaged or bad in some way. The buildd maintainer will have to
81 reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
82 has been fixed.
83 """)
84
85 SUPERSEDED = DBItem(5, """
86 Build for superseded Source
87
88 Build record represents a build which never got to happen because the
89 source package release for the build was superseded before the job
90 was scheduled to be run on a builder. Builds which reach this state
91 will rarely if ever be reset to any other state.
92 """)
93
94 BUILDING = DBItem(6, """
95 Currently building
96
97 Build record represents a build which is being build by one of the
98 available builders.
99 """)
100
101 FAILEDTOUPLOAD = DBItem(7, """
102 Failed to upload
103
104 Build record is an historic account of a build that could not be
105 uploaded correctly. It's mainly genereated by failures in
106 process-upload which quietly rejects the binary upload resulted
107 by the build procedure.
108 In those cases all the build historic information will be stored (
109 buildlog, datebuilt, duration, builder, etc) and the buildd admins
110 will be notified via process-upload about the reason of the rejection.
111 """)
112
113
30class IBuildBase(Interface):114class IBuildBase(Interface):
31 """Common interface shared by farm jobs that build a package."""115 """Common interface shared by farm jobs that build a package."""
32116
@@ -37,10 +121,9 @@
37 title=_('Date created'), required=True, readonly=True,121 title=_('Date created'), required=True, readonly=True,
38 description=_("The time when the build request was created.")))122 description=_("The time when the build request was created.")))
39123
40 # Really BuildStatus. Patched in _schema_circular_imports.
41 buildstate = exported(124 buildstate = exported(
42 Choice(125 Choice(
43 title=_('State'), required=True, vocabulary=DBEnumeratedType,126 title=_('State'), required=True, vocabulary=BuildStatus,
44 description=_("The current build state.")))127 description=_("The current build state.")))
45128
46 date_first_dispatched = exported(129 date_first_dispatched = exported(
47130
=== modified file 'lib/lp/buildmaster/master.py'
--- lib/lp/buildmaster/master.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/master.py 2010-03-09 20:58:30 +0000
@@ -22,11 +22,12 @@
22from canonical.config import config22from canonical.config import config
23from canonical.librarian.interfaces import ILibrarianClient23from canonical.librarian.interfaces import ILibrarianClient
24from lp.archivepublisher.utils import process_in_batches24from lp.archivepublisher.utils import process_in_batches
25from lp.buildmaster.interfaces.buildbase import BuildStatus
25from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet26from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
26from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific27from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific
27from lp.buildmaster.buildergroup import BuilderGroup28from lp.buildmaster.buildergroup import BuilderGroup
28from lp.soyuz.interfaces.archive import ArchivePurpose29from lp.soyuz.interfaces.archive import ArchivePurpose
29from lp.soyuz.interfaces.build import BuildStatus, IBuildSet30from lp.soyuz.interfaces.build import IBuildSet
3031
3132
32def determineArchitecturesToBuild(pubrec, legal_archseries,33def determineArchitecturesToBuild(pubrec, legal_archseries,
3334
=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/buildbase.py 2010-03-09 20:58:30 +0000
@@ -29,10 +29,10 @@
29from canonical.launchpad.helpers import filenameToContentType29from canonical.launchpad.helpers import filenameToContentType
30from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet30from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
31from canonical.librarian.utils import copy_and_close31from canonical.librarian.utils import copy_and_close
32from lp.buildmaster.interfaces.buildbase import BuildStatus
32from lp.buildmaster.model.buildqueue import BuildQueue33from lp.buildmaster.model.buildqueue import BuildQueue
33from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME34from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
34from lp.registry.interfaces.pocket import pocketsuffix35from lp.registry.interfaces.pocket import pocketsuffix
35from lp.soyuz.interfaces.build import BuildStatus
3636
3737
38UPLOAD_LOG_FILENAME = 'uploader.log'38UPLOAD_LOG_FILENAME = 'uploader.log'
3939
=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/builder.py 2010-03-09 20:58:30 +0000
@@ -37,6 +37,7 @@
37 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)37 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
38from canonical.lazr.utils import safe_hasattr38from canonical.lazr.utils import safe_hasattr
39from canonical.librarian.utils import copy_and_close39from canonical.librarian.utils import copy_and_close
40from lp.buildmaster.interfaces.buildbase import BuildStatus
40from lp.buildmaster.interfaces.builder import (41from lp.buildmaster.interfaces.builder import (
41 BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,42 BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
42 CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)43 CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
@@ -52,7 +53,7 @@
52# XXX Michael Nelson 2010-01-13 bug=49133053# XXX Michael Nelson 2010-01-13 bug=491330
53# These dependencies on soyuz will be removed when getBuildRecords()54# These dependencies on soyuz will be removed when getBuildRecords()
54# is moved.55# is moved.
55from lp.soyuz.interfaces.build import BuildStatus, IBuildSet56from lp.soyuz.interfaces.build import IBuildSet
56from lp.soyuz.interfaces.buildrecords import IHasBuildRecords57from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
57from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet58from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
58from lp.soyuz.model.buildpackagejob import BuildPackageJob59from lp.soyuz.model.buildpackagejob import BuildPackageJob
5960
=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/buildqueue.py 2010-03-09 20:58:30 +0000
@@ -15,18 +15,18 @@
15from datetime import datetime, timedelta15from datetime import datetime, timedelta
16import logging16import logging
1717
18from zope.component import getSiteManager, getUtility
19
20from zope.interface import implements
21
22from sqlobject import (18from sqlobject import (
23 StringCol, ForeignKey, BoolCol, IntCol, IntervalCol, SQLObjectNotFound)19 StringCol, ForeignKey, BoolCol, IntCol, IntervalCol, SQLObjectNotFound)
24from storm.expr import In, Join, LeftJoin20from storm.expr import In, Join, LeftJoin
25from storm.store import Store21from storm.store import Store
22from zope.component import getSiteManager, getUtility
23from zope.interface import implements
2624
27from canonical.database.enumcol import EnumCol25from canonical.database.enumcol import EnumCol
28from canonical.database.sqlbase import SQLBase, sqlvalues26from canonical.database.sqlbase import SQLBase, sqlvalues
29from canonical.launchpad.webapp.interfaces import NotFoundError27from canonical.launchpad.webapp.interfaces import (
28 DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, NotFoundError)
29from lp.buildmaster.interfaces.buildbase import BuildStatus
30from lp.buildmaster.interfaces.buildfarmjob import (30from lp.buildmaster.interfaces.buildfarmjob import (
31 BuildFarmJobType, IBuildFarmJob)31 BuildFarmJobType, IBuildFarmJob)
32from lp.buildmaster.interfaces.buildfarmjobbehavior import (32from lp.buildmaster.interfaces.buildfarmjobbehavior import (
@@ -34,10 +34,7 @@
34from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet34from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
35from lp.services.job.interfaces.job import JobStatus35from lp.services.job.interfaces.job import JobStatus
36from lp.services.job.model.job import Job36from lp.services.job.model.job import Job
37from lp.soyuz.interfaces.build import BuildStatus
38from lp.soyuz.model.buildpackagejob import BuildPackageJob37from lp.soyuz.model.buildpackagejob import BuildPackageJob
39from canonical.launchpad.webapp.interfaces import (
40 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
4138
4239
43def normalize_virtualization(virtualized):40def normalize_virtualization(virtualized):
4441
=== modified file 'lib/lp/buildmaster/model/packagebuildfarmjob.py'
--- lib/lp/buildmaster/model/packagebuildfarmjob.py 2010-03-09 14:11:00 +0000
+++ lib/lp/buildmaster/model/packagebuildfarmjob.py 2010-03-09 20:58:30 +0000
@@ -7,8 +7,8 @@
77
8from canonical.database.constants import UTC_NOW8from canonical.database.constants import UTC_NOW
99
10from lp.buildmaster.interfaces.buildbase import BuildStatus
10from lp.buildmaster.model.buildfarmjob import BuildFarmJob11from lp.buildmaster.model.buildfarmjob import BuildFarmJob
11from lp.soyuz.interfaces.build import BuildStatus
1212
1313
14class PackageBuildFarmJob(BuildFarmJob):14class PackageBuildFarmJob(BuildFarmJob):
1515
=== modified file 'lib/lp/buildmaster/tests/queuebuilder.txt'
--- lib/lp/buildmaster/tests/queuebuilder.txt 2010-01-10 04:58:44 +0000
+++ lib/lp/buildmaster/tests/queuebuilder.txt 2010-03-09 20:58:30 +0000
@@ -229,7 +229,8 @@
229 >>> copied_pub = pub_failed.copyTo(229 >>> copied_pub = pub_failed.copyTo(
230 ... hoary, PackagePublishingPocket.RELEASE, warty.main_archive)230 ... hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
231231
232 >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet232 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
233 >>> from lp.soyuz.interfaces.build import IBuildSet
233 >>> failed_build = pub_failed.sourcepackagerelease.createBuild(234 >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
234 ... warty['i386'], PackagePublishingPocket.RELEASE,235 ... warty['i386'], PackagePublishingPocket.RELEASE,
235 ... warty.main_archive, status=BuildStatus.FAILEDTOBUILD)236 ... warty.main_archive, status=BuildStatus.FAILEDTOBUILD)
236237
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2010-03-06 00:32:52 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2010-03-09 20:58:30 +0000
@@ -11,13 +11,14 @@
11from canonical.launchpad.webapp.interfaces import (11from canonical.launchpad.webapp.interfaces import (
12 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)12 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
13from canonical.testing import LaunchpadZopelessLayer13from canonical.testing import LaunchpadZopelessLayer
14from lp.buildmaster.interfaces.buildbase import BuildStatus
14from lp.buildmaster.interfaces.builder import IBuilderSet15from lp.buildmaster.interfaces.builder import IBuilderSet
15from lp.buildmaster.interfaces.buildfarmjobbehavior import (16from lp.buildmaster.interfaces.buildfarmjobbehavior import (
16 IBuildFarmJobBehavior)17 IBuildFarmJobBehavior)
17from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior18from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
18from lp.buildmaster.model.buildqueue import BuildQueue19from lp.buildmaster.model.buildqueue import BuildQueue
19from lp.soyuz.interfaces.archive import ArchivePurpose20from lp.soyuz.interfaces.archive import ArchivePurpose
20from lp.soyuz.interfaces.build import BuildStatus, IBuildSet21from lp.soyuz.interfaces.build import IBuildSet
21from lp.soyuz.interfaces.publishing import PackagePublishingStatus22from lp.soyuz.interfaces.publishing import PackagePublishingStatus
22from lp.soyuz.model.binarypackagebuildbehavior import (23from lp.soyuz.model.binarypackagebuildbehavior import (
23 BinaryPackageBuildBehavior)24 BinaryPackageBuildBehavior)
2425
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-02-11 19:11:11 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-03-09 20:58:30 +0000
@@ -5,8 +5,8 @@
55
6from unittest import TestCase, TestLoader6from unittest import TestCase, TestLoader
77
8from lp.buildmaster.interfaces.buildbase import BuildStatus
8from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase9from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
9from lp.soyuz.interfaces.build import BuildStatus
1010
1111
12class FakeBuildFarmJob:12class FakeBuildFarmJob:
1313
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py 2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-03-09 20:58:30 +0000
@@ -14,6 +14,7 @@
14 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)14 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
15from canonical.testing import LaunchpadZopelessLayer15from canonical.testing import LaunchpadZopelessLayer
1616
17from lp.buildmaster.interfaces.buildbase import BuildStatus
17from lp.buildmaster.interfaces.builder import IBuilderSet18from lp.buildmaster.interfaces.builder import IBuilderSet
18from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType19from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
19from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet20from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
@@ -22,7 +23,6 @@
22from lp.buildmaster.model.buildqueue import BuildQueue, get_builder_data23from lp.buildmaster.model.buildqueue import BuildQueue, get_builder_data
23from lp.services.job.model.job import Job24from lp.services.job.model.job import Job
24from lp.soyuz.interfaces.archive import ArchivePurpose25from lp.soyuz.interfaces.archive import ArchivePurpose
25from lp.soyuz.interfaces.build import BuildStatus
26from lp.soyuz.model.processor import ProcessorFamilySet26from lp.soyuz.model.processor import ProcessorFamilySet
27from lp.soyuz.interfaces.publishing import PackagePublishingStatus27from lp.soyuz.interfaces.publishing import PackagePublishingStatus
28from lp.soyuz.model.build import Build28from lp.soyuz.model.build import Build
2929
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py 2010-03-06 00:32:52 +0000
+++ lib/lp/buildmaster/tests/test_manager.py 2010-03-09 20:58:30 +0000
@@ -22,6 +22,7 @@
22from canonical.launchpad.scripts.logger import BufferLogger22from canonical.launchpad.scripts.logger import BufferLogger
23from canonical.testing.layers import (23from canonical.testing.layers import (
24 LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)24 LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
25from lp.buildmaster.interfaces.buildbase import BuildStatus
25from lp.buildmaster.interfaces.builder import IBuilderSet26from lp.buildmaster.interfaces.builder import IBuilderSet
26from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet27from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
27from lp.buildmaster.manager import (28from lp.buildmaster.manager import (
@@ -29,7 +30,7 @@
29 ResetDispatchResult, buildd_success_result_map)30 ResetDispatchResult, buildd_success_result_map)
30from lp.buildmaster.tests.harness import BuilddManagerTestSetup31from lp.buildmaster.tests.harness import BuilddManagerTestSetup
31from lp.registry.interfaces.distribution import IDistributionSet32from lp.registry.interfaces.distribution import IDistributionSet
32from lp.soyuz.interfaces.build import BuildStatus, IBuildSet33from lp.soyuz.interfaces.build import IBuildSet
33from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave34from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
34from lp.soyuz.tests.test_publishing import SoyuzTestPublisher35from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
3536
3637
=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-03-05 13:52:32 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-03-09 20:58:30 +0000
@@ -21,7 +21,7 @@
21from zope.component import getUtility21from zope.component import getUtility
22from zope.interface import classProvides, implements22from zope.interface import classProvides, implements
2323
24from lp.buildmaster.interfaces.buildbase import IBuildBase24from lp.buildmaster.interfaces.buildbase import BuildStatus, IBuildBase
25from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType25from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
26from lp.buildmaster.model.buildbase import BuildBase26from lp.buildmaster.model.buildbase import BuildBase
27from lp.buildmaster.model.buildqueue import BuildQueue27from lp.buildmaster.model.buildqueue import BuildQueue
@@ -33,7 +33,6 @@
33from lp.services.job.model.job import Job33from lp.services.job.model.job import Job
34from lp.soyuz.adapters.archivedependencies import (34from lp.soyuz.adapters.archivedependencies import (
35 default_component_dependency_name,)35 default_component_dependency_name,)
36from lp.soyuz.interfaces.build import BuildStatus
37from lp.soyuz.interfaces.component import IComponentSet36from lp.soyuz.interfaces.component import IComponentSet
38from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease37from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
3938
4039
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2010-03-08 18:01:33 +0000
+++ lib/lp/registry/browser/person.py 2010-03-09 20:58:30 +0000
@@ -175,8 +175,8 @@
175from lp.code.interfaces.branchnamespace import (175from lp.code.interfaces.branchnamespace import (
176 IBranchNamespaceSet, InvalidNamespace)176 IBranchNamespaceSet, InvalidNamespace)
177from lp.bugs.interfaces.bugtask import IBugTaskSet177from lp.bugs.interfaces.bugtask import IBugTaskSet
178from lp.soyuz.interfaces.build import (178from lp.buildmaster.interfaces.buildbase import BuildStatus
179 BuildStatus, IBuildSet)179from lp.soyuz.interfaces.build import IBuildSet
180from canonical.launchpad.interfaces.launchpad import (180from canonical.launchpad.interfaces.launchpad import (
181 ILaunchpadCelebrities, INotificationRecipientSet, UnknownRecipientError)181 ILaunchpadCelebrities, INotificationRecipientSet, UnknownRecipientError)
182from canonical.launchpad.interfaces.message import (182from canonical.launchpad.interfaces.message import (
183183
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py 2010-03-08 01:51:58 +0000
+++ lib/lp/registry/model/sourcepackage.py 2010-03-09 20:58:30 +0000
@@ -21,6 +21,7 @@
21from canonical.database.constants import UTC_NOW21from canonical.database.constants import UTC_NOW
22from canonical.database.sqlbase import flush_database_updates, sqlvalues22from canonical.database.sqlbase import flush_database_updates, sqlvalues
23from canonical.lazr.utils import smartquote23from canonical.lazr.utils import smartquote
24from lp.buildmaster.interfaces.buildbase import BuildStatus
24from lp.code.model.branch import Branch25from lp.code.model.branch import Branch
25from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin26from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
26from lp.bugs.model.bug import get_bug_tags_open_count27from lp.bugs.model.bug import get_bug_tags_open_count
@@ -48,7 +49,6 @@
48from lp.translations.model.translationimportqueue import (49from lp.translations.model.translationimportqueue import (
49 HasTranslationImportsMixin)50 HasTranslationImportsMixin)
50from canonical.launchpad.helpers import shortlist51from canonical.launchpad.helpers import shortlist
51from lp.soyuz.interfaces.build import BuildStatus
52from lp.soyuz.interfaces.buildrecords import IHasBuildRecords52from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
53from lp.registry.interfaces.packaging import PackagingType53from lp.registry.interfaces.packaging import PackagingType
54from lp.translations.interfaces.potemplate import IHasTranslationTemplates54from lp.translations.interfaces.potemplate import IHasTranslationTemplates
5555
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py 2010-03-08 05:03:15 +0000
+++ lib/lp/soyuz/browser/archive.py 2010-03-09 20:58:30 +0000
@@ -46,6 +46,7 @@
46from canonical.launchpad import _46from canonical.launchpad import _
47from canonical.launchpad.helpers import english_list47from canonical.launchpad.helpers import english_list
48from canonical.lazr.utils import smartquote48from canonical.lazr.utils import smartquote
49from lp.buildmaster.interfaces.buildbase import BuildStatus
49from lp.services.browser_helpers import get_user_agent_distroseries50from lp.services.browser_helpers import get_user_agent_distroseries
50from lp.soyuz.browser.build import BuildRecordsView51from lp.soyuz.browser.build import BuildRecordsView
51from lp.soyuz.browser.sourceslist import (52from lp.soyuz.browser.sourceslist import (
@@ -60,10 +61,8 @@
60 IArchiveSet, IPPAActivateForm, NoSuchPPA)61 IArchiveSet, IPPAActivateForm, NoSuchPPA)
61from lp.soyuz.interfaces.archivepermission import (62from lp.soyuz.interfaces.archivepermission import (
62 ArchivePermissionType, IArchivePermissionSet)63 ArchivePermissionType, IArchivePermissionSet)
63from lp.soyuz.interfaces.archivesubscriber import (64from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
64 IArchiveSubscriberSet)65from lp.soyuz.interfaces.build import BuildSetStatus, IBuildSet
65from lp.soyuz.interfaces.build import (
66 BuildStatus, BuildSetStatus, IBuildSet)
67from lp.soyuz.interfaces.buildrecords import IHasBuildRecords66from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
68from lp.soyuz.interfaces.component import IComponentSet67from lp.soyuz.interfaces.component import IComponentSet
69from lp.registry.interfaces.series import SeriesStatus68from lp.registry.interfaces.series import SeriesStatus
7069
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py 2010-03-09 01:55:59 +0000
+++ lib/lp/soyuz/browser/build.py 2010-03-09 20:58:30 +0000
@@ -30,10 +30,10 @@
30from canonical.launchpad.webapp.batching import BatchNavigator30from canonical.launchpad.webapp.batching import BatchNavigator
31from canonical.launchpad.webapp.interfaces import ICanonicalUrlData31from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
32from canonical.lazr.utils import safe_hasattr32from canonical.lazr.utils import safe_hasattr
33from lp.buildmaster.interfaces.buildbase import BuildStatus
33from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet34from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
34from lp.services.job.interfaces.job import JobStatus35from lp.services.job.interfaces.job import JobStatus
35from lp.soyuz.interfaces.build import (36from lp.soyuz.interfaces.build import IBuild, IBuildRescoreForm
36 BuildStatus, IBuild, IBuildRescoreForm)
37from lp.soyuz.interfaces.buildrecords import IHasBuildRecords37from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
38from canonical.launchpad.interfaces.launchpad import UnexpectedFormData38from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
39from lp.soyuz.interfaces.queue import PackageUploadStatus39from lp.soyuz.interfaces.queue import PackageUploadStatus
4040
=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt 2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt 2010-03-09 20:58:30 +0000
@@ -355,7 +355,8 @@
355355
356Let's set some builds appropriately to see the results.356Let's set some builds appropriately to see the results.
357357
358 >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet358 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
359 >>> from lp.soyuz.interfaces.build import IBuildSet
359 >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']360 >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
360 >>> source = view.filtered_sources[0]361 >>> source = view.filtered_sources[0]
361 >>> ignore = source.sourcepackagerelease.createBuild(362 >>> ignore = source.sourcepackagerelease.createBuild(
362363
=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt 2010-02-24 13:39:16 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt 2010-03-09 20:58:30 +0000
@@ -4,7 +4,7 @@
4from the sampledata which happens to be in FAILEDTOBUILD status.4from the sampledata which happens to be in FAILEDTOBUILD status.
55
6 >>> from zope.component import getUtility6 >>> from zope.component import getUtility
7 >>> from lp.soyuz.interfaces.build import BuildStatus7 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
8 >>> from lp.registry.interfaces.distribution import IDistributionSet8 >>> from lp.registry.interfaces.distribution import IDistributionSet
99
10 >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')10 >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
1111
=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt 2010-03-09 01:55:59 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt 2010-03-09 20:58:30 +0000
@@ -140,11 +140,11 @@
140SoyuzTestPublisher is used to make a new publication only in Celso's140SoyuzTestPublisher is used to make a new publication only in Celso's
141private PPA.141private PPA.
142142
143 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
143 >>> from lp.soyuz.tests.test_publishing import (144 >>> from lp.soyuz.tests.test_publishing import (
144 ... SoyuzTestPublisher)145 ... SoyuzTestPublisher)
145 >>> from lp.soyuz.interfaces.publishing import (146 >>> from lp.soyuz.interfaces.publishing import (
146 ... PackagePublishingStatus)147 ... PackagePublishingStatus)
147 >>> from lp.soyuz.interfaces.build import BuildStatus
148148
149 >>> test_publisher = SoyuzTestPublisher()149 >>> test_publisher = SoyuzTestPublisher()
150 >>> test_publisher.prepareBreezyAutotest()150 >>> test_publisher.prepareBreezyAutotest()
151151
=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt 2010-03-04 20:19:39 +0000
+++ lib/lp/soyuz/doc/archive.txt 2010-03-09 20:58:30 +0000
@@ -919,7 +919,7 @@
919be returned, but you can also ask for releases with builds in a certain919be returned, but you can also ask for releases with builds in a certain
920state.920state.
921921
922 >>> from lp.soyuz.interfaces.build import BuildStatus922 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
923 >>> releases = cprov_archive.getSourcePackageReleases(923 >>> releases = cprov_archive.getSourcePackageReleases(
924 ... build_status=BuildStatus.FULLYBUILT)924 ... build_status=BuildStatus.FULLYBUILT)
925 >>> for release in releases:925 >>> for release in releases:
@@ -1037,7 +1037,6 @@
10371037
1038Or return build records in a specific status:1038Or return build records in a specific status:
10391039
1040 >>> from lp.soyuz.interfaces.build import BuildStatus
1041 >>> cprov_archive.getBuildRecords(1040 >>> cprov_archive.getBuildRecords(
1042 ... build_state=BuildStatus.FULLYBUILT).count()1041 ... build_state=BuildStatus.FULLYBUILT).count()
1043 31042 3
10441043
=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-02-10 10:11:46 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2010-03-09 20:58:30 +0000
@@ -44,7 +44,7 @@
44the pending job.44the pending job.
4545
46 >>> from datetime import timedelta46 >>> from datetime import timedelta
47 >>> from canonical.launchpad.interfaces import BuildStatus47 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
48 >>> alsa_build = alsa_spr.createBuild(48 >>> alsa_build = alsa_spr.createBuild(
49 ... hoary['i386'], PackagePublishingPocket.RELEASE,49 ... hoary['i386'], PackagePublishingPocket.RELEASE,
50 ... hoary.main_archive)50 ... hoary.main_archive)
@@ -64,7 +64,6 @@
6464
65Make sure the job at hand is currently being built.65Make sure the job at hand is currently being built.
6666
67 >>> from canonical.launchpad.interfaces import BuildStatus
68 >>> cur_build.buildstate == BuildStatus.BUILDING67 >>> cur_build.buildstate == BuildStatus.BUILDING
69 True68 True
7069
7170
=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt 2009-12-24 01:41:54 +0000
+++ lib/lp/soyuz/doc/build-notification.txt 2010-03-09 20:58:30 +0000
@@ -15,7 +15,7 @@
15All build states are supported by the current implementation, however15All build states are supported by the current implementation, however
16only failures should be reported this time.16only failures should be reported this time.
1717
18 >>> from canonical.launchpad.interfaces import IBuildSet18 >>> from lp.soyuz.interfaces.build import IBuildSet
19 >>> from lp.testing.mail_helpers import pop_notifications19 >>> from lp.testing.mail_helpers import pop_notifications
20 >>> buildset = getUtility(IBuildSet)20 >>> buildset = getUtility(IBuildSet)
2121
@@ -414,10 +414,10 @@
414 they are in the team owning the PPA (to avoid spamming the innocent414 they are in the team owning the PPA (to avoid spamming the innocent
415 when PPA users upload unchanged source packages).415 when PPA users upload unchanged source packages).
416416
417 >>> from canonical.launchpad.interfaces import IPersonSet417 >>> from lp.registry.interfaces.person import IPersonSet
418 >>> cprov = getUtility(IPersonSet).getByName('cprov')418 >>> cprov = getUtility(IPersonSet).getByName('cprov')
419419
420 >>> from canonical.launchpad.interfaces import BuildStatus420 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
421 >>> failed_candidate = cprov.archive.getBuildRecords(421 >>> failed_candidate = cprov.archive.getBuildRecords(
422 ... build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]422 ... build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]
423423
@@ -486,7 +486,7 @@
486486
487We also make 'Foo Bar' the source signer.487We also make 'Foo Bar' the source signer.
488488
489 >>> from canonical.launchpad.interfaces import IGPGKeySet489 >>> from lp.registry.interfaces.gpg import IGPGKeySet
490 >>> gpgkey = getUtility(IGPGKeySet).get(1)490 >>> gpgkey = getUtility(IGPGKeySet).get(1)
491 >>> print gpgkey.owner.name491 >>> print gpgkey.owner.name
492 name16492 name16
493493
=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt 2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/doc/build.txt 2010-03-09 20:58:30 +0000
@@ -136,7 +136,8 @@
136136
137If the build does not have any uploads, None is returned:137If the build does not have any uploads, None is returned:
138138
139 >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet139 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
140 >>> from lp.soyuz.interfaces.build import IBuildSet
140 >>> at_build = getUtility(IBuildSet).getByBuildID(15)141 >>> at_build = getUtility(IBuildSet).getByBuildID(15)
141 >>> print at_build.package_upload142 >>> print at_build.package_upload
142 None143 None
143144
=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt 2010-03-05 13:52:32 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2010-03-09 20:58:30 +0000
@@ -187,7 +187,7 @@
187187
188 >>> BuilddSlaveTestSetup().tearDown()188 >>> BuilddSlaveTestSetup().tearDown()
189189
190 >>> from lp.soyuz.interfaces.build import BuildStatus190 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
191 >>> build.buildstate = BuildStatus.FAILEDTOBUILD191 >>> build.buildstate = BuildStatus.FAILEDTOBUILD
192 >>> job.destroySelf()192 >>> job.destroySelf()
193 >>> flush_database_updates()193 >>> flush_database_updates()
194194
=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-03-09 14:11:00 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2010-03-09 20:58:30 +0000
@@ -548,7 +548,7 @@
548Now in order to emulate a successfully binary upload we will update548Now in order to emulate a successfully binary upload we will update
549the build record to FULLYBUILT, as the process-upload would do:549the build record to FULLYBUILT, as the process-upload would do:
550550
551 >>> from canonical.launchpad.interfaces import BuildStatus551 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
552 >>> build.buildstate = BuildStatus.FULLYBUILT552 >>> build.buildstate = BuildStatus.FULLYBUILT
553553
554Now the updateBuild should recognize this build record as a554Now the updateBuild should recognize this build record as a
555555
=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
--- lib/lp/soyuz/doc/hasbuildrecords.txt 2009-08-28 06:41:25 +0000
+++ lib/lp/soyuz/doc/hasbuildrecords.txt 2010-03-09 20:58:30 +0000
@@ -22,7 +22,7 @@
22The method has a number of filtering options, such as filtering by build22The method has a number of filtering options, such as filtering by build
23status,23status,
2424
25 >>> from lp.soyuz.interfaces.build import BuildStatus25 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
26 >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()26 >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()
27 227 2
2828
2929
=== modified file 'lib/lp/soyuz/doc/packageupload-lookups.txt'
--- lib/lp/soyuz/doc/packageupload-lookups.txt 2009-07-01 13:16:44 +0000
+++ lib/lp/soyuz/doc/packageupload-lookups.txt 2010-03-09 20:58:30 +0000
@@ -29,7 +29,7 @@
2929
30 # Audit the source publication and builds of a given archive30 # Audit the source publication and builds of a given archive
31 # and report missing uploads.31 # and report missing uploads.
32 >>> from lp.soyuz.interfaces.build import BuildStatus32 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
33 >>> def check_upload_lookups(archive):33 >>> def check_upload_lookups(archive):
34 ... sources_missing_upload = []34 ... sources_missing_upload = []
35 ... sources = list(archive.getPublishedSources())35 ... sources = list(archive.getPublishedSources())
3636
=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt 2010-02-09 12:32:01 +0000
+++ lib/lp/soyuz/doc/publishing.txt 2010-03-09 20:58:30 +0000
@@ -139,7 +139,7 @@
139augments the IBuildSet.getStatusSummaryForBuilds() method to include the139augments the IBuildSet.getStatusSummaryForBuilds() method to include the
140'pending' state when builds are fully built but not yet published.140'pending' state when builds are fully built but not yet published.
141141
142 >>> from lp.soyuz.interfaces.build import BuildStatus142 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
143 >>> spph = test_publisher.getPubSource(143 >>> spph = test_publisher.getPubSource(
144 ... sourcename='abc', architecturehintlist='any')144 ... sourcename='abc', architecturehintlist='any')
145 >>> builds = spph.createMissingBuilds()145 >>> builds = spph.createMissingBuilds()
146146
=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2009-11-15 19:52:54 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2010-03-09 20:58:30 +0000
@@ -43,7 +43,7 @@
43 >>> hoary_evo_source = hoary.getSourcePackage('evolution')43 >>> hoary_evo_source = hoary.getSourcePackage('evolution')
44 >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease44 >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease
4545
46 >>> from canonical.launchpad.interfaces import BuildStatus46 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
47 >>> evo_build_i386 = evo_release.createBuild(47 >>> evo_build_i386 = evo_release.createBuild(
48 ... hoary_i386, pocket_release, ubuntu.main_archive,48 ... hoary_i386, pocket_release, ubuntu.main_archive,
49 ... status=BuildStatus.FULLYBUILT)49 ... status=BuildStatus.FULLYBUILT)
5050
=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-03-09 20:58:30 +0000
@@ -620,10 +620,11 @@
620620
621Check there's a SourcePackageRelease with no build.621Check there's a SourcePackageRelease with no build.
622622
623 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
623 >>> from lp.registry.model.sourcepackagename import SourcePackageName624 >>> from lp.registry.model.sourcepackagename import SourcePackageName
624 >>> from canonical.launchpad.database import SourcePackageRelease, Build
625 >>> from lp.registry.interfaces.pocket import PackagePublishingPocket625 >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
626 >>> from canonical.launchpad.interfaces import BuildStatus626 >>> from lp.soyuz.model.build import Build
627 >>> from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
627 >>> spn = SourcePackageName.selectOneBy(name="baz")628 >>> spn = SourcePackageName.selectOneBy(name="baz")
628 >>> spr = SourcePackageRelease.selectOneBy(sourcepackagenameID=spn.id)629 >>> spr = SourcePackageRelease.selectOneBy(sourcepackagenameID=spn.id)
629 >>> spr_id = spr.id630 >>> spr_id = spr.id
630631
=== modified file 'lib/lp/soyuz/interfaces/build.py'
--- lib/lp/soyuz/interfaces/build.py 2010-02-19 06:34:18 +0000
+++ lib/lp/soyuz/interfaces/build.py 2010-03-09 20:58:30 +0000
@@ -8,18 +8,16 @@
8__metaclass__ = type8__metaclass__ = type
99
10__all__ = [10__all__ = [
11 'BuildStatus',
12 'BuildSetStatus',11 'BuildSetStatus',
13 'CannotBeRescored',12 'CannotBeRescored',
14 'IBuild',13 'IBuild',
15 'IBuildRescoreForm',14 'IBuildRescoreForm',
16 'IBuildSet',15 'IBuildSet',
17 'incomplete_building_status',
18 ]16 ]
1917
20from zope.interface import Interface, Attribute18from zope.interface import Interface, Attribute
21from zope.schema import Bool, Int, Object, Text19from zope.schema import Bool, Int, Object, Text
22from lazr.enum import DBEnumeratedType, DBItem, EnumeratedType, Item20from lazr.enum import EnumeratedType, Item
2321
24from canonical.launchpad import _22from canonical.launchpad import _
25from lp.buildmaster.interfaces.buildbase import IBuildBase23from lp.buildmaster.interfaces.buildbase import IBuildBase
@@ -40,92 +38,6 @@
40 _message_prefix = "Cannot rescore build"38 _message_prefix = "Cannot rescore build"
4139
4240
43class BuildStatus(DBEnumeratedType):
44 """Build status type
45
46 Builds exist in the database in a number of states such as 'complete',
47 'needs build' and 'dependency wait'. We need to track these states in
48 order to correctly manage the autobuilder queues in the BuildQueue table.
49 """
50
51 NEEDSBUILD = DBItem(0, """
52 Needs building
53
54 Build record is fresh and needs building. Nothing is yet known to
55 block this build and it is a candidate for building on any free
56 builder of the relevant architecture
57 """)
58
59 FULLYBUILT = DBItem(1, """
60 Successfully built
61
62 Build record is an historic account of the build. The build is complete
63 and needs no further work to complete it. The build log etc are all
64 in place if available.
65 """)
66
67 FAILEDTOBUILD = DBItem(2, """
68 Failed to build
69
70 Build record is an historic account of the build. The build failed and
71 cannot be automatically retried. Either a new upload will be needed
72 or the build will have to be manually reset into 'NEEDSBUILD' when
73 the issue is corrected
74 """)
75
76 MANUALDEPWAIT = DBItem(3, """
77 Dependency wait
78
79 Build record represents a package whose build dependencies cannot
80 currently be satisfied within the relevant DistroArchSeries. This
81 build will have to be manually given back (put into 'NEEDSBUILD') when
82 the dependency issue is resolved.
83 """)
84
85 CHROOTWAIT = DBItem(4, """
86 Chroot problem
87
88 Build record represents a build which needs a chroot currently known
89 to be damaged or bad in some way. The buildd maintainer will have to
90 reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
91 has been fixed.
92 """)
93
94 SUPERSEDED = DBItem(5, """
95 Build for superseded Source
96
97 Build record represents a build which never got to happen because the
98 source package release for the build was superseded before the job
99 was scheduled to be run on a builder. Builds which reach this state
100 will rarely if ever be reset to any other state.
101 """)
102
103 BUILDING = DBItem(6, """
104 Currently building
105
106 Build record represents a build which is being build by one of the
107 available builders.
108 """)
109
110 FAILEDTOUPLOAD = DBItem(7, """
111 Failed to upload
112
113 Build record is an historic account of a build that could not be
114 uploaded correctly. It's mainly genereated by failures in
115 process-upload which quietly rejects the binary upload resulted
116 by the build procedure.
117 In those cases all the build historic information will be stored (
118 buildlog, datebuilt, duration, builder, etc) and the buildd admins
119 will be notified via process-upload about the reason of the rejection.
120 """)
121
122
123incomplete_building_status = (
124 BuildStatus.NEEDSBUILD,
125 BuildStatus.BUILDING,
126 )
127
128
129class IBuildView(IBuildBase):41class IBuildView(IBuildBase):
130 """A Build interface for items requiring launchpad.View."""42 """A Build interface for items requiring launchpad.View."""
131 id = Int(title=_('ID'), required=True, readonly=True)43 id = Int(title=_('ID'), required=True, readonly=True)
13244
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py 2010-03-08 18:01:33 +0000
+++ lib/lp/soyuz/model/archive.py 2010-03-09 20:58:30 +0000
@@ -31,6 +31,7 @@
31from canonical.database.enumcol import EnumCol31from canonical.database.enumcol import EnumCol
32from canonical.database.sqlbase import (32from canonical.database.sqlbase import (
33 cursor, quote, quote_like, sqlvalues, SQLBase)33 cursor, quote, quote_like, sqlvalues, SQLBase)
34from lp.buildmaster.interfaces.buildbase import BuildStatus
34from lp.services.job.interfaces.job import JobStatus35from lp.services.job.interfaces.job import JobStatus
35from lp.soyuz.adapters.packagelocation import PackageLocation36from lp.soyuz.adapters.packagelocation import PackageLocation
36from canonical.launchpad.components.tokens import (37from canonical.launchpad.components.tokens import (
@@ -67,7 +68,7 @@
67from lp.soyuz.interfaces.archivesubscriber import (68from lp.soyuz.interfaces.archivesubscriber import (
68 ArchiveSubscriberStatus, IArchiveSubscriberSet, ArchiveSubscriptionError)69 ArchiveSubscriberStatus, IArchiveSubscriberSet, ArchiveSubscriptionError)
69from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType70from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
70from lp.soyuz.interfaces.build import BuildStatus, IBuildSet71from lp.soyuz.interfaces.build import IBuildSet
71from lp.soyuz.interfaces.buildrecords import IHasBuildRecords72from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
72from lp.soyuz.interfaces.component import IComponent, IComponentSet73from lp.soyuz.interfaces.component import IComponent, IComponentSet
73from lp.registry.interfaces.distroseries import IDistroSeriesSet74from lp.registry.interfaces.distroseries import IDistroSeriesSet
7475
=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py 2010-03-05 13:52:32 +0000
+++ lib/lp/soyuz/model/build.py 2010-03-09 20:58:30 +0000
@@ -41,6 +41,7 @@
41 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)41 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
42from canonical.launchpad.webapp.tales import DurationFormatterAPI42from canonical.launchpad.webapp.tales import DurationFormatterAPI
43from lp.archivepublisher.utils import get_ppa_reference43from lp.archivepublisher.utils import get_ppa_reference
44from lp.buildmaster.interfaces.buildbase import BuildStatus
44from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType45from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
45from lp.buildmaster.model.buildbase import BuildBase46from lp.buildmaster.model.buildbase import BuildBase
46from lp.buildmaster.model.buildqueue import BuildQueue47from lp.buildmaster.model.buildqueue import BuildQueue
@@ -49,7 +50,7 @@
49from lp.soyuz.adapters.archivedependencies import get_components_for_building50from lp.soyuz.adapters.archivedependencies import get_components_for_building
50from lp.soyuz.interfaces.archive import ArchivePurpose51from lp.soyuz.interfaces.archive import ArchivePurpose
51from lp.soyuz.interfaces.build import (52from lp.soyuz.interfaces.build import (
52 BuildStatus, BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)53 BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)
53from lp.buildmaster.interfaces.buildbase import IBuildBase54from lp.buildmaster.interfaces.buildbase import IBuildBase
54from lp.soyuz.interfaces.publishing import active_publishing_status55from lp.soyuz.interfaces.publishing import active_publishing_status
55from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease56from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
5657
=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py 2010-01-30 05:27:48 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py 2010-03-09 20:58:30 +0000
@@ -17,11 +17,12 @@
1717
18from canonical.database.sqlbase import sqlvalues18from canonical.database.sqlbase import sqlvalues
1919
20from lp.buildmaster.interfaces.buildbase import BuildStatus
20from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob21from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
21from lp.registry.interfaces.sourcepackage import SourcePackageUrgency22from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
22from lp.registry.interfaces.pocket import PackagePublishingPocket23from lp.registry.interfaces.pocket import PackagePublishingPocket
23from lp.soyuz.interfaces.archive import ArchivePurpose24from lp.soyuz.interfaces.archive import ArchivePurpose
24from lp.soyuz.interfaces.build import BuildStatus, IBuildSet25from lp.soyuz.interfaces.build import IBuildSet
25from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob26from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
26from lp.soyuz.interfaces.publishing import PackagePublishingStatus27from lp.soyuz.interfaces.publishing import PackagePublishingStatus
2728
2829
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py 2010-02-24 16:14:37 +0000
+++ lib/lp/soyuz/model/publishing.py 2010-03-09 20:58:30 +0000
@@ -31,11 +31,18 @@
31from storm.expr import Desc, In, LeftJoin31from storm.expr import Desc, In, LeftJoin
32from storm.store import Store32from storm.store import Store
3333
34from lp.buildmaster.master import determineArchitecturesToBuild
35from canonical.database.sqlbase import SQLBase, sqlvalues34from canonical.database.sqlbase import SQLBase, sqlvalues
36from canonical.database.constants import UTC_NOW35from canonical.database.constants import UTC_NOW
37from canonical.database.datetimecol import UtcDateTimeCol36from canonical.database.datetimecol import UtcDateTimeCol
38from canonical.database.enumcol import EnumCol37from canonical.database.enumcol import EnumCol
38from canonical.launchpad.components.decoratedresultset import (
39 DecoratedResultSet)
40from canonical.launchpad.webapp.interfaces import (
41 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
42from canonical.launchpad.webapp.interfaces import NotFoundError
43from lp.buildmaster.interfaces.buildbase import BuildStatus
44from lp.buildmaster.master import determineArchitecturesToBuild
45from lp.registry.interfaces.person import validate_public_person
39from lp.registry.interfaces.pocket import PackagePublishingPocket46from lp.registry.interfaces.pocket import PackagePublishingPocket
40from lp.soyuz.model.binarypackagename import BinaryPackageName47from lp.soyuz.model.binarypackagename import BinaryPackageName
41from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease48from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
@@ -46,22 +53,16 @@
46from lp.soyuz.model.packagediff import PackageDiff53from lp.soyuz.model.packagediff import PackageDiff
47from lp.soyuz.interfaces.archive import ArchivePurpose54from lp.soyuz.interfaces.archive import ArchivePurpose
48from lp.soyuz.interfaces.archivearch import IArchiveArchSet55from lp.soyuz.interfaces.archivearch import IArchiveArchSet
56from lp.soyuz.interfaces.build import BuildSetStatus, IBuildSet
49from lp.soyuz.interfaces.component import IComponentSet57from lp.soyuz.interfaces.component import IComponentSet
50from lp.soyuz.interfaces.queue import PackageUploadStatus
51from lp.soyuz.interfaces.publishing import (58from lp.soyuz.interfaces.publishing import (
52 active_publishing_status, IBinaryPackageFilePublishing,59 active_publishing_status, IBinaryPackageFilePublishing,
53 IBinaryPackagePublishingHistory, IPublishingSet,60 IBinaryPackagePublishingHistory, IPublishingSet,
54 ISourcePackageFilePublishing, ISourcePackagePublishingHistory,61 ISourcePackageFilePublishing, ISourcePackagePublishingHistory,
55 PackagePublishingPriority, PackagePublishingStatus,62 PackagePublishingPriority, PackagePublishingStatus,
56 PoolFileOverwriteError)63 PoolFileOverwriteError)
57from lp.soyuz.interfaces.build import BuildSetStatus, BuildStatus, IBuildSet64from lp.soyuz.interfaces.queue import PackageUploadStatus
58from lp.soyuz.scripts.changeoverride import ArchiveOverriderError65from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
59from canonical.launchpad.components.decoratedresultset import (
60 DecoratedResultSet)
61from canonical.launchpad.webapp.interfaces import (
62 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
63from lp.registry.interfaces.person import validate_public_person
64from canonical.launchpad.webapp.interfaces import NotFoundError
6566
6667
67# XXX cprov 2006-08-18: move it away, perhaps archivepublisher/pool.py68# XXX cprov 2006-08-18: move it away, perhaps archivepublisher/pool.py
6869
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py 2010-02-22 12:07:03 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py 2010-03-09 20:58:30 +0000
@@ -34,12 +34,13 @@
34 LibraryFileAlias, LibraryFileContent)34 LibraryFileAlias, LibraryFileContent)
35from canonical.launchpad.helpers import shortlist35from canonical.launchpad.helpers import shortlist
36from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities36from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
37from lp.translations.interfaces.translationimportqueue import (
38 ITranslationImportQueue)
39from canonical.launchpad.webapp.interfaces import NotFoundError37from canonical.launchpad.webapp.interfaces import NotFoundError
40from lp.archiveuploader.utils import determine_source_file_type38from lp.archiveuploader.utils import determine_source_file_type
39from lp.buildmaster.interfaces.buildbase import BuildStatus
40from lp.registry.interfaces.person import validate_public_person
41from lp.registry.interfaces.sourcepackage import (
42 SourcePackageType, SourcePackageUrgency)
41from lp.soyuz.interfaces.archive import IArchiveSet, MAIN_ARCHIVE_PURPOSES43from lp.soyuz.interfaces.archive import IArchiveSet, MAIN_ARCHIVE_PURPOSES
42from lp.soyuz.interfaces.build import BuildStatus
43from lp.soyuz.interfaces.packagediff import (44from lp.soyuz.interfaces.packagediff import (
44 PackageDiffAlreadyRequested, PackageDiffStatus)45 PackageDiffAlreadyRequested, PackageDiffStatus)
45from lp.soyuz.interfaces.publishing import PackagePublishingStatus46from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -51,9 +52,8 @@
51from lp.soyuz.model.queue import (52from lp.soyuz.model.queue import (
52 PackageUpload, PackageUploadSource)53 PackageUpload, PackageUploadSource)
53from lp.soyuz.scripts.queue import QueueActionError54from lp.soyuz.scripts.queue import QueueActionError
54from lp.registry.interfaces.person import validate_public_person55from lp.translations.interfaces.translationimportqueue import (
55from lp.registry.interfaces.sourcepackage import (56 ITranslationImportQueue)
56 SourcePackageType, SourcePackageUrgency)
5757
5858
59def _filter_ubuntu_translation_file(filename):59def _filter_ubuntu_translation_file(filename):
6060
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py 2010-01-10 04:58:44 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py 2010-03-09 20:58:30 +0000
@@ -24,34 +24,29 @@
2424
25from zope.component import getUtility25from zope.component import getUtility
2626
27from canonical.database.sqlbase import quote27from canonical.database.sqlbase import quote, sqlvalues
28from canonical.database.constants import UTC_NOW28from canonical.database.constants import UTC_NOW
29from canonical.launchpad.scripts import log
2930
30from lp.archivepublisher.diskpool import poolify31from lp.archivepublisher.diskpool import poolify
31from lp.archiveuploader.tagfiles import parse_tagfile32from lp.archiveuploader.tagfiles import parse_tagfile
32from lp.archiveuploader.utils import (determine_binary_file_type,33from lp.archiveuploader.utils import (determine_binary_file_type,
33 determine_source_file_type)34 determine_source_file_type)
3435from lp.buildmaster.interfaces.buildbase import BuildStatus
35from canonical.database.sqlbase import sqlvalues
36
37from canonical.launchpad.scripts import log
38from lp.soyuz.scripts.gina.library import getLibraryAlias
39from lp.soyuz.scripts.gina.packages import (SourcePackageData,
40 urgencymap, prioritymap, get_dsc_path, PoolFileNotFound)
41
42from lp.registry.model.sourcepackagename import SourcePackageName
43from lp.soyuz.model.component import Component
44from lp.soyuz.model.processor import Processor
45from lp.soyuz.model.section import Section
46from lp.soyuz.model.files import (
47 BinaryPackageFile, SourcePackageReleaseFile)
48
49from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale36from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
50from lp.registry.interfaces.sourcepackage import SourcePackageType37from lp.registry.interfaces.sourcepackage import SourcePackageType
38from lp.registry.model.sourcepackagename import SourcePackageName
51from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet39from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
52from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat40from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
53from lp.soyuz.interfaces.build import BuildStatus
54from lp.soyuz.interfaces.publishing import PackagePublishingStatus41from lp.soyuz.interfaces.publishing import PackagePublishingStatus
42from lp.soyuz.model.component import Component
43from lp.soyuz.model.files import (
44 BinaryPackageFile, SourcePackageReleaseFile)
45from lp.soyuz.model.processor import Processor
46from lp.soyuz.model.section import Section
47from lp.soyuz.scripts.gina.library import getLibraryAlias
48from lp.soyuz.scripts.gina.packages import (SourcePackageData,
49 urgencymap, prioritymap, get_dsc_path, PoolFileNotFound)
5550
5651
57def check_not_in_librarian(files, archive_root, directory):52def check_not_in_librarian(files, archive_root, directory):
5853
=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py 2010-01-10 04:58:44 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py 2010-03-09 20:58:30 +0000
@@ -20,27 +20,22 @@
20import os20import os
21import tempfile21import tempfile
2222
23from lazr.delegates import delegates
23from zope.component import getUtility24from zope.component import getUtility
2425
25from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet26from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
26from canonical.librarian.utils import copy_and_close27from canonical.librarian.utils import copy_and_close
27from lazr.delegates import delegates28from lp.buildmaster.interfaces.buildbase import BuildStatus
28from lp.soyuz.adapters.packagelocation import (29from lp.soyuz.adapters.packagelocation import build_package_location
29 build_package_location)30from lp.soyuz.interfaces.archive import ArchivePurpose, CannotCopy
30from lp.soyuz.interfaces.archive import (31from lp.soyuz.interfaces.build import BuildSetStatus
31 ArchivePurpose, CannotCopy)
32from lp.soyuz.interfaces.build import (
33 BuildStatus, BuildSetStatus)
34from lp.soyuz.interfaces.publishing import (32from lp.soyuz.interfaces.publishing import (
35 IBinaryPackagePublishingHistory, IPublishingSet,33 IBinaryPackagePublishingHistory, IPublishingSet,
36 ISourcePackagePublishingHistory, active_publishing_status)34 ISourcePackagePublishingHistory, active_publishing_status)
37from lp.soyuz.interfaces.queue import (35from lp.soyuz.interfaces.queue import IPackageUpload, IPackageUploadSet
38 IPackageUpload, IPackageUploadSet)
39from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat36from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
40from lp.soyuz.scripts.ftpmasterbase import (37from lp.soyuz.scripts.ftpmasterbase import SoyuzScript, SoyuzScriptError
41 SoyuzScript, SoyuzScriptError)38from lp.soyuz.scripts.processaccepted import close_bugs_for_sourcepublication
42from lp.soyuz.scripts.processaccepted import (
43 close_bugs_for_sourcepublication)
4439
4540
46# XXX cprov 2009-06-12: This function could be incorporated in ILFA,41# XXX cprov 2009-06-12: This function could be incorporated in ILFA,
4742
=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-02-09 12:32:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-03-09 20:58:30 +0000
@@ -14,17 +14,16 @@
14from zope.component import getUtility14from zope.component import getUtility
1515
16from canonical.config import config16from canonical.config import config
17from lp.soyuz.model.build import Build
18from lp.soyuz.interfaces.build import BuildStatus
19from lp.soyuz.interfaces.component import IComponentSet
20from canonical.launchpad.scripts.logger import QuietFakeLogger17from canonical.launchpad.scripts.logger import QuietFakeLogger
21from lp.soyuz.scripts.buildd import (
22 QueueBuilder, RetryDepwait)
23from lp.services.scripts.base import LaunchpadScriptFailure
24from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
25from canonical.testing import (18from canonical.testing import (
26 DatabaseLayer, LaunchpadLayer, LaunchpadZopelessLayer)19 DatabaseLayer, LaunchpadLayer, LaunchpadZopelessLayer)
20from lp.buildmaster.interfaces.buildbase import BuildStatus
27from lp.registry.interfaces.distribution import IDistributionSet21from lp.registry.interfaces.distribution import IDistributionSet
22from lp.services.scripts.base import LaunchpadScriptFailure
23from lp.soyuz.interfaces.component import IComponentSet
24from lp.soyuz.model.build import Build
25from lp.soyuz.scripts.buildd import QueueBuilder, RetryDepwait
26from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
2827
2928
30class TestCronscriptBase(unittest.TestCase):29class TestCronscriptBase(unittest.TestCase):
3130
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-03-09 20:58:30 +0000
@@ -22,6 +22,7 @@
22from lp.bugs.interfaces.bug import (22from lp.bugs.interfaces.bug import (
23 CreateBugParams, IBugSet)23 CreateBugParams, IBugSet)
24from lp.bugs.interfaces.bugtask import BugTaskStatus24from lp.bugs.interfaces.bugtask import BugTaskStatus
25from lp.buildmaster.interfaces.buildbase import BuildStatus
25from lp.registry.interfaces.distribution import IDistributionSet26from lp.registry.interfaces.distribution import IDistributionSet
26from lp.registry.interfaces.series import SeriesStatus27from lp.registry.interfaces.series import SeriesStatus
27from lp.registry.interfaces.person import IPersonSet28from lp.registry.interfaces.person import IPersonSet
@@ -29,8 +30,7 @@
29from lp.soyuz.adapters.packagelocation import PackageLocationError30from lp.soyuz.adapters.packagelocation import PackageLocationError
30from lp.soyuz.interfaces.archive import (31from lp.soyuz.interfaces.archive import (
31 ArchivePurpose, CannotCopy)32 ArchivePurpose, CannotCopy)
32from lp.soyuz.interfaces.build import (33from lp.soyuz.interfaces.build import BuildSetStatus
33 BuildSetStatus, BuildStatus)
34from lp.soyuz.interfaces.component import IComponentSet34from lp.soyuz.interfaces.component import IComponentSet
35from lp.soyuz.interfaces.publishing import (35from lp.soyuz.interfaces.publishing import (
36 IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,36 IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
3737
=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-02-19 13:40:43 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-03-09 20:58:30 +0000
@@ -17,15 +17,16 @@
17from canonical.launchpad.scripts import BufferLogger17from canonical.launchpad.scripts import BufferLogger
18from canonical.testing import LaunchpadZopelessLayer18from canonical.testing import LaunchpadZopelessLayer
19from canonical.testing.layers import DatabaseLayer19from canonical.testing.layers import DatabaseLayer
20from lp.buildmaster.interfaces.buildbase import BuildStatus
20from lp.registry.interfaces.distribution import IDistributionSet21from lp.registry.interfaces.distribution import IDistributionSet
21from lp.registry.interfaces.person import IPersonSet22from lp.registry.interfaces.person import IPersonSet
22from lp.services.job.interfaces.job import JobStatus23from lp.services.job.interfaces.job import JobStatus
23from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet24from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
24from lp.soyuz.interfaces.archivearch import IArchiveArchSet25from lp.soyuz.interfaces.archivearch import IArchiveArchSet
25from lp.soyuz.interfaces.build import BuildStatus, IBuildSet26from lp.soyuz.interfaces.build import IBuildSet
26from lp.soyuz.interfaces.publishing import PackagePublishingStatus
27from lp.soyuz.interfaces.packagecopyrequest import (27from lp.soyuz.interfaces.packagecopyrequest import (
28 IPackageCopyRequestSet, PackageCopyStatus)28 IPackageCopyRequestSet, PackageCopyStatus)
29from lp.soyuz.interfaces.publishing import PackagePublishingStatus
29from lp.soyuz.scripts.ftpmaster import PackageLocationError, SoyuzScriptError30from lp.soyuz.scripts.ftpmaster import PackageLocationError, SoyuzScriptError
30from lp.soyuz.scripts.populate_archive import ArchivePopulator31from lp.soyuz.scripts.populate_archive import ArchivePopulator
31from lp.soyuz.tests.test_publishing import SoyuzTestPublisher32from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
3233
=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt 2010-03-09 20:58:30 +0000
@@ -972,7 +972,7 @@
972 ... archive=jblack_friends.archive,972 ... archive=jblack_friends.archive,
973 ... status=PackagePublishingStatus.PUBLISHED)973 ... status=PackagePublishingStatus.PUBLISHED)
974 >>> [build] = jblack_friends_foo_src.createMissingBuilds()974 >>> [build] = jblack_friends_foo_src.createMissingBuilds()
975 >>> from lp.soyuz.interfaces.build import BuildStatus975 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
976 >>> build.buildstate = BuildStatus.FAILEDTOBUILD976 >>> build.buildstate = BuildStatus.FAILEDTOBUILD
977977
978 >>> flush_database_updates()978 >>> flush_database_updates()
979979
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-02-26 19:29:51 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-03-09 20:58:30 +0000
@@ -410,10 +410,11 @@
410If the ppa has some current activity (building or waiting builds) then this410If the ppa has some current activity (building or waiting builds) then this
411is also included in the statistics portlet.411is also included in the statistics portlet.
412412
413 >>> login('foo.bar@canonical.com')413 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
414 >>> from lp.registry.interfaces.person import IPersonSet414 >>> from lp.registry.interfaces.person import IPersonSet
415 >>> from lp.soyuz.interfaces.build import IBuildSet
416 >>> login('foo.bar@canonical.com')
415 >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive417 >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive
416 >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
417 >>> builds = getUtility(IBuildSet).getBuildsForArchive(cprov_ppa)418 >>> builds = getUtility(IBuildSet).getBuildsForArchive(cprov_ppa)
418 >>> builds[0].buildstate = BuildStatus.BUILDING419 >>> builds[0].buildstate = BuildStatus.BUILDING
419 >>> logout()420 >>> logout()
420421
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-02-24 14:23:31 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2010-03-09 20:58:30 +0000
@@ -146,7 +146,7 @@
146 # build with an known buildlog 'tail'.146 # build with an known buildlog 'tail'.
147 >>> login('foo.bar@canonical.com')147 >>> login('foo.bar@canonical.com')
148 >>> from canonical.database.constants import UTC_NOW148 >>> from canonical.database.constants import UTC_NOW
149 >>> from lp.soyuz.interfaces.build import BuildStatus149 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
150 >>> in_progress_build.buildqueue_record.reset()150 >>> in_progress_build.buildqueue_record.reset()
151 >>> build.buildqueue_record.markAsBuilding(bob_builder)151 >>> build.buildqueue_record.markAsBuilding(bob_builder)
152 >>> build.buildqueue_record.logtail = 'one line\nanother line'152 >>> build.buildqueue_record.logtail = 'one line\nanother line'
153153
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2009-11-20 18:07:15 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt 2010-03-09 20:58:30 +0000
@@ -60,7 +60,7 @@
60 >>> import datetime60 >>> import datetime
61 >>> from zope.component import getUtility61 >>> from zope.component import getUtility
62 >>> from zope.security.proxy import removeSecurityProxy62 >>> from zope.security.proxy import removeSecurityProxy
63 >>> from lp.soyuz.interfaces.build import BuildStatus63 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
64 >>> from lp.registry.interfaces.person import IPersonSet64 >>> from lp.registry.interfaces.person import IPersonSet
65 >>> login('foo.bar@canonical.com')65 >>> login('foo.bar@canonical.com')
66 >>> cprov = getUtility(IPersonSet).getByName('cprov')66 >>> cprov = getUtility(IPersonSet).getByName('cprov')
6767
=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt 2009-08-13 15:12:16 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt 2010-03-09 20:58:30 +0000
@@ -174,7 +174,7 @@
174alter the buildstate to one that cannot be retried:174alter the buildstate to one that cannot be retried:
175175
176 >>> login('foo.bar@canonical.com')176 >>> login('foo.bar@canonical.com')
177 >>> from lp.soyuz.interfaces.build import BuildStatus177 >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
178 >>> build.buildstate = BuildStatus.FAILEDTOUPLOAD178 >>> build.buildstate = BuildStatus.FAILEDTOUPLOAD
179 >>> logout()179 >>> logout()
180180
181181
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2010-02-27 21:18:10 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2010-03-09 20:58:30 +0000
@@ -15,6 +15,7 @@
15 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)15 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
16from canonical.testing import LaunchpadZopelessLayer16from canonical.testing import LaunchpadZopelessLayer
1717
18from lp.buildmaster.interfaces.buildbase import BuildStatus
18from lp.registry.interfaces.distribution import IDistributionSet19from lp.registry.interfaces.distribution import IDistributionSet
19from lp.registry.interfaces.person import IPersonSet20from lp.registry.interfaces.person import IPersonSet
20from lp.services.job.interfaces.job import JobStatus21from lp.services.job.interfaces.job import JobStatus
@@ -22,7 +23,6 @@
22 IArchiveSet, ArchivePurpose, CannotSwitchPrivacy)23 IArchiveSet, ArchivePurpose, CannotSwitchPrivacy)
23from lp.soyuz.interfaces.archivearch import IArchiveArchSet24from lp.soyuz.interfaces.archivearch import IArchiveArchSet
24from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat25from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
25from lp.soyuz.interfaces.build import BuildStatus
26from lp.soyuz.interfaces.processor import IProcessorFamilySet26from lp.soyuz.interfaces.processor import IProcessorFamilySet
27from lp.soyuz.interfaces.publishing import PackagePublishingStatus27from lp.soyuz.interfaces.publishing import PackagePublishingStatus
28from lp.soyuz.model.build import Build28from lp.soyuz.model.build import Build
2929
=== modified file 'lib/lp/soyuz/tests/test_build.py'
--- lib/lp/soyuz/tests/test_build.py 2010-03-06 00:32:52 +0000
+++ lib/lp/soyuz/tests/test_build.py 2010-03-09 20:58:30 +0000
@@ -13,16 +13,16 @@
13from canonical.database.constants import UTC_NOW13from canonical.database.constants import UTC_NOW
14from canonical.testing import LaunchpadZopelessLayer14from canonical.testing import LaunchpadZopelessLayer
15from lp.services.job.model.job import Job15from lp.services.job.model.job import Job
16from lp.buildmaster.interfaces.buildbase import IBuildBase16from lp.buildmaster.interfaces.buildbase import BuildStatus, IBuildBase
17from lp.buildmaster.interfaces.builder import IBuilderSet17from lp.buildmaster.interfaces.builder import IBuilderSet
18from lp.buildmaster.model.buildqueue import BuildQueue18from lp.buildmaster.model.buildqueue import BuildQueue
19from lp.soyuz.interfaces.build import IBuild, IBuildSet
19from lp.soyuz.interfaces.component import IComponentSet20from lp.soyuz.interfaces.component import IComponentSet
20from lp.soyuz.interfaces.build import BuildStatus, IBuild, IBuildSet
21from lp.soyuz.interfaces.publishing import PackagePublishingStatus21from lp.soyuz.interfaces.publishing import PackagePublishingStatus
22from lp.soyuz.model.buildpackagejob import BuildPackageJob22from lp.soyuz.model.buildpackagejob import BuildPackageJob
23from lp.soyuz.model.processor import ProcessorFamilySet23from lp.soyuz.model.processor import ProcessorFamilySet
24from lp.soyuz.tests.soyuzbuilddhelpers import WaitingSlave
24from lp.soyuz.tests.test_publishing import SoyuzTestPublisher25from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
25from lp.soyuz.tests.soyuzbuilddhelpers import WaitingSlave
26from lp.testing import TestCaseWithFactory26from lp.testing import TestCaseWithFactory
2727
2828
2929
=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py 2010-01-30 05:27:48 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py 2010-03-09 20:58:30 +0000
@@ -11,9 +11,9 @@
11 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)11 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
12from canonical.testing import LaunchpadZopelessLayer12from canonical.testing import LaunchpadZopelessLayer
1313
14from lp.buildmaster.interfaces.buildbase import BuildStatus
14from lp.buildmaster.interfaces.builder import IBuilderSet15from lp.buildmaster.interfaces.builder import IBuilderSet
15from lp.soyuz.interfaces.archive import ArchivePurpose16from lp.soyuz.interfaces.archive import ArchivePurpose
16from lp.soyuz.interfaces.build import BuildStatus
17from lp.soyuz.interfaces.publishing import PackagePublishingStatus17from lp.soyuz.interfaces.publishing import PackagePublishingStatus
18from lp.soyuz.model.build import Build18from lp.soyuz.model.build import Build
19from lp.soyuz.model.processor import ProcessorFamilySet19from lp.soyuz.model.processor import ProcessorFamilySet
2020
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py 2009-12-13 11:55:40 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py 2010-03-09 20:58:30 +0000
@@ -14,12 +14,12 @@
14from canonical.testing import LaunchpadZopelessLayer14from canonical.testing import LaunchpadZopelessLayer
15from email import message_from_string15from email import message_from_string
16from lp.archiveuploader.tests import datadir16from lp.archiveuploader.tests import datadir
17from lp.buildmaster.interfaces.buildbase import BuildStatus
17from lp.registry.interfaces.distribution import IDistributionSet18from lp.registry.interfaces.distribution import IDistributionSet
18from lp.registry.interfaces.series import SeriesStatus19from lp.registry.interfaces.series import SeriesStatus
19from lp.registry.interfaces.pocket import PackagePublishingPocket20from lp.registry.interfaces.pocket import PackagePublishingPocket
20from lp.services.mail import stub21from lp.services.mail import stub
21from lp.soyuz.interfaces.archive import ArchivePurpose22from lp.soyuz.interfaces.archive import ArchivePurpose
22from lp.soyuz.interfaces.build import BuildStatus
23from lp.soyuz.interfaces.publishing import PackagePublishingStatus23from lp.soyuz.interfaces.publishing import PackagePublishingStatus
24from lp.soyuz.interfaces.queue import (24from lp.soyuz.interfaces.queue import (
25 IPackageUploadSet, PackageUploadCustomFormat, PackageUploadStatus)25 IPackageUploadSet, PackageUploadCustomFormat, PackageUploadStatus)
2626
=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py 2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/tests/test_publishing.py 2010-03-09 20:58:30 +0000
@@ -14,34 +14,34 @@
14import pytz14import pytz
15from zope.component import getUtility15from zope.component import getUtility
1616
17from lp.archivepublisher.config import Config
18from lp.archivepublisher.diskpool import DiskPool
19from canonical.config import config17from canonical.config import config
20from canonical.database.constants import UTC_NOW18from canonical.database.constants import UTC_NOW
21from lp.soyuz.model.publishing import (
22 SourcePackagePublishingHistory, BinaryPackagePublishingHistory)
23from lp.soyuz.model.processor import ProcessorFamily
24from lp.soyuz.interfaces.component import IComponentSet
25from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet19from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
26from lp.soyuz.interfaces.section import ISectionSet
27from canonical.launchpad.webapp.interfaces import NotFoundError20from canonical.launchpad.webapp.interfaces import NotFoundError
21from canonical.testing import LaunchpadZopelessLayer
22from lp.archivepublisher.config import Config
23from lp.archivepublisher.diskpool import DiskPool
24from lp.buildmaster.interfaces.buildbase import BuildStatus
28from lp.registry.interfaces.distribution import IDistributionSet25from lp.registry.interfaces.distribution import IDistributionSet
29from lp.registry.interfaces.person import IPersonSet26from lp.registry.interfaces.person import IPersonSet
30from lp.registry.interfaces.pocket import PackagePublishingPocket27from lp.registry.interfaces.pocket import PackagePublishingPocket
31from lp.registry.interfaces.sourcepackage import SourcePackageUrgency28from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
32from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet29from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
30from lp.soyuz.model.processor import ProcessorFamily
31from lp.soyuz.model.publishing import (
32 SourcePackagePublishingHistory, BinaryPackagePublishingHistory)
33from lp.soyuz.interfaces.archive import ArchivePurpose33from lp.soyuz.interfaces.archive import ArchivePurpose
34from lp.soyuz.interfaces.archivearch import IArchiveArchSet34from lp.soyuz.interfaces.archivearch import IArchiveArchSet
35from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet35from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
36from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat36from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
37from lp.soyuz.interfaces.build import BuildStatus37from lp.soyuz.interfaces.component import IComponentSet
38from lp.soyuz.interfaces.queue import PackageUploadStatus38from lp.soyuz.interfaces.section import ISectionSet
39from lp.soyuz.interfaces.publishing import (39from lp.soyuz.interfaces.publishing import (
40 PackagePublishingPriority, PackagePublishingStatus)40 PackagePublishingPriority, PackagePublishingStatus)
41from lp.soyuz.interfaces.queue import PackageUploadStatus
41from canonical.launchpad.scripts import FakeLogger42from canonical.launchpad.scripts import FakeLogger
42from lp.testing import TestCaseWithFactory43from lp.testing import TestCaseWithFactory
43from lp.testing.factory import LaunchpadObjectFactory44from lp.testing.factory import LaunchpadObjectFactory
44from canonical.testing import LaunchpadZopelessLayer
4545
4646
47class SoyuzTestPublisher:47class SoyuzTestPublisher:
4848
=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py 2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py 2010-03-09 20:58:30 +0000
@@ -10,7 +10,7 @@
10from canonical.database.constants import UTC_NOW10from canonical.database.constants import UTC_NOW
11from canonical.testing import LaunchpadZopelessLayer11from canonical.testing import LaunchpadZopelessLayer
1212
13from lp.soyuz.interfaces.build import BuildStatus13from lp.buildmaster.interfaces.buildbase import BuildStatus
14from lp.soyuz.interfaces.publishing import (IPublishingSet,14from lp.soyuz.interfaces.publishing import (IPublishingSet,
15 PackagePublishingStatus)15 PackagePublishingStatus)
16from lp.soyuz.tests.test_build import BaseTestCaseWithThreeBuilds16from lp.soyuz.tests.test_build import BaseTestCaseWithThreeBuilds
1717
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-03-06 00:32:52 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-03-09 20:58:30 +0000
@@ -14,10 +14,10 @@
1414
15from canonical.launchpad.interfaces import ILaunchpadCelebrities15from canonical.launchpad.interfaces import ILaunchpadCelebrities
16from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet16from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
17from lp.buildmaster.interfaces.buildbase import BuildStatus
17from lp.buildmaster.interfaces.buildfarmjobbehavior import (18from lp.buildmaster.interfaces.buildfarmjobbehavior import (
18 IBuildFarmJobBehavior)19 IBuildFarmJobBehavior)
19from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet20from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
20from lp.soyuz.interfaces.build import BuildStatus
21from lp.testing import TestCaseWithFactory21from lp.testing import TestCaseWithFactory
22from lp.testing.fakemethod import FakeMethod22from lp.testing.fakemethod import FakeMethod
2323
2424
=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py 2009-10-13 14:38:07 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2010-03-09 20:58:30 +0000
@@ -20,12 +20,12 @@
2020
21from canonical.database.sqlbase import ISOLATION_LEVEL_READ_COMMITTED21from canonical.database.sqlbase import ISOLATION_LEVEL_READ_COMMITTED
22from canonical.launchpad.interfaces import NotFoundError22from canonical.launchpad.interfaces import NotFoundError
23from lp.registry.interfaces.distribution import IDistributionSet
24from lp.soyuz.interfaces.build import BuildStatus
25from lp.registry.interfaces.pocket import PackagePublishingPocket
26from canonical.launchpad.scripts import (23from canonical.launchpad.scripts import (
27 execute_zcml_for_scripts, logger_options, logger)24 execute_zcml_for_scripts, logger_options, logger)
28from canonical.lp import initZopeless25from canonical.lp import initZopeless
26from lp.buildmaster.interfaces.buildbase import BuildStatus
27from lp.registry.interfaces.distribution import IDistributionSet
28from lp.registry.interfaces.pocket import PackagePublishingPocket
2929
3030
31def main():31def main():
3232
=== modified file 'scripts/ftpmaster-tools/initialise-from-parent.py'
--- scripts/ftpmaster-tools/initialise-from-parent.py 2009-11-17 02:33:27 +0000
+++ scripts/ftpmaster-tools/initialise-from-parent.py 2010-03-09 20:58:30 +0000
@@ -25,11 +25,11 @@
25from canonical.config import config25from canonical.config import config
26from canonical.database.sqlbase import (26from canonical.database.sqlbase import (
27 sqlvalues, flush_database_updates, cursor, flush_database_caches)27 sqlvalues, flush_database_updates, cursor, flush_database_caches)
28from canonical.lp import initZopeless
29from lp.soyuz.interfaces.queue import PackageUploadStatus
30from canonical.launchpad.interfaces import IDistributionSet, NotFoundError28from canonical.launchpad.interfaces import IDistributionSet, NotFoundError
31from canonical.launchpad.scripts import (29from canonical.launchpad.scripts import (
32 execute_zcml_for_scripts, logger, logger_options)30 execute_zcml_for_scripts, logger, logger_options)
31from canonical.lp import initZopeless
32from lp.soyuz.interfaces.queue import PackageUploadStatus
3333
3434
35def main():35def main():
@@ -107,8 +107,8 @@
107 via initialiseFromParent method.107 via initialiseFromParent method.
108 """108 """
109 # Avoid circular import.109 # Avoid circular import.
110 from lp.buildmaster.interfaces.buildbase import BuildStatus
110 from lp.registry.interfaces.pocket import PackagePublishingPocket111 from lp.registry.interfaces.pocket import PackagePublishingPocket
111 from lp.soyuz.interfaces.build import BuildStatus
112112
113 parentseries = distroseries.parent_series113 parentseries = distroseries.parent_series
114114