Fix the google compatibility badge (#120)

Author: liyanhui1228

badge_server/badge_server.py

@@ -396,26 +396,41 @@ def run_check():
         if package_name in configs.PKG_LIST:
             result = _get_pair_status_for_packages(pkg_sets)
         else:
-            for pkg_set in pkg_sets:
-                for py_ver in [2, 3]:
-                    py_version = PY_VER_MAPPING[py_ver]
-                    res = checker.check(pkg_set, str(py_ver))
-                    status = res.get('result')
+            version_and_res = {
+                'py2': {
+                    'status': 'SUCCESS',
+                    'details': {},
+                },
+                'py3': {
+                    'status': 'SUCCESS',
+                    'details': {},
+                }
+            }
+
+            for py_ver in [2, 3]:
+                results = list(checker.get_pairwise_compatibility(
+                    py_ver, pkg_sets))
+                py_version = PY_VER_MAPPING[py_ver]
+
+                for res in results:
+                    logging.warning(res)
+                    status = res[0].get('result')
+                    package = res[0].get('packages')[1]
                     if status != 'SUCCESS':
                         # Ignore the package that not support for given py_ver
-                        if pkg_set[1] in \
+                        if package in \
                                 configs.PKG_PY_VERSION_NOT_SUPPORTED.get(
                                 py_ver):
                             continue
                         # Status showing one of the check failures
-                        default_version_and_res[
+                        version_and_res[
                             py_version]['status'] = res.get('result')
                         description = res.get('description')
                         details = EMPTY_DETAILS if description is None \
                             else description
-                        default_version_and_res[
-                            py_version]['details'][pkg_set[1]] = details
-            result = default_version_and_res
+                        version_and_res[
+                            py_version]['details'][package] = details
+            result = version_and_res
 
         # Write the result to memory store
         redis_client.set(

compatibility_lib/compatibility_lib/compatibility_checker.py

@@ -16,8 +16,8 @@
 
 import itertools
 import concurrent.futures
-import urllib.request
 import json
+import requests
 import retrying
 
 from compatibility_lib import configs
@@ -32,17 +32,13 @@ def __init__(self, max_workers=20):
 
     def check(self, packages, python_version):
         """Call the checker server to get back status results."""
-        data = json.dumps({
+        data = {
             'python-version': python_version,
-            'packages': packages
-        }).encode('utf-8')
+            'package': packages
+        }
+        result = requests.get(SERVER_URL, params=data)
 
-        check_request = urllib.request.Request(SERVER_URL, data)
-
-        with urllib.request.urlopen(check_request) as f:
-            result = json.loads(f.read().decode('utf-8'))
-
-        return result
+        return json.loads(result.content.decode('utf-8'))
 
     @retrying.retry(wait_exponential_multiplier=5000,
                     wait_exponential_max=20000)
@@ -65,11 +61,12 @@ def get_self_compatibility(self, python_version, packages=None):
             for result in zip(pkg_set_results):
                 yield result
 
-    def get_pairwise_compatibility(self, python_version):
+    def get_pairwise_compatibility(self, python_version, pkg_sets=None):
         """Get pairwise compatibility data for each pair of packages."""
+        if pkg_sets is None:
+            pkg_sets = itertools.combinations(configs.PKG_LIST, 2)
         with concurrent.futures.ThreadPoolExecutor(
                 max_workers=self.max_workers) as p:
-            pkg_sets = itertools.combinations(configs.PKG_LIST, 2)
             pkg_set_results = p.map(
                 self.retrying_check,
                 ((list(pkg_set), python_version) for pkg_set in pkg_sets))

compatibility_lib/compatibility_lib/test_compatibility_checker.py

@@ -31,31 +31,22 @@ def test_check(self):
 
         data = {
             'python-version': python_version,
-            'packages': packages
+            'package': packages
         }
 
-        request = mock.Mock()
-
-        mock_request = mock.Mock()
-        mock_request.Request.return_value = request
-
-        urlopen_res = mock.Mock()
-        mock_request.urlopen.return_value = urlopen_res
-        json_mock = mock.Mock()
-        json_mock.read.return_value = b'{}'
-        urlopen_res.__enter__ = mock.Mock(return_value=json_mock)
-        urlopen_res.__exit__ = mock.Mock(return_value=None)
+        mock_requests = mock.Mock()
+        mock_response = mock.Mock(content=b'{}')
+        mock_requests.get.return_value = mock_response
 
         patch_request = mock.patch(
-            'compatibility_lib.compatibility_checker.urllib.request',
-            mock_request)
+            'compatibility_lib.compatibility_checker.requests',
+            mock_requests)
 
         with patch_request:
             checker.check(packages, python_version)
 
-        mock_request.Request.assert_called_with(
-            compatibility_checker.SERVER_URL, json.dumps(data).encode('utf-8'))
-        mock_request.urlopen.assert_called_with(request)
+        mock_requests.get.assert_called_with(
+            compatibility_checker.SERVER_URL, params=data)
 
     def _mock_retrying_check(self, *args):
         packages = args[0][0]

requirements-test.txt

@@ -4,5 +4,6 @@ Jinja2==2.10
 mock==2.0.0
 pytest==3.6.1
 redis==2.10.6
+requests==2.19.1
 retrying==1.3.3
 wrapt==1.10.11