Merge lp:~cjwatson/launchpad/bpph-source into lp:launchpad

[Colin Watson]

Add and export BinaryPackagePublishingHistory.build and BinaryPackageBuild.getLatestSourcePublication.

Add and export BinaryPackagePublishingHistory.build and BinaryPackageBuild.getLatestSourcePublication. This provides a simple way to get from a BPPH to an SPPH on the webservice, which was previously more or less impossible to do accurately unless you already had the SPPH in hand, and certainly inefficient. At the moment I need this for new-style ddeb publication, where we want to walk through Archive.getPublishedBinaries() results and need to know the source package name so that we can publish them to the right directory.

[William Grant (wgrant)]

It may be acceptable to make this BinaryPackageBuild.getPublishedSource, but it's certainly not BinaryPackagePublishingHistory.getPublishedSource -- it can return a publication in a totally different archive.

If you just want the source name, I'd expose BinaryPackageBuild.source_package_name instead.

review: Needs Fixing (code)

[William Grant (wgrant)]

On second thought, BinaryPackageBuild.getLatestSourcePublication makes more sense than getPublishedSource.

[Colin Watson (cjwatson)]

How does this look now? ddeb-retriever only needs the source package name, it's true, but pull-lp-source wants the source version and component too, so I'd rather kill two birds with one stone and export a way to get to the SPPH.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/_schema_circular_imports.py'
--- lib/lp/_schema_circular_imports.py	2015-01-30 18:24:07 +0000
+++ lib/lp/_schema_circular_imports.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Update the interface schema values due to circular imports.
@@ -363,6 +363,8 @@
     IBinaryPackagePublishingHistory, 'distroarchseries',
     IDistroArchSeries)
 patch_reference_property(
+    IBinaryPackagePublishingHistory, 'build', IBinaryPackageBuild)
+patch_reference_property(
     IBinaryPackagePublishingHistory, 'archive', IArchive)
 patch_reference_property(
     ISourcePackagePublishingHistory, 'archive', IArchive)

=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2014-11-06 02:42:36 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """BinaryPackageBuild interfaces."""
@@ -23,10 +23,12 @@
 from lazr.restful.declarations import (
     error_status,
     export_as_webservice_entry,
+    export_read_operation,
     export_write_operation,
     exported,
     operation_for_version,
     operation_parameters,
+    operation_returns_entry,
     )
 from lazr.restful.fields import Reference
 from zope.interface import (
@@ -220,6 +222,20 @@
             `IBinaryPackageFile`, `ILibraryFileAlias`, `ILibraryFileContent`).
         """
 
+    @operation_returns_entry(ISourcePackagePublishingHistory)
+    @export_read_operation()
+    @operation_for_version("devel")
+    def getLatestSourcePublication():
+        """The latest source publication corresponding to this build.
+
+        Unlike current_source_publication, this returns publications even if
+        they are no longer active.
+
+        :return: An `ISourcePackagePublishingHistory`, or None if no
+            corresponding source publication can be located (which is a bug,
+            but is true for some old production builds).
+        """
+
 
 class IBinaryPackageBuildEdit(Interface):
     """A Build interface for items requiring launchpad.Edit."""

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2014-11-09 09:01:26 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Publishing interfaces."""
@@ -792,6 +792,13 @@
         TextLine(
             title=_("Binary Package Version"),
             required=False, readonly=True))
+    build = exported(
+        Reference(
+            # Really IBinaryPackageBuild, fixed in _schema_circular_imports.
+            Interface,
+            title=_("Build"),
+            description=_("The build that produced this binary package."),
+            required=True, readonly=True))
     architecture_specific = exported(
         Bool(
             title=_("Architecture Specific"),

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2015-02-11 14:43:23 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -215,7 +215,7 @@
     source_package_name = Reference(
         source_package_name_id, 'SourcePackageName.id')
 
-    def _getLatestPublication(self):
+    def getLatestSourcePublication(self):
         from lp.soyuz.model.publishing import SourcePackagePublishingHistory
         store = Store.of(self)
         results = store.find(
@@ -230,7 +230,7 @@
     @property
     def current_component(self):
         """See `IBuild`."""
-        latest_publication = self._getLatestPublication()
+        latest_publication = self.getLatestSourcePublication()
         # Production has some buggy builds without source publications.
         # They seem to have been created by early versions of gina and
         # the readding of hppa.
@@ -241,7 +241,7 @@
     def current_source_publication(self):
         """See `IBuild`."""
         from lp.soyuz.interfaces.publishing import active_publishing_status
-        latest_publication = self._getLatestPublication()
+        latest_publication = self.getLatestSourcePublication()
         if (latest_publication is not None and
             latest_publication.status in active_publishing_status):
             return latest_publication

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2014-11-09 09:01:26 +0000
+++ lib/lp/soyuz/model/publishing.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -769,6 +769,10 @@
         return self.binarypackagerelease.version
 
     @property
+    def build(self):
+        return self.binarypackagerelease.build
+
+    @property
     def architecture_specific(self):
         """See `IBinaryPackagePublishingHistory`"""
         return self.binarypackagerelease.architecturespecific

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2014-08-09 19:31:03 +0000
+++ lib/lp/soyuz/model/queue.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -879,7 +879,7 @@
         first_build = self.builds[:1]
         if first_build:
             [first_build] = first_build
-            return first_build.build._getLatestPublication()
+            return first_build.build.getLatestSourcePublication()
         else:
             return None
 

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2014-10-31 07:00:29 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2015-04-08 10:36:06 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test Build features."""
@@ -188,6 +188,23 @@
         self.assertEqual(BuildStatus.CANCELLING, build.status)
         self.assertEqual(bq, build.buildqueue_record)
 
+    def test_getLatestSourcePublication(self):
+        distroseries = self.factory.makeDistroSeries()
+        archive = self.factory.makeArchive(
+            distribution=distroseries.distribution)
+        other_archive = self.factory.makeArchive(
+            distribution=distroseries.distribution)
+        spph = self.factory.makeSourcePackagePublishingHistory(
+            distroseries=distroseries, archive=archive)
+        self.factory.makeSourcePackagePublishingHistory(
+            distroseries=distroseries, archive=other_archive,
+            sourcepackagerelease=spph.sourcepackagerelease)
+        das = self.factory.makeDistroArchSeries(distroseries=distroseries)
+        build = self.factory.makeBinaryPackageBuild(
+            source_package_release=spph.sourcepackagerelease,
+            distroarchseries=das, archive=archive)
+        self.assertEqual(spph, build.getLatestSourcePublication())
+
 
 class TestBuildUpdateDependencies(TestCaseWithFactory):