← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/kill-spph-ancestor into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/kill-spph-ancestor into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/kill-spph-ancestor/+merge/94716

Stop referencing the never-used ancestor column. It was going to be glorious, and then it wasn't.

The column will be dropped in a future branch.
-- 
https://code.launchpad.net/~stevenk/launchpad/kill-spph-ancestor/+merge/94716
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/kill-spph-ancestor into lp:launchpad.
=== modified file 'lib/lp/_schema_circular_imports.py'
--- lib/lp/_schema_circular_imports.py	2012-01-17 21:45:24 +0000
+++ lib/lp/_schema_circular_imports.py	2012-02-27 05:01:19 +0000
@@ -367,9 +367,6 @@
     IBinaryPackagePublishingHistory, 'archive', IArchive)
 patch_reference_property(
     ISourcePackagePublishingHistory, 'archive', IArchive)
-patch_reference_property(
-    ISourcePackagePublishingHistory, 'ancestor',
-    ISourcePackagePublishingHistory)
 
 # IArchive apocalypse.
 patch_reference_property(IArchive, 'distribution', IDistribution)

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2012-01-09 13:40:48 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2012-02-27 05:01:19 +0000
@@ -479,14 +479,6 @@
         "package that has been published in the main distribution series, "
         "if one exists, or None.")
 
-    ancestor = Reference(
-         # Really ISourcePackagePublishingHistory (fixed in
-         # _schema_circular_imports.py).
-        Interface,
-        title=_('Ancestor'),
-        description=_('The previous release of this source package.'),
-        required=False, readonly=True)
-
     creator = exported(
         Reference(
             IPerson,

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2012-02-24 03:47:44 +0000
+++ lib/lp/soyuz/model/publishing.py	2012-02-27 05:01:19 +0000
@@ -448,9 +448,6 @@
         dbName="removed_by", foreignKey="Person",
         storm_validator=validate_public_person, default=None)
     removal_comment = StringCol(dbName="removal_comment", default=None)
-    ancestor = ForeignKey(
-        dbName="ancestor", foreignKey="SourcePackagePublishingHistory",
-        default=None)
     creator = ForeignKey(
         dbName='creator', foreignKey='Person',
         storm_validator=validate_public_person, notNull=False, default=None)