Launchpad itself

Merge lp:~thumper/launchpad/move-garbo-to-lp into lp:launchpad

  1. move-garbo-to-lp
  2. Merge into devel
Proposed by Tim Penhey on 2010-10-14
Status: Merged
Approved by: Michael Hudson-Doyle on 2010-10-14
Approved revision: no longer in the source branch.
Merged at revision: 11735
Proposed branch: lp:~thumper/launchpad/move-garbo-to-lp
Merge into: lp:launchpad
Diff against target: 132 lines (+10/-10)
10 files modified
cronscripts/garbo-daily.py (+1/-1)
cronscripts/garbo-hourly.py (+1/-1)
lib/lp/bugs/doc/bug-heat.txt (+1/-1)
lib/lp/bugs/tests/test_bugwatch.py (+1/-1)
lib/lp/code/model/tests/test_revision.py (+1/-1)
lib/lp/code/model/tests/test_revisionauthor.py (+1/-1)
lib/lp/code/scripts/tests/test_revisionkarma.py (+1/-1)
lib/lp/hardwaredb/doc/hwdb.txt (+1/-1)
lib/lp/scripts/tests/test_garbo.py (+1/-1)
lib/lp/scripts/utilities/importfascist.py (+1/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/move-garbo-to-lp
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle 2010-10-14 Approve on 2010-10-17
Review via email: mp+38473@code.launchpad.net

Commit Message

Move the garbo scripts into lp.scripts

Description of the Change

As pre-garbo work I'm moving the Garbo scripts into lp.scripts and updating imports.

To post a comment you must log in.
Michael Hudson-Doyle (mwhudson) wrote :

Nice and simple.

Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cronscripts/garbo-daily.py'
2--- cronscripts/garbo-daily.py 2010-04-27 19:48:39 +0000
3+++ cronscripts/garbo-daily.py 2010-10-14 22:39:00 +0000
4@@ -13,7 +13,7 @@
5 __all__ = []
6
7 import _pythonpath
8-from canonical.launchpad.scripts.garbo import DailyDatabaseGarbageCollector
9+from lp.scripts.garbo import DailyDatabaseGarbageCollector
10
11 if __name__ == '__main__':
12 script = DailyDatabaseGarbageCollector()
13
14=== modified file 'cronscripts/garbo-hourly.py'
15--- cronscripts/garbo-hourly.py 2010-04-27 19:48:39 +0000
16+++ cronscripts/garbo-hourly.py 2010-10-14 22:39:00 +0000
17@@ -13,7 +13,7 @@
18 __all__ = []
19
20 import _pythonpath
21-from canonical.launchpad.scripts.garbo import HourlyDatabaseGarbageCollector
22+from lp.scripts.garbo import HourlyDatabaseGarbageCollector
23
24 if __name__ == '__main__':
25 script = HourlyDatabaseGarbageCollector()
26
27=== modified file 'lib/lp/bugs/doc/bug-heat.txt'
28--- lib/lp/bugs/doc/bug-heat.txt 2010-08-23 22:05:26 +0000
29+++ lib/lp/bugs/doc/bug-heat.txt 2010-10-14 22:39:00 +0000
30@@ -250,7 +250,7 @@
31 The BugHeatUpdater class is used to create bug heat calculation jobs for
32 bugs with out-of-date heat.
33
34- >>> from canonical.launchpad.scripts.garbo import BugHeatUpdater
35+ >>> from lp.scripts.garbo import BugHeatUpdater
36 >>> from canonical.launchpad.scripts import FakeLogger
37
38 We'll commit the transaction so that the BugHeatUpdater updates the
39
40=== modified file 'lib/lp/bugs/tests/test_bugwatch.py'
41--- lib/lp/bugs/tests/test_bugwatch.py 2010-10-04 19:50:45 +0000
42+++ lib/lp/bugs/tests/test_bugwatch.py 2010-10-14 22:39:00 +0000
43@@ -26,7 +26,7 @@
44 login,
45 )
46 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
47-from canonical.launchpad.scripts.garbo import BugWatchActivityPruner
48+from lp.scripts.garbo import BugWatchActivityPruner
49 from canonical.launchpad.scripts.logger import QuietFakeLogger
50 from canonical.launchpad.webapp import urlsplit
51 from canonical.testing.layers import (
52
53=== modified file 'lib/lp/code/model/tests/test_revision.py'
54--- lib/lp/code/model/tests/test_revision.py 2010-10-04 19:50:45 +0000
55+++ lib/lp/code/model/tests/test_revision.py 2010-10-14 22:39:00 +0000
56@@ -28,7 +28,7 @@
57 )
58 from canonical.launchpad.interfaces.account import AccountStatus
59 from canonical.launchpad.interfaces.lpstorm import IMasterObject
60-from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
61+from lp.scripts.garbo import RevisionAuthorEmailLinker
62 from canonical.launchpad.webapp.interfaces import (
63 DEFAULT_FLAVOR,
64 IStoreSelector,
65
66=== modified file 'lib/lp/code/model/tests/test_revisionauthor.py'
67--- lib/lp/code/model/tests/test_revisionauthor.py 2010-10-04 19:50:45 +0000
68+++ lib/lp/code/model/tests/test_revisionauthor.py 2010-10-14 22:39:00 +0000
69@@ -12,7 +12,7 @@
70
71 from canonical.config import config
72 from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
73-from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
74+from lp.scripts.garbo import RevisionAuthorEmailLinker
75 from canonical.testing.layers import LaunchpadZopelessLayer
76 from lp.code.model.revision import (
77 RevisionAuthor,
78
79=== modified file 'lib/lp/code/scripts/tests/test_revisionkarma.py'
80--- lib/lp/code/scripts/tests/test_revisionkarma.py 2010-10-04 19:50:45 +0000
81+++ lib/lp/code/scripts/tests/test_revisionkarma.py 2010-10-14 22:39:00 +0000
82@@ -12,7 +12,7 @@
83
84 from canonical.config import config
85 from canonical.launchpad.database.emailaddress import EmailAddressSet
86-from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
87+from lp.scripts.garbo import RevisionAuthorEmailLinker
88 from canonical.testing.layers import LaunchpadZopelessLayer
89 from lp.code.model.revision import RevisionSet
90 from lp.code.scripts.revisionkarma import RevisionKarmaAllocator
91
92=== modified file 'lib/lp/hardwaredb/doc/hwdb.txt'
93--- lib/lp/hardwaredb/doc/hwdb.txt 2010-10-03 15:30:06 +0000
94+++ lib/lp/hardwaredb/doc/hwdb.txt 2010-10-14 22:39:00 +0000
95@@ -375,7 +375,7 @@
96 ... u'beeblebrox@example.com')
97 >>> user.validateAndEnsurePreferredEmail(email)
98 >>> transaction.commit()
99- >>> from canonical.launchpad.scripts.garbo import HWSubmissionEmailLinker
100+ >>> from lp.scripts.garbo import HWSubmissionEmailLinker
101 >>> from lp.testing.logger import MockLogger
102 >>> HWSubmissionEmailLinker(log=MockLogger()).run()
103 >>> submission = hw_submission_set.getBySubmissionKey(u'unique-id-2')
104
105=== renamed file 'lib/canonical/launchpad/scripts/garbo.py' => 'lib/lp/scripts/garbo.py'
106=== added directory 'lib/lp/scripts/tests'
107=== added file 'lib/lp/scripts/tests/__init__.py'
108=== renamed file 'lib/canonical/launchpad/scripts/tests/test_garbo.py' => 'lib/lp/scripts/tests/test_garbo.py'
109--- lib/canonical/launchpad/scripts/tests/test_garbo.py 2010-10-03 15:30:06 +0000
110+++ lib/lp/scripts/tests/test_garbo.py 2010-10-14 22:39:00 +0000
111@@ -34,7 +34,7 @@
112 from canonical.launchpad.database.openidconsumer import OpenIDConsumerNonce
113 from canonical.launchpad.interfaces import IMasterStore
114 from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
115-from canonical.launchpad.scripts.garbo import (
116+from lp.scripts.garbo import (
117 DailyDatabaseGarbageCollector,
118 HourlyDatabaseGarbageCollector,
119 OpenIDConsumerAssociationPruner,
120
121=== modified file 'lib/lp/scripts/utilities/importfascist.py'
122--- lib/lp/scripts/utilities/importfascist.py 2010-09-03 04:14:41 +0000
123+++ lib/lp/scripts/utilities/importfascist.py 2010-10-14 22:39:00 +0000
124@@ -35,7 +35,7 @@
125 canonical.launchpad.feed.branch
126 lp.code.feed.branch
127 canonical.launchpad.interfaces.person
128- canonical.launchpad.scripts.garbo
129+ lp.scripts.garbo
130 canonical.launchpad.vocabularies.dbobjects
131 lp.registry.vocabularies
132 canonical.librarian.client