launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/soyuz-scriptpocalypse into lp:launchpad.

Commit message:
Move scripts from soyuz to archivepublisher and archiveuploader as appropriate.

Requested reviews:
  William Grant (wgrant): code

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/soyuz-scriptpocalypse/+merge/231292

Move scripts from soyuz to archivepublisher and archiveuploader as appropriate.
-- 
https://code.launchpad.net/~wgrant/launchpad/soyuz-scriptpocalypse/+merge/231292
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== renamed file 'lib/lp/soyuz/scripts/processaccepted.py' => 'lib/lp/archivepublisher/scripts/processaccepted.py'
=== renamed file 'lib/lp/soyuz/scripts/processdeathrow.py' => 'lib/lp/archivepublisher/scripts/processdeathrow.py'
=== modified file 'lib/lp/archivepublisher/scripts/publish_ftpmaster.py'
--- lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2014-08-05 10:37:07 +0000
+++ lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2014-08-19 04:01:00 +0000
@@ -17,6 +17,8 @@
 from lp.archivepublisher.config import getPubConfig
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.publishing import GLOBAL_PUBLISHER_LOCK
+from lp.archivepublisher.scripts.processaccepted import ProcessAccepted
+from lp.archivepublisher.scripts.publishdistro import PublishDistro
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import (
     PackagePublishingPocket,
@@ -36,8 +38,6 @@
     )
 from lp.soyuz.model.distroarchseries import DistroArchSeries
 from lp.soyuz.scripts.custom_uploads_copier import CustomUploadsCopier
-from lp.soyuz.scripts.processaccepted import ProcessAccepted
-from lp.soyuz.scripts.publishdistro import PublishDistro
 
 
 def get_publishable_archives(distribution):

=== renamed file 'lib/lp/soyuz/scripts/publishdistro.py' => 'lib/lp/archivepublisher/scripts/publishdistro.py'
=== renamed file 'lib/lp/soyuz/tests/test_processaccepted.py' => 'lib/lp/archivepublisher/tests/test_processaccepted.py'
--- lib/lp/soyuz/tests/test_processaccepted.py	2014-08-09 09:21:13 +0000
+++ lib/lp/archivepublisher/tests/test_processaccepted.py	2014-08-19 04:01:00 +0000
@@ -8,6 +8,7 @@
 from testtools.matchers import LessThan
 import transaction
 
+from lp.archivepublisher.scripts.processaccepted import ProcessAccepted
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.config import config
 from lp.services.database.interfaces import IStore
@@ -18,7 +19,6 @@
     PackageUploadStatus,
     )
 from lp.soyuz.model.queue import PackageUpload
-from lp.soyuz.scripts.processaccepted import ProcessAccepted
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
 from lp.testing.dbuser import switch_dbuser

=== renamed file 'lib/lp/soyuz/scripts/tests/test_processdeathrow.py' => 'lib/lp/archivepublisher/tests/test_processdeathrow.py'
=== added directory 'lib/lp/archiveuploader/scripts'
=== added file 'lib/lp/archiveuploader/scripts/__init__.py'
=== renamed file 'lib/lp/soyuz/scripts/soyuz_process_upload.py' => 'lib/lp/archiveuploader/scripts/processupload.py'
=== renamed file 'lib/lp/soyuz/scripts/tests/test_processupload.py' => 'lib/lp/archiveuploader/tests/test_processupload.py'
=== renamed file 'lib/lp/soyuz/scripts/tests/test_publishdistro.py' => 'lib/lp/archiveuploader/tests/test_publishdistro.py'
--- lib/lp/soyuz/scripts/tests/test_publishdistro.py	2013-08-01 14:09:45 +0000
+++ lib/lp/archiveuploader/tests/test_publishdistro.py	2014-08-19 04:01:00 +0000
@@ -18,6 +18,7 @@
 from lp.archivepublisher.config import getPubConfig
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.publishing import Publisher
+from lp.archivepublisher.scripts.publishdistro import PublishDistro
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -33,7 +34,6 @@
     PackagePublishingStatus,
     )
 from lp.soyuz.interfaces.archive import IArchiveSet
-from lp.soyuz.scripts.publishdistro import PublishDistro
 from lp.soyuz.tests.test_publishing import TestNativePublishingBase
 from lp.testing import TestCaseWithFactory
 from lp.testing.dbuser import switch_dbuser

=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2014-07-21 08:16:41 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2014-08-19 04:01:00 +0000
@@ -123,10 +123,9 @@
 And then we need a way to process the uploads from the queue
 
     >>> import logging
+    >>> from lp.archiveuploader.scripts.processupload import ProcessUpload
     >>> from lp.services.config import config
     >>> from lp.services.log.logger import FakeLogger
-    >>> from lp.soyuz.scripts.soyuz_process_upload import (
-    ...     ProcessUpload)
     >>> from lp.testing.dbuser import switch_dbuser
     >>> from lp.testing.layers import LaunchpadZopelessLayer
     >>> def process_uploads(upload_policy, series, loglevel):

=== modified file 'scripts/process-accepted.py'
--- scripts/process-accepted.py	2013-01-07 02:40:55 +0000
+++ scripts/process-accepted.py	2014-08-19 04:01:00 +0000
@@ -12,7 +12,7 @@
 
 import _pythonpath
 
-from lp.soyuz.scripts.processaccepted import ProcessAccepted
+from lp.archivepublisher.scripts.processaccepted import ProcessAccepted
 
 
 if __name__ == '__main__':

=== modified file 'scripts/process-death-row.py'
--- scripts/process-death-row.py	2013-01-07 03:21:35 +0000
+++ scripts/process-death-row.py	2014-08-19 04:01:00 +0000
@@ -23,7 +23,7 @@
 """
 import _pythonpath
 
-from lp.soyuz.scripts.processdeathrow import DeathRowProcessor
+from lp.archivepublisher.scripts.processdeathrow import DeathRowProcessor
 
 
 if __name__ == "__main__":

=== modified file 'scripts/process-upload.py'
--- scripts/process-upload.py	2011-09-22 09:47:13 +0000
+++ scripts/process-upload.py	2014-08-19 04:01:00 +0000
@@ -11,7 +11,7 @@
 
 import _pythonpath
 
-from lp.soyuz.scripts.soyuz_process_upload import ProcessUpload
+from lp.archiveuploader.scripts.processupload import ProcessUpload
 
 
 if __name__ == '__main__':

=== modified file 'scripts/publish-distro.py'
--- scripts/publish-distro.py	2013-01-07 02:40:55 +0000
+++ scripts/publish-distro.py	2014-08-19 04:01:00 +0000
@@ -5,7 +5,7 @@
 
 import _pythonpath
 
-from lp.soyuz.scripts.publishdistro import PublishDistro
+from lp.archivepublisher.scripts.publishdistro import PublishDistro
 
 
 if __name__ == "__main__":