launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/lpbuildd-egg into lp:launchpad.

Commit message:
Install launchpad-buildd as a Python dependency rather than expecting it as a system dependency.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/lpbuildd-egg/+merge/276663

Install launchpad-buildd as a Python dependency rather than expecting it as a system dependency.  This goes with https://code.launchpad.net/~cjwatson/launchpad-buildd/build-sdist/+merge/276654, and has the same reasoning: it frees us from having to ask sysadmins to upgrade buildbots manually rather than being able to control the versions in use for ourselves, and it lets us get rid of some special buildout configuration to add /usr/lib/launchpad-buildd to sys.path.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/lpbuildd-egg into lp:launchpad.

=== modified file 'buildout.cfg'
--- buildout.cfg	2015-08-21 13:09:09 +0000
+++ buildout.cfg	2015-11-04 14:43:37 +0000
@@ -53,7 +53,6 @@
 # Make mailman built and installed in a more normal way.
 extra-paths =
     ${buildout:directory}/lib/mailman
-    /usr/lib/launchpad-buildd
 include-site-packages = true
 allowed-eggs-from-site-packages =
 interpreter = py

=== modified file 'lib/lp/buildmaster/tests/test_interactor.py'
--- lib/lp/buildmaster/tests/test_interactor.py	2015-09-07 11:03:39 +0000
+++ lib/lp/buildmaster/tests/test_interactor.py	2015-11-04 14:43:37 +0000
@@ -509,11 +509,9 @@
         self.assertEqual(['1.0', 'i386'], info[:2])
         self.assertThat(
             info[2],
-            # XXX cjwatson 2015-09-07: This should also include 'snap' once
-            # the buildbot slaves are upgraded to python-lpbuildd >= 133.
             ContainsAll(
                 ('sourcepackagerecipe', 'translation-templates',
-                 'binarypackage', 'livefs')))
+                 'binarypackage', 'livefs', 'snap')))
 
     @defer.inlineCallbacks
     def test_initial_status(self):

=== modified file 'setup.py'
--- setup.py	2015-06-17 04:53:19 +0000
+++ setup.py	2015-11-04 14:43:37 +0000
@@ -47,6 +47,7 @@
         'python-keystoneclient',
         'python-subunit',
         'python-swiftclient',
+        'launchpad-buildd',
         'launchpadlib',
         'lazr.batchnavigator',
         'lazr.config',

=== modified file 'versions.cfg'
--- versions.cfg	2015-08-03 07:06:45 +0000
+++ versions.cfg	2015-11-04 14:43:37 +0000
@@ -46,6 +46,7 @@
 jsautobuild = 0.2
 keyring = 0.6.2
 kombu = 3.0.26
+launchpad-buildd = 136
 launchpadlib = 1.10.2
 lazr.authentication = 0.1.1
 lazr.batchnavigator = 1.2.11