Merge lp:~jml/pkgme-devportal/remove-shim into lp:pkgme-devportal

[Jonathan Lange]

Remove the shim

We used to have four database backends for pkgme-devportal. Now we have
only one, libdep-service. So, rather than use an interface for talking to
it, we can just use the client directly.

[James Westby (james-w)]

review: Approve

=== modified file 'devportalbinary/binary.py'
--- devportalbinary/binary.py	2012-10-26 14:38:49 +0000
+++ devportalbinary/binary.py	2012-11-13 15:49:25 +0000
@@ -34,13 +34,11 @@
    ]
 
 
-from contextlib import closing
 import os
 import subprocess
 
 from pkgme.errors import PkgmeError
 from pkgme.run_script import run_subprocess
-from pkgme import trace
 
 from devportalbinary.configuration import load_configuration
 from devportalbinary.database import get_dependency_database
@@ -208,7 +206,7 @@
 
 OBJDUMP = '/usr/bin/objdump'
 # Map the objdump "architecture" value to the dpkg architecture,
-# objdump report i386 as "i386" but amd64 as "i386:x86-64" 
+# objdump report i386 as "i386" but amd64 as "i386:x86-64"
 OBJDUMP_MAPPING = {
     "i386:x86-64" : "amd64",
 }
@@ -297,13 +295,13 @@
     # XXX: we don't consider arch in overrides, do we need to?
     # -- james_w
     deps = set(lib_overrides[lib] for lib in needs_overrides)
-    with closing(get_dependency_database()) as db:
-        found = db.get_multiple_dependencies(library_names, arch)
+    db = get_dependency_database()
+    found = db.get_binaries_for_libraries(library_names, [arch])[arch]
     missing = library_names - set(found.keys())
     if missing:
         raise UnknownDependency(missing)
     for lib_deps in found.values():
-        deps |= lib_deps
+        deps |= set(lib_deps)
     return deps
 
 

=== modified file 'devportalbinary/database.py'
--- devportalbinary/database.py	2012-11-13 14:43:21 +0000
+++ devportalbinary/database.py	2012-11-13 15:49:25 +0000
@@ -10,33 +10,7 @@
 download_file
 
 
-class LibdepServiceClient(object):
-    """Implements the read part of PackageDatabase's interface."""
-
-    DB_TYPE = 'libdep-service'
-
-    def __init__(self, client):
-        self._client = client
-
-    @classmethod
-    def from_options(cls, options):
-        return cls(Client(options.database_base_url))
-
-    def get_multiple_dependencies(self, library_names, arch):
-        """Get the binary packages that provide libraries.
-
-        :return: (deps, missing), where ``deps`` is a dict mapping library
-            names to sets of packages that provide them, and ``missing`` is a
-            set of library names for which no dependencies could be found.
-        """
-        deps = self._client.get_binaries_for_libraries(library_names, [arch])
-        return dict((lib, set(dep)) for (lib, dep) in deps[arch].items())
-
-    def close(self):
-        pass
-
-
 def get_dependency_database():
     """Return an object that can get dependencies."""
     options = load_configuration()
-    return LibdepServiceClient.from_options(options)
+    return Client(options.database_base_url)

=== modified file 'devportalbinary/testing.py'
--- devportalbinary/testing.py	2012-11-13 14:08:14 +0000
+++ devportalbinary/testing.py	2012-11-13 15:49:25 +0000
@@ -27,12 +27,10 @@
     )
 
 from devportalbinary.binary import MetadataBackend
-from devportalbinary.database import LibdepServiceClient
 
 from devportalbinary.configuration import CONF_FILE_ENV_VAR
 
 from djlibdep.test_double import LibdepServiceDouble
-from libdep_service_client.client import Client
 
 
 class IsChildPath(Matcher):
@@ -120,7 +118,6 @@
                 ('database', {'db_type': 'libdep-service',
                               'base_url': double.base_url,
                               })))
-        self.client = LibdepServiceClient(Client(double.base_url))
 
 
 def LibsConfigSettings(test_libs):
@@ -243,8 +240,3 @@
         for section, values in settings:
             f.write(make_config_section(section, values))
             f.write('\n')
-
-
-def get_libdep_service_client(fixture, test_data):
-    double = fixture.useFixture(LibdepServiceDouble(test_data))
-    return LibdepServiceClient(Client(double.base_url))

=== modified file 'devportalbinary/tests/__init__.py'
--- devportalbinary/tests/__init__.py	2012-09-12 15:04:26 +0000
+++ devportalbinary/tests/__init__.py	2012-11-13 15:49:25 +0000
@@ -3,8 +3,6 @@
 
 from unittest import TestLoader
 
-from testresources import OptimisingTestSuite
-
 
 def test_suite():
     """Insert an OptimizingTestSuite for testresources."""
@@ -12,7 +10,6 @@
         'devportalbinary.tests.test_backend',
         'devportalbinary.tests.test_binary',
         'devportalbinary.tests.test_configuration',
-        'devportalbinary.tests.test_database',
         'devportalbinary.tests.test_metadata',
         'devportalbinary.tests.test_pdf',
         'devportalbinary.tests.test_stubs',
@@ -20,6 +17,5 @@
         'devportalbinary.tests.test_utils',
         ]
     loader = TestLoader()
-    tests = OptimisingTestSuite()
-    tests.addTests(loader.loadTestsFromNames(module_names))
-    return tests
+    return loader.loadTestsFromNames(module_names)
+

=== removed file 'devportalbinary/tests/test_database.py'
--- devportalbinary/tests/test_database.py	2012-11-13 13:55:53 +0000
+++ devportalbinary/tests/test_database.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-
-from testtools import TestCase
-
-from devportalbinary.database import LibdepServiceClient
-from devportalbinary.testing import get_libdep_service_client
-
-from libdep_service_client.client import Client
-
-
-class TestLibdepServiceClient(TestCase):
-
-    TEST_DATA = [('libfoo', {'i386': {'libfoo': 'libfoo-bin'}})]
-
-    def test_wraps_libdep_service(self):
-        wrapper = get_libdep_service_client(self, self.TEST_DATA)
-        self.assertEqual(
-            {'libfoo': set(['libfoo-bin'])},
-            wrapper.get_multiple_dependencies(['libfoo'], 'i386'))
-        self.assertEqual(
-            {}, wrapper.get_multiple_dependencies(['libbar'], 'i386'))
-
-    def test_has_close_method(self):
-        client = Client('http://localhost/')
-        wrapper = LibdepServiceClient(client)
-        # Check that there is no exception
-        wrapper.close()

=== modified file 'setup.py'
--- setup.py	2012-11-13 14:00:37 +0000
+++ setup.py	2012-11-13 15:49:25 +0000
@@ -42,7 +42,7 @@
         'PIL',
         'pkgme>=0.4.1',
         'fixtures',
-        'storm',
+        'storm', # Not actually used, but libdep-service does it wrong
         ],
     entry_points = {
         'console_scripts': [
@@ -53,8 +53,6 @@
         },
     extras_require = {
         'testing': [
-            'postgresfixture',
-            'testresources',
             'testtools',
             'treeshape',
             ],

=== modified file 'versions.cfg'
--- versions.cfg	2012-11-13 14:21:41 +0000
+++ versions.cfg	2012-11-13 15:49:25 +0000
@@ -50,9 +50,7 @@
 paste = 1.7.5.1
 pathod = 0.2.1
 PIL = 1.1.7
-postgresfixture = 0.1.2
 pkgme = 0.4.1
-psycopg2 = 2.4.5
 pyasn1 = 0.1.4
 pyopenssl = 0.13
 python-dateutil = 1.5