Merge lp:~mvo/pkgme-devportal/changelog-for-the-latest into lp:pkgme-devportal

[Michael Vogt]

Ensure that the latest stable distro release is in the changelog (mvo)

This branch ensures that the changelog is always set to the latest ubuntu distribution release found on launchpad. This fixes bug #1012625. The downside of this approach is that its pretty slow and the acceptance test goes from
~7s on my system to 30s without a launchpadlib cachedir and ~26s with a launchpadlib cachedir.

[James Westby (james-w)]

Hi,

The slow down of acceptance tests is rather annoying, but I think tolerable for this
change. I'd like jml's opinion too though.

Thanks,

James

review: Approve

[Michael Vogt (mvo)]

jml? Any feedback on this one?

[Jonathan Lange (jml)]

Hi,

Launchpad should really have a better test double! I could imagine, in this case, setting up a simplish local webserver that only served the resources that you need.

I'm OK with this landing as is.

Oh, actually, please address the XXX comment. At least, say who "I" is.

Thanks,
jml

[lp:~mvo/pkgme-devportal/changelog-for-the-latest]

55. By Michael Vogt on 2012-07-12

give the XXX a name

[Michael Vogt (mvo)]

Thanks, I addressed the XXX issue and can look into the local webserver later if needed.

[Jonathan Lange (jml)]

Hey mvo,

I'm sorry I didn't notice this on the first cut, but could you please rename the cache variable, ``stable_ubuntu_distroseries`` to have an underscore prefix?

Once that's done, we're good to land.

Thanks,
jml

review: Approve

[lp:~mvo/pkgme-devportal/changelog-for-the-latest]

56. By Michael Vogt on 2012-07-16

devportalbinary/utils.py: rename stable_ubuntu_distroseries->_stable_ubuntu_distroseries

[Michael Vogt (mvo)]

Thanks, I fixed the rename issue now.

I also looked into a test double for LP a bit this morning, but its really the wadl stuff that makes it rather cumbersome. I was thinking that maybe a simple proxy server would be good enough to speed the tests up but it appears that launchpadlib does not support proxies (according to #938542).

[Michael Vogt (mvo)]

I guess one alternative would simply be to use http://changelogs.ubuntu.com/meta-release as this dosn't require download nearly as much data as the wadl stuff.

=== modified file 'devportalbinary/metadata.py'
--- devportalbinary/metadata.py	2012-07-06 15:58:03 +0000
+++ devportalbinary/metadata.py	2012-07-16 06:56:18 +0000
@@ -27,6 +27,7 @@
     Categories,
     Depends,
     Description,
+    Distribution,
     Executable,
     ExtraFiles,
     ExtraFilesFromPaths,
@@ -44,6 +45,9 @@
     )
 from pkgme.project_info import DictInfo
 
+from .utils import get_latest_stable_ubuntu_distroseries
+
+
 # XXX: is this the right place?
 LINTIAN_OVERRIDES_TEMPLATE = """
 #Partner package contents belong in /opt
@@ -250,6 +254,9 @@
         """Get the package description."""
         return metadata.get(self.DESCRIPTION, '')
 
+    def get_distribution(self, metadata):
+        return get_latest_stable_ubuntu_distroseries()
+
     def get_executable(self, package_name):
         """Return the path to the executable."""
         raise NotImplementedError(self.get_executable)
@@ -415,6 +422,7 @@
             ]
         OPTIONAL_ELEMENTS = [
             Architecture,
+            Distribution,
             ExtraFilesFromPaths,
             Maintainer,
             Version,

=== modified file 'devportalbinary/tests/test_metadata.py'
--- devportalbinary/tests/test_metadata.py	2012-07-06 15:58:03 +0000
+++ devportalbinary/tests/test_metadata.py	2012-07-16 06:56:18 +0000
@@ -12,6 +12,7 @@
     BuildDepends,
     Description,
     Depends,
+    Distribution,
     ExtraFiles,
     ExtraFilesFromPaths,
     Homepage,
@@ -66,6 +67,16 @@
 
     BACKEND = DummyBackend
 
+    def setUp(self):
+        super(MetadataTests, self).setUp()
+        # mock this for all tests to ensure we do not slow down because
+        # of network access
+        patcher = patch(
+            'devportalbinary.metadata.get_latest_stable_ubuntu_distroseries')
+        mock_get_latest_distroseries = patcher.start()
+        mock_get_latest_distroseries.return_value = 'foo'
+        self.addCleanup(patcher.stop)
+
     def test_metadata_file(self):
         self.assertEqual('devportal-metadata.json', MetadataBackend.METADATA_FILE)
 
@@ -264,6 +275,7 @@
              BuildDepends: ('build_depends', metadata),
              Depends: ('depends', metadata),
              Description: ('description', metadata),
+             Distribution: 'foo',
              ExtraFiles: backend.get_extra_files(metadata, package_name),
              PackageName: package_name,
              License: "unknown",
@@ -281,6 +293,7 @@
             {BuildDepends: ('build_depends', metadata),
              Depends: ('depends', metadata),
              Description: ('description', metadata),
+             Distribution: 'foo',
              ExtraFiles: backend.get_extra_files(metadata, package_name),
              PackageName: package_name,
              License: "unknown",
@@ -374,6 +387,11 @@
         backend = self.make_backend()
         self.assertEqual('Apache-2.0', backend.get_info(metadata)[License])
 
+    def test_distribution(self):
+        metadata = self.make_metadata()
+        backend = self.make_backend()
+        self.assertEqual('foo', backend.get_info(metadata)[Distribution])
+
 
 class DesktopFileTests(TestCase):
 

=== modified file 'devportalbinary/utils.py'
--- devportalbinary/utils.py	2012-04-12 16:23:09 +0000
+++ devportalbinary/utils.py	2012-07-16 06:56:18 +0000
@@ -11,6 +11,7 @@
     )
 
 from bzrlib import urlutils
+from launchpadlib.launchpad import Launchpad
 
 
 def _open_file_for_writing(url, directory=None, name=None, working_dir=None):
@@ -64,3 +65,18 @@
             os.close(fd)
     finally:
         download.close()
+
+
+_stable_ubuntu_distroseries = None
+def get_latest_stable_ubuntu_distroseries():
+    """Return the latest stable ubuntu release codename (e.g. "precise")"""
+    global _stable_ubuntu_distroseries
+    if _stable_ubuntu_distroseries is None:
+        # XXX: mvo wonders if a cachedir here would make sense
+        cachedir = None
+        launchpad = Launchpad.login_anonymously(
+            'pkgme-devportal', 'production', cachedir)
+        for distroseries in launchpad.distributions["ubuntu"].series:
+            if distroseries.status == 'Current Stable Release':
+                _stable_ubuntu_distroseries = distroseries.name
+    return _stable_ubuntu_distroseries