launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #00794
[Merge] lp:~jelmer/launchpad/buildmaster-enums into lp:launchpad/devel
Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/buildmaster-enums into lp:launchpad/devel.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers): code
Some trivial refactoring.
Move enums inside of the buildd manager to lp.buildmaster.enums. Remove the remainder of lib/lp/buildmanager/interfaces/buildbase.py
--
https://code.launchpad.net/~jelmer/launchpad/buildmaster-enums/+merge/33893
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/buildmaster-enums into lp:launchpad/devel.
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-24 15:29:01 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2010-08-27 11:26:16 +0000
@@ -47,7 +47,7 @@
from lp.bugs.interfaces.bugtask import IBugTask
from lp.bugs.interfaces.bugtracker import IBugTracker
from lp.bugs.interfaces.bugwatch import IBugWatch
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
from lp.buildmaster.interfaces.buildqueue import IBuildQueue
from lp.code.interfaces.branch import IBranch
=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py 2010-08-23 16:51:11 +0000
+++ lib/canonical/launchpad/webapp/tales.py 2010-08-27 11:26:16 +0000
@@ -58,7 +58,7 @@
from canonical.lazr.canonicalurl import nearest_adapter
from lp.app.browser.stringformatter import escape, FormattersAPI
from lp.blueprints.interfaces.specification import ISpecification
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.interfaces.branch import IBranch
from lp.soyuz.enums import ArchivePurpose
from lp.soyuz.interfaces.archive import IPPA
=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py 2010-08-25 11:01:59 +0000
+++ lib/lp/archiveuploader/dscfile.py 2010-08-27 11:26:16 +0000
@@ -58,7 +58,7 @@
re_valid_version,
safe_fix_maintainer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.interfaces.sourcepackagerecipebuild import (
ISourcePackageRecipeBuildSource,
)
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py 2010-08-26 08:02:08 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py 2010-08-27 11:26:16 +0000
@@ -44,7 +44,7 @@
re_valid_pkg_name,
re_valid_version,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.soyuz.enums import (
BinaryPackageFormat,
PackagePublishingPriority,
=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-24 12:25:48 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py 2010-08-27 11:26:16 +0000
@@ -13,7 +13,7 @@
from lp.archiveuploader.tests.test_uploadprocessor import (
TestUploadProcessorBase,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.interfaces.sourcepackagerecipebuild import (
ISourcePackageRecipeBuildSource,
)
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-24 13:56:22 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2010-08-27 11:26:16 +0000
@@ -41,7 +41,7 @@
parse_build_upload_leaf_name,
UploadProcessor,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
=== modified file 'lib/lp/archiveuploader/uploadprocessor.py'
--- lib/lp/archiveuploader/uploadprocessor.py 2010-08-20 20:31:18 +0000
+++ lib/lp/archiveuploader/uploadprocessor.py 2010-08-27 11:26:16 +0000
@@ -74,7 +74,7 @@
SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
UploadPolicyError,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.person import IPersonSet
from lp.soyuz.interfaces.archive import (
=== added file 'lib/lp/buildmaster/enums.py'
--- lib/lp/buildmaster/enums.py 1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/enums.py 2010-08-27 11:26:16 +0000
@@ -0,0 +1,97 @@
+# Copyright 2009-2010 Canonical Ltd. This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0211,E0213
+
+"""Common build interfaces."""
+
+__metaclass__ = type
+
+__all__ = [
+ 'BuildStatus',
+ ]
+
+from lazr.enum import (
+ DBEnumeratedType,
+ DBItem,
+ )
+
+
+class BuildStatus(DBEnumeratedType):
+ """Build status type
+
+ Builds exist in the database in a number of states such as 'complete',
+ 'needs build' and 'dependency wait'. We need to track these states in
+ order to correctly manage the autobuilder queues in the BuildQueue table.
+ """
+
+ NEEDSBUILD = DBItem(0, """
+ Needs building
+
+ Build record is fresh and needs building. Nothing is yet known to
+ block this build and it is a candidate for building on any free
+ builder of the relevant architecture
+ """)
+
+ FULLYBUILT = DBItem(1, """
+ Successfully built
+
+ Build record is an historic account of the build. The build is complete
+ and needs no further work to complete it. The build log etc are all
+ in place if available.
+ """)
+
+ FAILEDTOBUILD = DBItem(2, """
+ Failed to build
+
+ Build record is an historic account of the build. The build failed and
+ cannot be automatically retried. Either a new upload will be needed
+ or the build will have to be manually reset into 'NEEDSBUILD' when
+ the issue is corrected
+ """)
+
+ MANUALDEPWAIT = DBItem(3, """
+ Dependency wait
+
+ Build record represents a package whose build dependencies cannot
+ currently be satisfied within the relevant DistroArchSeries. This
+ build will have to be manually given back (put into 'NEEDSBUILD') when
+ the dependency issue is resolved.
+ """)
+
+ CHROOTWAIT = DBItem(4, """
+ Chroot problem
+
+ Build record represents a build which needs a chroot currently known
+ to be damaged or bad in some way. The buildd maintainer will have to
+ reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
+ has been fixed.
+ """)
+
+ SUPERSEDED = DBItem(5, """
+ Build for superseded Source
+
+ Build record represents a build which never got to happen because the
+ source package release for the build was superseded before the job
+ was scheduled to be run on a builder. Builds which reach this state
+ will rarely if ever be reset to any other state.
+ """)
+
+ BUILDING = DBItem(6, """
+ Currently building
+
+ Build record represents a build which is being build by one of the
+ available builders.
+ """)
+
+ FAILEDTOUPLOAD = DBItem(7, """
+ Failed to upload
+
+ Build record is an historic account of a build that could not be
+ uploaded correctly. It's mainly genereated by failures in
+ process-upload which quietly rejects the binary upload resulted
+ by the build procedure.
+ In those cases all the build historic information will be stored (
+ buildlog, datebuilt, duration, builder, etc) and the buildd admins
+ will be notified via process-upload about the reason of the rejection.
+ """)
=== removed file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py 2010-08-24 09:51:26 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-# Copyright 2009 Canonical Ltd. This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# pylint: disable-msg=E0211,E0213
-
-"""Common build interfaces."""
-
-__metaclass__ = type
-
-__all__ = [
- 'BUILDD_MANAGER_LOG_NAME',
- 'BuildStatus',
- ]
-
-from lazr.enum import (
- DBEnumeratedType,
- DBItem,
- )
-
-
-BUILDD_MANAGER_LOG_NAME = "slave-scanner"
-
-
-class BuildStatus(DBEnumeratedType):
- """Build status type
-
- Builds exist in the database in a number of states such as 'complete',
- 'needs build' and 'dependency wait'. We need to track these states in
- order to correctly manage the autobuilder queues in the BuildQueue table.
- """
-
- NEEDSBUILD = DBItem(0, """
- Needs building
-
- Build record is fresh and needs building. Nothing is yet known to
- block this build and it is a candidate for building on any free
- builder of the relevant architecture
- """)
-
- FULLYBUILT = DBItem(1, """
- Successfully built
-
- Build record is an historic account of the build. The build is complete
- and needs no further work to complete it. The build log etc are all
- in place if available.
- """)
-
- FAILEDTOBUILD = DBItem(2, """
- Failed to build
-
- Build record is an historic account of the build. The build failed and
- cannot be automatically retried. Either a new upload will be needed
- or the build will have to be manually reset into 'NEEDSBUILD' when
- the issue is corrected
- """)
-
- MANUALDEPWAIT = DBItem(3, """
- Dependency wait
-
- Build record represents a package whose build dependencies cannot
- currently be satisfied within the relevant DistroArchSeries. This
- build will have to be manually given back (put into 'NEEDSBUILD') when
- the dependency issue is resolved.
- """)
-
- CHROOTWAIT = DBItem(4, """
- Chroot problem
-
- Build record represents a build which needs a chroot currently known
- to be damaged or bad in some way. The buildd maintainer will have to
- reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
- has been fixed.
- """)
-
- SUPERSEDED = DBItem(5, """
- Build for superseded Source
-
- Build record represents a build which never got to happen because the
- source package release for the build was superseded before the job
- was scheduled to be run on a builder. Builds which reach this state
- will rarely if ever be reset to any other state.
- """)
-
- BUILDING = DBItem(6, """
- Currently building
-
- Build record represents a build which is being build by one of the
- available builders.
- """)
-
- FAILEDTOUPLOAD = DBItem(7, """
- Failed to upload
-
- Build record is an historic account of a build that could not be
- uploaded correctly. It's mainly genereated by failures in
- process-upload which quietly rejects the binary upload resulted
- by the build procedure.
- In those cases all the build historic information will be stored (
- buildlog, datebuilt, duration, builder, etc) and the buildd admins
- will be notified via process-upload about the reason of the rejection.
- """)
=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py 2010-08-27 11:26:16 +0000
@@ -24,7 +24,7 @@
from canonical.launchpad import _
from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
from lp.registry.interfaces.distribution import IDistribution
from lp.registry.interfaces.distroseries import IDistroSeries
=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/manager.py 2010-08-27 11:26:16 +0000
@@ -8,6 +8,7 @@
__all__ = [
'BaseDispatchResult',
'BuilddManager',
+ 'BUILDD_MANAGER_LOG_NAME '
'FailDispatchResult',
'RecordingSlave',
'ResetDispatchResult',
@@ -32,10 +33,12 @@
from canonical.config import config
from canonical.launchpad.webapp import urlappend
from canonical.librarian.db import write_transaction
-from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
from lp.services.twistedsupport.processmonitor import ProcessWithTimeout
+BUILDD_MANAGER_LOG_NAME = "slave-scanner"
+
+
buildd_success_result_map = {
'ensurepresent': True,
'build': 'BuilderStatus.BUILDING',
=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py 2010-08-27 11:26:16 +0000
@@ -52,7 +52,7 @@
IStoreSelector,
MAIN_STORE,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import (
BuildFarmJobType,
IBuildFarmJob,
=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py 2010-08-25 13:30:06 +0000
+++ lib/lp/buildmaster/model/packagebuild.py 2010-08-27 11:26:16 +0000
@@ -51,10 +51,7 @@
MAIN_STORE,
)
from canonical.librarian.utils import copy_and_close
-from lp.buildmaster.interfaces.buildbase import (
- BUILDD_MANAGER_LOG_NAME,
- BuildStatus,
- )
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
from lp.buildmaster.interfaces.packagebuild import (
IPackageBuild,
@@ -68,7 +65,6 @@
from lp.buildmaster.model.buildqueue import BuildQueue
from lp.registry.interfaces.pocket import (
PackagePublishingPocket,
- pocketsuffix,
)
from lp.soyuz.adapters.archivedependencies import (
default_component_dependency_name,
@@ -317,6 +313,7 @@
def handleStatus(self, status, librarian, slave_status):
"""See `IPackageBuild`."""
+ from lp.buildmaster.manager import BUILDD_MANAGER_LOG_NAME
logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
method = getattr(self, '_handleStatus_' + status, None)
if method is None:
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2010-08-25 11:01:59 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2010-08-27 11:26:16 +0000
@@ -15,7 +15,7 @@
MAIN_STORE,
)
from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.buildmaster.interfaces.buildfarmjobbehavior import (
IBuildFarmJobBehavior,
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py 2010-08-27 11:26:16 +0000
@@ -22,7 +22,7 @@
DatabaseFunctionalLayer,
LaunchpadFunctionalLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import (
BuildFarmJobType,
IBuildFarmJob,
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py 2010-08-27 11:26:16 +0000
@@ -7,7 +7,7 @@
from zope.security.proxy import removeSecurityProxy
from canonical.testing.layers import ZopelessDatabaseLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import CorruptBuildCookie
from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
from lp.registry.interfaces.pocket import PackagePublishingPocket
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-24 15:29:01 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py 2010-08-27 11:26:16 +0000
@@ -27,7 +27,7 @@
LaunchpadZopelessLayer,
ZopelessDatabaseLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.buildmaster.interfaces.buildfarmjob import (
BuildFarmJobType,
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py 2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_manager.py 2010-08-27 11:26:16 +0000
@@ -36,7 +36,7 @@
LaunchpadZopelessLayer,
TwistedLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
from lp.buildmaster.manager import (
=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-24 12:16:10 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py 2010-08-27 11:26:16 +0000
@@ -20,7 +20,7 @@
LaunchpadFunctionalLayer,
LaunchpadZopelessLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
from lp.buildmaster.interfaces.packagebuild import (
IPackageBuild,
=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py 2010-08-27 11:26:16 +0000
@@ -27,7 +27,7 @@
Link,
Navigation,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.interfaces.sourcepackagerecipebuild import (
ISourcePackageRecipeBuild,
)
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-08-27 11:26:16 +0000
@@ -31,7 +31,7 @@
DatabaseFunctionalLayer,
LaunchpadFunctionalLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.browser.sourcepackagerecipe import (
SourcePackageRecipeRequestBuildsView,
SourcePackageRecipeView,
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py 2010-08-27 11:26:16 +0000
@@ -21,7 +21,7 @@
)
from canonical.launchpad.webapp import canonical_url
from canonical.testing import DatabaseFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.soyuz.model.processor import ProcessorFamily
from lp.testing import (
ANONYMOUS,
=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py 2010-08-27 11:26:16 +0000
@@ -13,7 +13,7 @@
from canonical.config import config
from canonical.testing import LaunchpadFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.mail.sourcepackagerecipebuild import (
SourcePackageRecipeBuildMailer,
)
=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py 2010-08-27 11:26:16 +0000
@@ -35,7 +35,7 @@
IMasterStore,
IStore,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.model.buildfarmjob import BuildFarmJob
from lp.buildmaster.model.packagebuild import PackageBuild
from lp.code.errors import (
=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-26 14:29:45 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py 2010-08-27 11:26:16 +0000
@@ -45,7 +45,7 @@
IArchiveUploadPolicy,
SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
from lp.buildmaster.model.buildqueue import BuildQueue
=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py 2010-08-27 11:26:16 +0000
@@ -28,7 +28,7 @@
AppServerLayer,
DatabaseFunctionalLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildqueue import IBuildQueue
from lp.buildmaster.model.buildqueue import BuildQueue
from lp.code.errors import (
=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-24 09:51:26 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py 2010-08-27 11:26:16 +0000
@@ -24,7 +24,7 @@
LaunchpadZopelessLayer,
)
from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildqueue import IBuildQueue
from lp.buildmaster.tests.test_packagebuild import (
TestGetUploadMethodsMixin,
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2010-08-26 22:44:30 +0000
+++ lib/lp/registry/browser/person.py 2010-08-27 11:26:16 +0000
@@ -240,7 +240,7 @@
IBugTaskSet,
UNRESOLVED_BUGTASK_STATUSES,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
from lp.code.errors import InvalidNamespace
from lp.code.interfaces.branchnamespace import IBranchNamespaceSet
=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py 2010-08-24 15:29:01 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py 2010-08-27 11:26:16 +0000
@@ -20,7 +20,7 @@
LaunchpadZopelessLayer,
)
from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.browser.person import (
PersonEditView,
PersonView,
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py 2010-08-24 15:29:01 +0000
+++ lib/lp/registry/model/sourcepackage.py 2010-08-27 11:26:16 +0000
@@ -50,7 +50,7 @@
HasBugHeatMixin,
)
from lp.bugs.model.bugtask import BugTask
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.interfaces.seriessourcepackagebranch import (
IMakeOfficialBranchLinks,
)
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/archive.py 2010-08-27 11:26:16 +0000
@@ -98,7 +98,7 @@
from canonical.widgets.textwidgets import StrippedTextWidget
from lp.app.browser.stringformatter import FormattersAPI
from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.person import (
IPersonSet,
PersonVisibility,
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py 2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/browser/build.py 2010-08-27 11:26:16 +0000
@@ -42,7 +42,7 @@
from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
from canonical.lazr.utils import safe_hasattr
from lp.app.errors import UnexpectedFormData
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.services.job.interfaces.job import JobStatus
from lp.soyuz.interfaces.binarypackagebuild import (
IBinaryPackageBuild,
=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py 2010-08-27 11:26:16 +0000
@@ -38,7 +38,7 @@
)
from canonical.launchpad import _
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.packagebuild import IPackageBuild
from lp.soyuz.interfaces.processor import IProcessor
from lp.soyuz.interfaces.publishing import ISourcePackagePublishingHistory
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/archive.py 2010-08-27 11:26:16 +0000
@@ -75,7 +75,7 @@
re_isadeb,
re_issource,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet
from lp.buildmaster.model.buildfarmjob import BuildFarmJob
from lp.buildmaster.model.packagebuild import PackageBuild
=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py 2010-08-27 11:26:16 +0000
@@ -69,7 +69,7 @@
from canonical.launchpad.webapp.tales import DurationFormatterAPI
from lp.app.errors import NotFoundError
from lp.archivepublisher.utils import get_ppa_reference
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
from lp.buildmaster.model.builder import Builder
=== modified file 'lib/lp/soyuz/model/buildfarmbuildjob.py'
--- lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/model/buildfarmbuildjob.py 2010-08-27 11:26:16 +0000
@@ -10,7 +10,7 @@
from zope.interface import implements
from canonical.database.constants import UTC_NOW
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.model.buildfarmjob import BuildFarmJobOld
from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py 2010-08-27 11:26:16 +0000
@@ -19,7 +19,7 @@
from zope.interface import implements
from canonical.database.sqlbase import sqlvalues
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/publishing.py 2010-08-27 11:26:16 +0000
@@ -63,7 +63,7 @@
MAIN_STORE,
)
from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.model.buildfarmjob import BuildFarmJob
from lp.buildmaster.model.packagebuild import PackageBuild
from lp.registry.interfaces.person import validate_public_person
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py 2010-08-27 11:26:16 +0000
@@ -53,7 +53,7 @@
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
from lp.app.errors import NotFoundError
from lp.archiveuploader.utils import determine_source_file_type
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.person import validate_public_person
from lp.registry.interfaces.sourcepackage import (
SourcePackageType,
=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/buildd.py 2010-08-27 11:26:16 +0000
@@ -17,7 +17,7 @@
from lp.app.errors import NotFoundError
from lp.archivepublisher.debversion import Version
from lp.archivepublisher.utils import process_in_batches
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.series import SeriesStatus
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py 2010-08-27 11:26:16 +0000
@@ -38,7 +38,7 @@
determine_binary_file_type,
determine_source_file_type,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.person import (
IPersonSet,
PersonCreationRationale,
=== modified file 'lib/lp/soyuz/scripts/initialise_distroseries.py'
--- lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/scripts/initialise_distroseries.py 2010-08-27 11:26:16 +0000
@@ -18,7 +18,7 @@
MAIN_STORE,
MASTER_FLAVOR,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.soyuz.adapters.packagelocation import PackageLocation
from lp.soyuz.enums import (
=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py 2010-08-24 13:56:22 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py 2010-08-27 11:26:16 +0000
@@ -25,7 +25,7 @@
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
from canonical.librarian.utils import copy_and_close
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.soyuz.adapters.packagelocation import build_package_location
from lp.soyuz.enums import ArchivePurpose
from lp.soyuz.interfaces.archive import (
=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py 2010-08-27 11:26:16 +0000
@@ -25,7 +25,7 @@
LaunchpadLayer,
LaunchpadZopelessLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.model.buildfarmjob import BuildFarmJob
from lp.buildmaster.model.packagebuild import PackageBuild
from lp.registry.interfaces.distribution import IDistributionSet
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2010-08-27 11:26:16 +0000
@@ -28,7 +28,7 @@
IBugSet,
)
from lp.bugs.interfaces.bugtask import BugTaskStatus
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.person import IPersonSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
=== modified file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-26 08:02:08 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2010-08-27 11:26:16 +0000
@@ -21,7 +21,7 @@
MASTER_FLAVOR,
)
from canonical.testing.layers import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
from lp.soyuz.interfaces.packageset import IPackagesetSet
=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py 2010-08-27 11:26:16 +0000
@@ -19,7 +19,7 @@
)
from canonical.testing import LaunchpadZopelessLayer
from canonical.testing.layers import DatabaseLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.person import IPersonSet
from lp.services.job.interfaces.job import JobStatus
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2010-08-27 11:26:16 +0000
@@ -23,7 +23,7 @@
DatabaseFunctionalLayer,
LaunchpadZopelessLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.series import SeriesStatus
from lp.services.job.interfaces.job import JobStatus
=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py 2010-08-27 11:26:16 +0000
@@ -14,7 +14,7 @@
from zope.security.proxy import removeSecurityProxy
from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.buildmaster.interfaces.buildqueue import IBuildQueue
from lp.buildmaster.interfaces.packagebuild import IPackageBuild
=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py 2010-08-27 11:26:16 +0000
@@ -17,7 +17,7 @@
DatabaseFunctionalLayer,
LaunchpadZopelessLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.soyuz.enums import ArchivePurpose
from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
--- lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_copyarchivejob.py 2010-08-27 11:26:16 +0000
@@ -9,7 +9,7 @@
from zope.security.proxy import removeSecurityProxy
from canonical.testing import DatabaseFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.soyuz.adapters.packagelocation import PackageLocation
from lp.soyuz.enums import ArchivePurpose
=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py 2010-08-27 11:26:16 +0000
@@ -144,7 +144,7 @@
# can only test this by creating a lone IBuildFarmJob of a
# different type.
from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
- from lp.buildmaster.interfaces.buildbase import BuildStatus
+ from lp.buildmaster.enums import BuildStatus
build_farm_job = getUtility(IBuildFarmJobSource).new(
job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,
status=BuildStatus.BUILDING)
=== modified file 'lib/lp/soyuz/tests/test_packagecloner.py'
--- lib/lp/soyuz/tests/test_packagecloner.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packagecloner.py 2010-08-27 11:26:16 +0000
@@ -7,7 +7,7 @@
from zope.security.proxy import removeSecurityProxy
from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.soyuz.adapters.packagelocation import PackageLocation
from lp.soyuz.enums import (
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py 2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py 2010-08-27 11:26:16 +0000
@@ -13,7 +13,7 @@
from canonical.launchpad.scripts import BufferLogger
from canonical.testing import LaunchpadZopelessLayer
from lp.archiveuploader.tests import datadir
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.registry.interfaces.series import SeriesStatus
=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py 2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/tests/test_publishing.py 2010-08-27 11:26:16 +0000
@@ -28,7 +28,7 @@
from lp.app.errors import NotFoundError
from lp.archivepublisher.config import Config
from lp.archivepublisher.diskpool import DiskPool
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.distroseries import IDistroSeriesSet
from lp.registry.interfaces.person import IPersonSet
=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py 2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py 2010-08-27 11:26:16 +0000
@@ -8,7 +8,7 @@
from canonical.database.constants import UTC_NOW
from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.soyuz.interfaces.publishing import (
IPublishingSet,
PackagePublishingStatus,
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2010-08-27 04:24:55 +0000
+++ lib/lp/testing/factory.py 2010-08-27 11:26:16 +0000
@@ -110,7 +110,7 @@
IBugTrackerSet,
)
from lp.bugs.interfaces.bugwatch import IBugWatchSet
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.builder import IBuilderSet
from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
from lp.buildmaster.model.buildqueue import BuildQueue
=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py 2010-08-24 15:29:01 +0000
+++ lib/lp/testing/tests/test_factory.py 2010-08-27 11:26:16 +0000
@@ -17,7 +17,7 @@
DatabaseFunctionalLayer,
LaunchpadZopelessLayer,
)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.code.enums import (
BranchType,
CodeImportReviewStatus,
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-27 11:26:16 +0000
@@ -16,7 +16,7 @@
from canonical.launchpad.interfaces import ILaunchpadCelebrities
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.buildmaster.interfaces.buildfarmjobbehavior import (
IBuildFarmJobBehavior,
)
=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-02 23:29:05 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2010-08-27 11:26:16 +0000
@@ -26,7 +26,7 @@
from canonical.launchpad.scripts import (
execute_zcml_for_scripts, logger_options, logger)
from canonical.lp import initZopeless
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
from lp.registry.interfaces.distribution import IDistributionSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
