launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/trusty-pls into lp:launchpad.

Commit message:
Fix most stuff for trusty. Just a couple of JS failures a CSCVS Subversion failure remain.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/trusty-pls/+merge/202031

Fix most stuff for trusty. Just a couple of JS failures a CSCVS Subversion failure remain.
-- 
https://code.launchpad.net/~wgrant/launchpad/trusty-pls/+merge/202031
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/trusty-pls into lp:launchpad.

=== modified file 'cronscripts/publishing/gen-contents/apt_conf_header.template'
--- cronscripts/publishing/gen-contents/apt_conf_header.template	2011-04-18 09:14:10 +0000
+++ cronscripts/publishing/gen-contents/apt_conf_header.template	2014-01-17 02:19:44 +0000
@@ -16,6 +16,7 @@
 TreeDefault
 {
    // Header for Contents file.
+   Contents "$(DIST)/Contents-$(ARCH)";
    Contents::Header "%(content_archive)s/%(distribution)s-misc/Contents.top";
 };
 

=== modified file 'lib/lp/archivepublisher/model/ftparchive.py'
--- lib/lp/archivepublisher/model/ftparchive.py	2013-07-05 14:27:12 +0000
+++ lib/lp/archivepublisher/model/ftparchive.py	2014-01-17 02:19:44 +0000
@@ -76,6 +76,7 @@
 
 TreeDefault
 {
+    Contents "$(DIST)/Contents-$(ARCH)";
     Contents::Header "%s/contents.header";
 };
 

=== modified file 'lib/lp/registry/services/tests/test_sharingservice.py'
--- lib/lp/registry/services/tests/test_sharingservice.py	2013-01-09 05:37:18 +0000
+++ lib/lp/registry/services/tests/test_sharingservice.py	2014-01-17 02:19:44 +0000
@@ -1417,7 +1417,7 @@
             expected = [product]
             if IPersonRoles(who).in_admin:
                 expected.append(unrelated_product)
-        self.assertEqual(expected, list(shared))
+        self.assertContentEqual(expected, shared)
 
     def test_getSharedProjects_anonymous(self):
         # Anonymous users don't get to see any shared products.

=== modified file 'lib/lp/soyuz/doc/package-relationship.txt'
--- lib/lp/soyuz/doc/package-relationship.txt	2012-12-26 01:32:19 +0000
+++ lib/lp/soyuz/doc/package-relationship.txt	2014-01-17 02:19:44 +0000
@@ -32,9 +32,9 @@
 IPackageRelationShip instance. We use APT to parse the relationship
 lines:
 
-  >>> from apt_pkg import ParseDepends
+  >>> from apt_pkg import parse_depends
 
-ParseDepends returns a 'list of lists of tuples' as:
+parse_depends returns a 'list of lists of tuples' as:
 
   [ [('$NAME', '$VERSION', '$OPERATOR')],
     [('$NAME', '$VERSION', '$OPERATOR')],
@@ -44,7 +44,7 @@
 *sane* data:
 
   >>> parsed_relationships = [relationship for (relationship,) in
-  ...                         ParseDepends(relationship_line)]
+  ...                         parse_depends(relationship_line)]
 
 Let's see what we call 'sane':
 

=== modified file 'setup.py'
--- setup.py	2013-12-04 08:46:38 +0000
+++ setup.py	2014-01-17 02:19:44 +0000
@@ -31,6 +31,7 @@
         'auditorfixture',
         'BeautifulSoup',
         'bzr',
+        'cssselect',
         'cssutils',
         'dkimpy',
         # Required for dkimpy

=== modified file 'versions.cfg'
--- versions.cfg	2013-12-04 08:46:38 +0000
+++ versions.cfg	2014-01-17 02:19:44 +0000
@@ -19,6 +19,7 @@
 bzr = 2.6.0
 celery = 2.5.1
 Chameleon = 2.11
+cssselect = 0.9.1
 cssutils = 0.9.10
 d2to1 = 0.2.10
 Django = 1.4
@@ -119,7 +120,7 @@
 sourcecodegen = 0.6.14
 # lp:~launchpad-committers/storm/with-without-datetime
 storm = 0.19.0.99-lpwithnodatetime-r406
-subvertpy = 0.9.0
+subvertpy = 0.9.1
 testresources = 0.2.7
 testtools = 0.9.30
 timeline = 0.0.3