From 0c6168dadc861a35b3b8dd83944b260c26d234f8 Mon Sep 17 00:00:00 2001 From: Angela Li Date: Mon, 25 Feb 2019 14:48:47 -0800 Subject: [PATCH 1/3] Remove google-cloud-ndb from whitelist --- compatibility_lib/compatibility_lib/compatibility_store.py | 3 ++- compatibility_lib/compatibility_lib/configs.py | 2 -- compatibility_server/configs.py | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/compatibility_lib/compatibility_lib/compatibility_store.py b/compatibility_lib/compatibility_lib/compatibility_store.py index c94f1afc..37069193 100644 --- a/compatibility_lib/compatibility_lib/compatibility_store.py +++ b/compatibility_lib/compatibility_lib/compatibility_store.py @@ -168,7 +168,7 @@ def connect(self): port=self.mysql_port, user=self.mysql_user, password=self.mysql_password, - db=_DATABASE_NAME, + db=self.mysql_db, charset='utf8mb4') return conn @@ -472,6 +472,7 @@ def _get_package_version(self, result: CompatibilityResult) -> str: if 'github.com' in install_name: install_name = configs.WHITELIST_URLS[install_name] install_name_sanitized = install_name.split('[')[0] + print(install_name_sanitized) for pkg, version_info in result.dependency_info.items(): if pkg == install_name_sanitized: diff --git a/compatibility_lib/compatibility_lib/configs.py b/compatibility_lib/compatibility_lib/configs.py index 2e832bd4..0c6d3668 100644 --- a/compatibility_lib/compatibility_lib/configs.py +++ b/compatibility_lib/compatibility_lib/configs.py @@ -102,8 +102,6 @@ def _format_url(repo_name, setuppy_path=''): 'google-cloud-iot', _format_url('googleapis/google-cloud-python', 'kms'): 'google-cloud-kms', - _format_url('googleapis/google-cloud-python', 'ndb'): - 'google-cloud-ndb', # This is not released yet _format_url('googleapis/google-cloud-python', 'oslogin'): 'google-cloud-os-login', diff --git a/compatibility_server/configs.py b/compatibility_server/configs.py index 2e832bd4..0c6d3668 100644 --- a/compatibility_server/configs.py +++ b/compatibility_server/configs.py @@ -102,8 +102,6 @@ def _format_url(repo_name, setuppy_path=''): 'google-cloud-iot', _format_url('googleapis/google-cloud-python', 'kms'): 'google-cloud-kms', - _format_url('googleapis/google-cloud-python', 'ndb'): - 'google-cloud-ndb', # This is not released yet _format_url('googleapis/google-cloud-python', 'oslogin'): 'google-cloud-os-login', From c25229228cf3b57bdf2a703fcf3b1dcd72ff5dd7 Mon Sep 17 00:00:00 2001 From: Angela Li Date: Mon, 25 Feb 2019 14:51:19 -0800 Subject: [PATCH 2/3] fix --- compatibility_lib/compatibility_lib/compatibility_store.py | 1 - 1 file changed, 1 deletion(-) diff --git a/compatibility_lib/compatibility_lib/compatibility_store.py b/compatibility_lib/compatibility_lib/compatibility_store.py index 37069193..27a7a861 100644 --- a/compatibility_lib/compatibility_lib/compatibility_store.py +++ b/compatibility_lib/compatibility_lib/compatibility_store.py @@ -472,7 +472,6 @@ def _get_package_version(self, result: CompatibilityResult) -> str: if 'github.com' in install_name: install_name = configs.WHITELIST_URLS[install_name] install_name_sanitized = install_name.split('[')[0] - print(install_name_sanitized) for pkg, version_info in result.dependency_info.items(): if pkg == install_name_sanitized: From 7567a252afc9260895aa3af886bff4df14b3f099 Mon Sep 17 00:00:00 2001 From: Angela Li Date: Mon, 25 Feb 2019 15:01:35 -0800 Subject: [PATCH 3/3] fix --- compatibility_lib/compatibility_lib/configs.py | 2 ++ compatibility_server/configs.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/compatibility_lib/compatibility_lib/configs.py b/compatibility_lib/compatibility_lib/configs.py index 0c6d3668..ea185bff 100644 --- a/compatibility_lib/compatibility_lib/configs.py +++ b/compatibility_lib/compatibility_lib/configs.py @@ -102,6 +102,8 @@ def _format_url(repo_name, setuppy_path=''): 'google-cloud-iot', _format_url('googleapis/google-cloud-python', 'kms'): 'google-cloud-kms', + _format_url('googleapis/python-ndb', ''): + 'google-cloud-ndb', # This is not released yet _format_url('googleapis/google-cloud-python', 'oslogin'): 'google-cloud-os-login', diff --git a/compatibility_server/configs.py b/compatibility_server/configs.py index 0c6d3668..ea185bff 100644 --- a/compatibility_server/configs.py +++ b/compatibility_server/configs.py @@ -102,6 +102,8 @@ def _format_url(repo_name, setuppy_path=''): 'google-cloud-iot', _format_url('googleapis/google-cloud-python', 'kms'): 'google-cloud-kms', + _format_url('googleapis/python-ndb', ''): + 'google-cloud-ndb', # This is not released yet _format_url('googleapis/google-cloud-python', 'oslogin'): 'google-cloud-os-login',