Merge pull request #60 from liyanhui1228/grid-fix2

Do not show python version incompatible results in dashboard

Author: ylil93

badge_server/badge_server.py

@@ -100,11 +100,6 @@
     }
 }
 
-PKG_PY_VERSION_NOT_SUPPORTED = {
-    2: ['tensorflow', ],
-    3: ['google-cloud-dataflow', ],
-}
-
 SVG_CONTENT_TYPE = 'image/svg+xml'
 
 EMPTY_DETAILS = 'NO DETAILS'
@@ -145,7 +140,7 @@ def _get_badge_url(version_and_res, package_name):
     package_name = package_name.replace('-', '.')
     status = version_and_res['py3']['status']
     if status != 'SUCCESS' and \
-                    package_name not in PKG_PY_VERSION_NOT_SUPPORTED.get(2):
+            package_name not in configs.PKG_PY_VERSION_NOT_SUPPORTED.get(2):
         status = version_and_res['py2']['status']
 
     color = STATUS_COLOR_MAPPING[status]
@@ -284,7 +279,8 @@ def run_check():
                     status = res.get('result')
                     if status != 'SUCCESS':
                         # Ignore the package that not support for given py_ver
-                        if pkg_set[1] in PKG_PY_VERSION_NOT_SUPPORTED.get(
+                        if pkg_set[1] in \
+                                configs.PKG_PY_VERSION_NOT_SUPPORTED.get(
                                 py_ver):
                             continue
                         # Status showing one of the check failures

compatibility_lib/compatibility_lib/configs.py

@@ -56,3 +56,8 @@
     'tensorflow',
     'gcloud',
 ]
+
+PKG_PY_VERSION_NOT_SUPPORTED = {
+    2: ['tensorflow', ],
+    3: ['google-cloud-dataflow', ],
+}

grid_builder.py

@@ -49,6 +49,19 @@ def __init__(self, package_to_results, pairwise_to_results):
         self._package_to_results = package_to_results
         self._pairwise_to_results = pairwise_to_results
 
+    def _is_py_version_incompatible(self, result):
+        if result.status == compatibility_store.Status.INSTALL_ERROR:
+            for version in [2, 3]:
+                for pkg in result.packages:
+                    major_version = result.python_major_version
+                    name = pkg.install_name
+                    unsupported = configs.PKG_PY_VERSION_NOT_SUPPORTED[version]
+
+                    if major_version == version and name in unsupported:
+                        return True
+        return False
+
+
     def get_result(self,
                    package_1: package.Package,
                    package_2: package.Package) -> Mapping[str, str]:
@@ -83,7 +96,8 @@ def get_result(self,
                 self._package_to_results[package_2])
 
         for pr in package_results:
-            if pr.status != compatibility_store.Status.SUCCESS:
+            if not self._is_py_version_incompatible(pr) and \
+                            pr.status != compatibility_store.Status.SUCCESS:
                 return {
                     'status': pr.status.value,
                     'self': True,
@@ -104,7 +118,8 @@ def get_result(self,
                     'self': False,
                 }
             for pr in pairwise_results:
-                if pr.status != compatibility_store.Status.SUCCESS:
+                if not self._is_py_version_incompatible(pr) and \
+                            pr.status != compatibility_store.Status.SUCCESS:
                     return {
                         'status': pr.status.value,
                         'self': False,

test_grid_builder.py

@@ -14,6 +14,7 @@
 
 """Tests for grid_builder."""
 
+import mock
 import unittest
 
 from compatibility_lib import compatibility_store
@@ -24,6 +25,7 @@
 
 PACKAGE_1 = package.Package("package1")
 PACKAGE_2 = package.Package("package2")
+PACKAGE_3 = package.Package("package3")
 
 
 class TestResultHolder(unittest.TestCase):
@@ -250,3 +252,38 @@ def test_pairwise_failure(self):
         grid = grid_builder.GridBuilder(store)
         html_grid = grid.build_grid([PACKAGE_1, PACKAGE_2])
         self.assertIn("Installation failure", html_grid)
+
+    def test_not_show_py_ver_incompatible_results(self):
+        """CompatibilityResult failure between pair of packages. Do not display
+        the packages that are incompatible with a specific Python version.
+        """
+        store = fake_compatibility_store.CompatibilityStore()
+        store.save_compatibility_statuses([
+            compatibility_store.CompatibilityResult(
+                packages=[PACKAGE_1],
+                python_major_version=3,
+                status=compatibility_store.Status.SUCCESS
+            ),
+            compatibility_store.CompatibilityResult(
+                packages=[PACKAGE_3],
+                python_major_version=3,
+                status=compatibility_store.Status.INSTALL_ERROR
+            ),
+            compatibility_store.CompatibilityResult(
+                packages=[PACKAGE_1, PACKAGE_3],
+                python_major_version=3,
+                status=compatibility_store.Status.INSTALL_ERROR,
+                details="Installation failure"
+            ),
+        ])
+        patch = mock.patch(
+            'compatibility_lib.configs.PKG_PY_VERSION_NOT_SUPPORTED', {
+            2: ['package4'],
+            3: ['package3'],
+        })
+
+        with patch:
+            grid = grid_builder.GridBuilder(store)
+            html_grid = grid.build_grid([PACKAGE_1, PACKAGE_2])
+
+        self.assertNotIn("Installation failure", html_grid)