From 41813b7a6ff13ae743a953f59147e9c9eef11cad Mon Sep 17 00:00:00 2001 From: Angela Li Date: Wed, 10 Oct 2018 16:50:06 -0700 Subject: [PATCH 1/2] Remove the work around for renaming --- dashboard/dashboard_builder.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dashboard/dashboard_builder.py b/dashboard/dashboard_builder.py index 368e29b3..ba3827bf 100644 --- a/dashboard/dashboard_builder.py +++ b/dashboard/dashboard_builder.py @@ -183,12 +183,8 @@ def get_package_details(self, p: package.Package): 'latest_version': '0.1.0', } """ - # TODO: Will remove after a new build to update the bigquery data. - pkg_name = p.install_name - if p.install_name == 'apache-beam[gcp]': - pkg_name = 'google-cloud-dataflow' latest_version = self._package_with_dependency_info[ - pkg_name][pkg_name]['latest_version'] + p.install_name][p.install_name]['latest_version'] pairwise_conflict = [] # Initialize the values @@ -201,10 +197,7 @@ def get_package_details(self, p: package.Package): for pair_pkg in configs.PKG_LIST: check_result = self.get_result(p, package.Package(pair_pkg)) # Get self compatibility status - # TODO: Will remove after a new build to update the bigquery data. - if pair_pkg == 'apache-beam[gcp]': - pair_pkg = 'google-cloud-dataflow' - if pair_pkg == pkg_name: + if pair_pkg == p.install_name: result['self_conflict'] = True \ if check_result['status_type'] != 'self-success' else False # Get pairwise compatibility status @@ -366,9 +359,6 @@ def main(): package_with_dependency_info = {} for pkg in configs.PKG_LIST: - # TODO: Will remove after a new build to update the bigquery data. - if pkg == 'apache-beam[gcp]': - pkg = 'google-cloud-dataflow' dep_info = store.get_dependency_info(pkg) package_with_dependency_info[pkg] = dep_info From f27a97907056f657a65914fd5e159a065b4aa44b Mon Sep 17 00:00:00 2001 From: Angela Li Date: Thu, 11 Oct 2018 09:44:49 -0700 Subject: [PATCH 2/2] fix --- dashboard/dashboard_builder.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dashboard/dashboard_builder.py b/dashboard/dashboard_builder.py index ba3827bf..7ca6143c 100644 --- a/dashboard/dashboard_builder.py +++ b/dashboard/dashboard_builder.py @@ -183,8 +183,14 @@ def get_package_details(self, p: package.Package): 'latest_version': '0.1.0', } """ + # The package being checked will appear in the dep list, but for + # apache-beam[gcp], the package in dep list will just be apache-beam. + self_dep_name = p.install_name + if '[' in p.install_name: + self_dep_name = p.install_name.split('[')[0] + latest_version = self._package_with_dependency_info[ - p.install_name][p.install_name]['latest_version'] + p.install_name][self_dep_name]['latest_version'] pairwise_conflict = [] # Initialize the values