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 2017/04/19 22:49:12 UTC
[1/2] incubator-impala git commit: IMPALA-5189: Pin version of
setuptools-scm
Repository: incubator-impala
Updated Branches:
refs/heads/master 9a29dfc91 -> 297e23ba9
IMPALA-5189: Pin version of setuptools-scm
A new upstream release of setuptools-scm (1.15.3) broke setting up the
python environment. A subsequently released version fixed the breakage.
Nonetheless pinning external dependencies seems like a good idea, so
this change pins the version of setuptools-scm to the new version
(1.15.4) to protect us from similar issues in the future.
I tested this by running the following command in a new virtualenv and
checking in the output that it installed the correct version of
setuptools-scm (1.15.4).
pip install --no-binary --no-index --no-cache-dir --find-links
infra/python/deps/ -r infra/python/deps/requirements.txt
Change-Id: I398972d2cdf3acc9d5d8c598fc5b964b7241f1d2
Reviewed-on: http://gerrit.cloudera.org:8080/6599
Reviewed-by: Lars Volker <lv...@cloudera.com>
Reviewed-by: Tim Armstrong <ta...@cloudera.com>
Tested-by: Impala Public Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/841fe7f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/841fe7f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/841fe7f6
Branch: refs/heads/master
Commit: 841fe7f621be0c8af4fceeb8eec6a95426320bcd
Parents: 9a29dfc
Author: Lars Volker <lv...@cloudera.com>
Authored: Sat Apr 8 14:07:59 2017 +0200
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Wed Apr 19 22:03:51 2017 +0000
----------------------------------------------------------------------
infra/python/deps/requirements.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/841fe7f6/infra/python/deps/requirements.txt
----------------------------------------------------------------------
diff --git a/infra/python/deps/requirements.txt b/infra/python/deps/requirements.txt
index 7d9d484..1c265c4 100644
--- a/infra/python/deps/requirements.txt
+++ b/infra/python/deps/requirements.txt
@@ -57,6 +57,7 @@ python-magic == 0.4.11
pywebhdfs == 0.3.2
pbr == 1.8.1
requests == 2.7.0
+setuptools-scm == 1.15.4
sh == 1.11
sqlparse == 0.1.15
texttable == 0.8.3
[2/2] incubator-impala git commit: IMPALA-5172: Always pass DEBUG
build type to Impala-Lzo
Posted by ta...@apache.org.
IMPALA-5172: Always pass DEBUG build type to Impala-Lzo
This changes CMakeLists.txt to pass the DEBUG build type
to LZO. This effectively reverts commit
2598e3b26449a03011ab419a4cc1171cee249427.
Change-Id: I15f0b383ef29d8eecccb69e9adde76386c7cdac6
Reviewed-on: http://gerrit.cloudera.org:8080/6686
Reviewed-by: Alex Behm <al...@cloudera.com>
Reviewed-by: Dan Hecht <dh...@cloudera.com>
Tested-by: Impala Public Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/297e23ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/297e23ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/297e23ba
Branch: refs/heads/master
Commit: 297e23ba993d9db22287d2ac54bacdff52d5461a
Parents: 841fe7f
Author: Alex Behm <al...@cloudera.com>
Authored: Wed Apr 19 10:21:05 2017 -0700
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Wed Apr 19 22:11:14 2017 +0000
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/297e23ba/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e568aa..3fa8456 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -387,7 +387,7 @@ add_custom_target(cscope ALL
if (DEFINED ENV{IMPALA_LZO} AND EXISTS $ENV{IMPALA_LZO})
add_custom_target(impala-lzo ALL DEPENDS thrift-deps
- COMMAND $ENV{IMPALA_LZO}/build.sh ${CMAKE_BUILD_TYPE} ${CMAKE_SOURCE_DIR}
+ COMMAND $ENV{IMPALA_LZO}/build.sh DEBUG ${CMAKE_SOURCE_DIR}
$ENV{IMPALA_TOOLCHAIN}
)
endif()