Merge ~cjwatson/launchpad:remove-hwdb-person into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 36505e4aacc8fab2fb9ebe3b67a50c5215e7899d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:remove-hwdb-person
Merge into: launchpad:master
Diff against target: 68 lines (+0/-17)
4 files modified
lib/lp/_schema_circular_imports.py (+0/-2)
lib/lp/registry/interfaces/person.py (+0/-5)
lib/lp/registry/model/person.py (+0/-6)
lib/lp/registry/stories/webservice/xx-person.txt (+0/-4)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+389983@code.launchpad.net

Commit message

Remove Person.hardware_submissions

Description of the change

We're in the process of removing the disused hardware database. Remove the ability to fetch hardware submissions associated with a person via the webservice API.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/lib/lp/_schema_circular_imports.py b/lib/lp/_schema_circular_imports.py
index 7e0a047..ad2f85b 100644
--- a/lib/lp/_schema_circular_imports.py
+++ b/lib/lp/_schema_circular_imports.py
@@ -342,8 +342,6 @@ patch_collection_return_type(IPerson, 'getOwnedProjects', IProduct)
342# IHasRecipe342# IHasRecipe
343patch_collection_property(IHasRecipes, 'recipes', ISourcePackageRecipe)343patch_collection_property(IHasRecipes, 'recipes', ISourcePackageRecipe)
344344
345patch_collection_property(IPerson, 'hardware_submissions', IHWSubmission)
346
347# publishing.py345# publishing.py
348patch_collection_return_type(346patch_collection_return_type(
349 ISourcePackagePublishingHistoryPublic, 'getBuilds', IBinaryPackageBuild)347 ISourcePackagePublishingHistoryPublic, 'getBuilds', IBinaryPackageBuild)
diff --git a/lib/lp/registry/interfaces/person.py b/lib/lp/registry/interfaces/person.py
index 273b50b..754a920 100644
--- a/lib/lp/registry/interfaces/person.py
+++ b/lib/lp/registry/interfaces/person.py
@@ -1005,11 +1005,6 @@ class IPersonViewRestricted(IHasBranches, IHasSpecifications,
1005 readonly=True, required=False,1005 readonly=True, required=False,
1006 value_type=Reference(schema=Interface)))1006 value_type=Reference(schema=Interface)))
10071007
1008 hardware_submissions = exported(CollectionField(
1009 title=_("Hardware submissions"),
1010 readonly=True, required=False,
1011 value_type=Reference(schema=Interface))) # HWSubmission
1012
1013 administrated_teams = Attribute(1008 administrated_teams = Attribute(
1014 u"the teams that this person/team is an administrator of.")1009 u"the teams that this person/team is an administrator of.")
10151010
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 5917c6e..8eb34c1 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -3129,12 +3129,6 @@ class Person(
3129 return False3129 return False
31303130
3131 @property3131 @property
3132 def hardware_submissions(self):
3133 """See `IPerson`."""
3134 from lp.hardwaredb.model.hwdb import HWSubmissionSet
3135 return HWSubmissionSet().search(owner=self)
3136
3137 @property
3138 def recipes(self):3132 def recipes(self):
3139 """See `IHasRecipes`."""3133 """See `IHasRecipes`."""
3140 from lp.code.model.sourcepackagerecipe import SourcePackageRecipe3134 from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
diff --git a/lib/lp/registry/stories/webservice/xx-person.txt b/lib/lp/registry/stories/webservice/xx-person.txt
index 8fcc0fd..a70885a 100644
--- a/lib/lp/registry/stories/webservice/xx-person.txt
+++ b/lib/lp/registry/stories/webservice/xx-person.txt
@@ -20,8 +20,6 @@ for teams (as they're defined in the ITeam interface).
20 display_name: u'Guilherme Salgado'20 display_name: u'Guilherme Salgado'
21 expired_members_collection_link: u'http://.../~salgado/expired_members'21 expired_members_collection_link: u'http://.../~salgado/expired_members'
22 gpg_keys_collection_link: u'http://.../~salgado/gpg_keys'22 gpg_keys_collection_link: u'http://.../~salgado/gpg_keys'
23 hardware_submissions_collection_link:
24 u'http://.../~salgado/hardware_submissions'
25 hide_email_addresses: False23 hide_email_addresses: False
26 homepage_content: None24 homepage_content: None
27 invited_members_collection_link: u'http://.../~salgado/invited_members'25 invited_members_collection_link: u'http://.../~salgado/invited_members'
@@ -79,8 +77,6 @@ for teams (as they're defined in the ITeam interface).
79 expired_members_collection_link:77 expired_members_collection_link:
80 u'http://.../~ubuntu-team/expired_members'78 u'http://.../~ubuntu-team/expired_members'
81 gpg_keys_collection_link: u'http://.../~ubuntu-team/gpg_keys'79 gpg_keys_collection_link: u'http://.../~ubuntu-team/gpg_keys'
82 hardware_submissions_collection_link:
83 u'http://.../~ubuntu-team/hardware_submissions'
84 hide_email_addresses: False80 hide_email_addresses: False
85 homepage_content: None81 homepage_content: None
86 invited_members_collection_link:82 invited_members_collection_link:

Subscribers

People subscribed via source and target branches

to status/vote changes: