You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2018/03/20 20:44:05 UTC

[07/21] impala git commit: IMPALA-6695: Fix PyPi regex, update setuptools version

IMPALA-6695: Fix PyPi regex, update setuptools version

pytest-runner, which is required by kudu-python requires are more recent
version of setuptools. Adding an explicit dependency required an update
to the regular expression to parse PyPi URLs.

Change-Id: Ia67189f81a31a9a5a0ed80cd4d6661762ef427b2
Reviewed-on: http://gerrit.cloudera.org:8080/9712
Tested-by: Lars Volker <lv...@cloudera.com>
Reviewed-by: Lars Volker <lv...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/c53acc89
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/c53acc89
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/c53acc89

Branch: refs/heads/2.x
Commit: c53acc890fe36fe511d1cd3b6fed3ca343e60ff2
Parents: 7fd27db
Author: Lars Volker <lv...@cloudera.com>
Authored: Sun Mar 18 00:05:42 2018 -0700
Committer: Lars Volker <lv...@cloudera.com>
Committed: Sun Mar 18 17:43:11 2018 +0000

----------------------------------------------------------------------
 infra/python/deps/pip_download.py  | 2 +-
 infra/python/deps/requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/impala/blob/c53acc89/infra/python/deps/pip_download.py
----------------------------------------------------------------------
diff --git a/infra/python/deps/pip_download.py b/infra/python/deps/pip_download.py
index 65f55be..2e84426 100755
--- a/infra/python/deps/pip_download.py
+++ b/infra/python/deps/pip_download.py
@@ -87,7 +87,7 @@ def get_package_info(pkg_name, pkg_version):
   # downloading an extra package before running this script. Since the HTML is guaranteed
   # to be formatted according to PEP 503, this is acceptable.
   pkg_info = urlopen(url).read()
-  regex = r'<a href=\".*?packages/(.*?)#(.*?)=(.*?)\".*?>(.*?)<\/a>'
+  regex = r'<a .*?href=\".*?packages/(.*?)#(.*?)=(.*?)\".*?>(.*?)<\/a>'
   for match in re.finditer(regex, pkg_info):
     path = match.group(1)
     hash_algorithm = match.group(2)

http://git-wip-us.apache.org/repos/asf/impala/blob/c53acc89/infra/python/deps/requirements.txt
----------------------------------------------------------------------
diff --git a/infra/python/deps/requirements.txt b/infra/python/deps/requirements.txt
index 4c65d5a..29cc9ce 100644
--- a/infra/python/deps/requirements.txt
+++ b/infra/python/deps/requirements.txt
@@ -55,6 +55,7 @@ python-magic == 0.4.11
 pywebhdfs == 0.3.2
   pbr == 1.8.1
 requests == 2.7.0
+setuptools == 39.0.0
 setuptools-scm == 1.15.4
 sh == 1.11
 sqlparse == 0.1.15