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
Status: Merged
Approved by: Michael Hudson-Doyle
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 Approve
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.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Nice and simple.

Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cronscripts/garbo-daily.py'
--- cronscripts/garbo-daily.py 2010-04-27 19:48:39 +0000
+++ cronscripts/garbo-daily.py 2010-10-14 22:39:00 +0000
@@ -13,7 +13,7 @@
13__all__ = []13__all__ = []
1414
15import _pythonpath15import _pythonpath
16from canonical.launchpad.scripts.garbo import DailyDatabaseGarbageCollector16from lp.scripts.garbo import DailyDatabaseGarbageCollector
1717
18if __name__ == '__main__':18if __name__ == '__main__':
19 script = DailyDatabaseGarbageCollector()19 script = DailyDatabaseGarbageCollector()
2020
=== modified file 'cronscripts/garbo-hourly.py'
--- cronscripts/garbo-hourly.py 2010-04-27 19:48:39 +0000
+++ cronscripts/garbo-hourly.py 2010-10-14 22:39:00 +0000
@@ -13,7 +13,7 @@
13__all__ = []13__all__ = []
1414
15import _pythonpath15import _pythonpath
16from canonical.launchpad.scripts.garbo import HourlyDatabaseGarbageCollector16from lp.scripts.garbo import HourlyDatabaseGarbageCollector
1717
18if __name__ == '__main__':18if __name__ == '__main__':
19 script = HourlyDatabaseGarbageCollector()19 script = HourlyDatabaseGarbageCollector()
2020
=== modified file 'lib/lp/bugs/doc/bug-heat.txt'
--- lib/lp/bugs/doc/bug-heat.txt 2010-08-23 22:05:26 +0000
+++ lib/lp/bugs/doc/bug-heat.txt 2010-10-14 22:39:00 +0000
@@ -250,7 +250,7 @@
250The BugHeatUpdater class is used to create bug heat calculation jobs for250The BugHeatUpdater class is used to create bug heat calculation jobs for
251bugs with out-of-date heat.251bugs with out-of-date heat.
252252
253 >>> from canonical.launchpad.scripts.garbo import BugHeatUpdater253 >>> from lp.scripts.garbo import BugHeatUpdater
254 >>> from canonical.launchpad.scripts import FakeLogger254 >>> from canonical.launchpad.scripts import FakeLogger
255255
256We'll commit the transaction so that the BugHeatUpdater updates the256We'll commit the transaction so that the BugHeatUpdater updates the
257257
=== modified file 'lib/lp/bugs/tests/test_bugwatch.py'
--- lib/lp/bugs/tests/test_bugwatch.py 2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/tests/test_bugwatch.py 2010-10-14 22:39:00 +0000
@@ -26,7 +26,7 @@
26 login,26 login,
27 )27 )
28from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities28from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
29from canonical.launchpad.scripts.garbo import BugWatchActivityPruner29from lp.scripts.garbo import BugWatchActivityPruner
30from canonical.launchpad.scripts.logger import QuietFakeLogger30from canonical.launchpad.scripts.logger import QuietFakeLogger
31from canonical.launchpad.webapp import urlsplit31from canonical.launchpad.webapp import urlsplit
32from canonical.testing.layers import (32from canonical.testing.layers import (
3333
=== modified file 'lib/lp/code/model/tests/test_revision.py'
--- lib/lp/code/model/tests/test_revision.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_revision.py 2010-10-14 22:39:00 +0000
@@ -28,7 +28,7 @@
28 )28 )
29from canonical.launchpad.interfaces.account import AccountStatus29from canonical.launchpad.interfaces.account import AccountStatus
30from canonical.launchpad.interfaces.lpstorm import IMasterObject30from canonical.launchpad.interfaces.lpstorm import IMasterObject
31from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker31from lp.scripts.garbo import RevisionAuthorEmailLinker
32from canonical.launchpad.webapp.interfaces import (32from canonical.launchpad.webapp.interfaces import (
33 DEFAULT_FLAVOR,33 DEFAULT_FLAVOR,
34 IStoreSelector,34 IStoreSelector,
3535
=== modified file 'lib/lp/code/model/tests/test_revisionauthor.py'
--- lib/lp/code/model/tests/test_revisionauthor.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_revisionauthor.py 2010-10-14 22:39:00 +0000
@@ -12,7 +12,7 @@
1212
13from canonical.config import config13from canonical.config import config
14from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus14from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
15from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker15from lp.scripts.garbo import RevisionAuthorEmailLinker
16from canonical.testing.layers import LaunchpadZopelessLayer16from canonical.testing.layers import LaunchpadZopelessLayer
17from lp.code.model.revision import (17from lp.code.model.revision import (
18 RevisionAuthor,18 RevisionAuthor,
1919
=== modified file 'lib/lp/code/scripts/tests/test_revisionkarma.py'
--- lib/lp/code/scripts/tests/test_revisionkarma.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/scripts/tests/test_revisionkarma.py 2010-10-14 22:39:00 +0000
@@ -12,7 +12,7 @@
1212
13from canonical.config import config13from canonical.config import config
14from canonical.launchpad.database.emailaddress import EmailAddressSet14from canonical.launchpad.database.emailaddress import EmailAddressSet
15from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker15from lp.scripts.garbo import RevisionAuthorEmailLinker
16from canonical.testing.layers import LaunchpadZopelessLayer16from canonical.testing.layers import LaunchpadZopelessLayer
17from lp.code.model.revision import RevisionSet17from lp.code.model.revision import RevisionSet
18from lp.code.scripts.revisionkarma import RevisionKarmaAllocator18from lp.code.scripts.revisionkarma import RevisionKarmaAllocator
1919
=== modified file 'lib/lp/hardwaredb/doc/hwdb.txt'
--- lib/lp/hardwaredb/doc/hwdb.txt 2010-10-03 15:30:06 +0000
+++ lib/lp/hardwaredb/doc/hwdb.txt 2010-10-14 22:39:00 +0000
@@ -375,7 +375,7 @@
375 ... u'beeblebrox@example.com')375 ... u'beeblebrox@example.com')
376 >>> user.validateAndEnsurePreferredEmail(email)376 >>> user.validateAndEnsurePreferredEmail(email)
377 >>> transaction.commit()377 >>> transaction.commit()
378 >>> from canonical.launchpad.scripts.garbo import HWSubmissionEmailLinker378 >>> from lp.scripts.garbo import HWSubmissionEmailLinker
379 >>> from lp.testing.logger import MockLogger379 >>> from lp.testing.logger import MockLogger
380 >>> HWSubmissionEmailLinker(log=MockLogger()).run()380 >>> HWSubmissionEmailLinker(log=MockLogger()).run()
381 >>> submission = hw_submission_set.getBySubmissionKey(u'unique-id-2')381 >>> submission = hw_submission_set.getBySubmissionKey(u'unique-id-2')
382382
=== renamed file 'lib/canonical/launchpad/scripts/garbo.py' => 'lib/lp/scripts/garbo.py'
=== added directory 'lib/lp/scripts/tests'
=== added file 'lib/lp/scripts/tests/__init__.py'
=== renamed file 'lib/canonical/launchpad/scripts/tests/test_garbo.py' => 'lib/lp/scripts/tests/test_garbo.py'
--- lib/canonical/launchpad/scripts/tests/test_garbo.py 2010-10-03 15:30:06 +0000
+++ lib/lp/scripts/tests/test_garbo.py 2010-10-14 22:39:00 +0000
@@ -34,7 +34,7 @@
34from canonical.launchpad.database.openidconsumer import OpenIDConsumerNonce34from canonical.launchpad.database.openidconsumer import OpenIDConsumerNonce
35from canonical.launchpad.interfaces import IMasterStore35from canonical.launchpad.interfaces import IMasterStore
36from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus36from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
37from canonical.launchpad.scripts.garbo import (37from lp.scripts.garbo import (
38 DailyDatabaseGarbageCollector,38 DailyDatabaseGarbageCollector,
39 HourlyDatabaseGarbageCollector,39 HourlyDatabaseGarbageCollector,
40 OpenIDConsumerAssociationPruner,40 OpenIDConsumerAssociationPruner,
4141
=== modified file 'lib/lp/scripts/utilities/importfascist.py'
--- lib/lp/scripts/utilities/importfascist.py 2010-09-03 04:14:41 +0000
+++ lib/lp/scripts/utilities/importfascist.py 2010-10-14 22:39:00 +0000
@@ -35,7 +35,7 @@
35 canonical.launchpad.feed.branch35 canonical.launchpad.feed.branch
36 lp.code.feed.branch36 lp.code.feed.branch
37 canonical.launchpad.interfaces.person37 canonical.launchpad.interfaces.person
38 canonical.launchpad.scripts.garbo38 lp.scripts.garbo
39 canonical.launchpad.vocabularies.dbobjects39 canonical.launchpad.vocabularies.dbobjects
40 lp.registry.vocabularies40 lp.registry.vocabularies
41 canonical.librarian.client41 canonical.librarian.client