Hello Impala Public Jenkins,
I'd like you to reexamine a change. Please visit
http://gerrit.cloudera.org:8080/20171
to look at the new patch set (#2).
Change subject: PROTOTYPE: Change the shell tarball to be a pip install of
impala-shell package
......................................................................
PROTOTYPE: Change the shell tarball to be a pip install of impala-shell package
Currently, the shell tarball maintains its own packaging code
and directory layout. This is very complicated and currently has
several Python packages directly checked into our repository.
To simplify it, this changes the shell tarball to be based on
pip installing the pypi package. Specifically, the new directory
structure is:
impala-shell-4.3.0-SNAPSHOT/impala-shell
/py2_install
/py3_install
where py2_install is a Python 2 pip install of impala-shell and
py3_install is a Python 3 pip install of impala-shell. This means
that the impala-shell script simply picks the install for the
specified version of python and uses that pip install directory.
With this, ext-py and pkg_resources.py can be removed.
This requires splitting out the code that generates impala_build_version.py,
so that it can run before generating the pypi package.
TODO: Do we remove the references in .gitignore and rat_exclude_files.txt?
Change-Id: Ifbb66ab2c5bc7180221f98d9bf5e38d62f4ac036
---
M LICENSE.txt
M bin/impala-config.sh
M bin/impala-shell.sh
M shell/.gitignore
M shell/CMakeLists.txt
D shell/ext-py/bitarray-2.3.0/CHANGE_LOG
D shell/ext-py/bitarray-2.3.0/LICENSE
D shell/ext-py/bitarray-2.3.0/README.rst
D shell/ext-py/bitarray-2.3.0/bitarray/__init__.py
D shell/ext-py/bitarray-2.3.0/bitarray/__init__.pyi
D shell/ext-py/bitarray-2.3.0/bitarray/_bitarray.c
D shell/ext-py/bitarray-2.3.0/bitarray/_util.c
D shell/ext-py/bitarray-2.3.0/bitarray/architecture.txt
D shell/ext-py/bitarray-2.3.0/bitarray/bitarray.h
D shell/ext-py/bitarray-2.3.0/bitarray/copy_n.txt
D shell/ext-py/bitarray-2.3.0/bitarray/py.typed
D shell/ext-py/bitarray-2.3.0/bitarray/pythoncapi_compat.h
D shell/ext-py/bitarray-2.3.0/bitarray/test_bitarray.py
D shell/ext-py/bitarray-2.3.0/bitarray/test_data.pickle
D shell/ext-py/bitarray-2.3.0/bitarray/test_util.py
D shell/ext-py/bitarray-2.3.0/bitarray/util.py
D shell/ext-py/bitarray-2.3.0/bitarray/util.pyi
D shell/ext-py/bitarray-2.3.0/contributing.md
D shell/ext-py/bitarray-2.3.0/setup.py
D shell/ext-py/bitarray-2.3.0/update_doc.py
D shell/ext-py/kerberos-1.3.1/MANIFEST.in
D shell/ext-py/kerberos-1.3.1/PKG-INFO
D shell/ext-py/kerberos-1.3.1/README.md
D shell/ext-py/kerberos-1.3.1/pysrc/kerberos.py
D shell/ext-py/kerberos-1.3.1/setup.cfg
D shell/ext-py/kerberos-1.3.1/setup.py
D shell/ext-py/kerberos-1.3.1/src/base64.c
D shell/ext-py/kerberos-1.3.1/src/base64.h
D shell/ext-py/kerberos-1.3.1/src/kerberos.c
D shell/ext-py/kerberos-1.3.1/src/kerberosbasic.c
D shell/ext-py/kerberos-1.3.1/src/kerberosbasic.h
D shell/ext-py/kerberos-1.3.1/src/kerberosgss.c
D shell/ext-py/kerberos-1.3.1/src/kerberosgss.h
D shell/ext-py/kerberos-1.3.1/src/kerberospw.c
D shell/ext-py/kerberos-1.3.1/src/kerberospw.h
D shell/ext-py/prettytable-0.7.2/CHANGELOG
D shell/ext-py/prettytable-0.7.2/COPYING
D shell/ext-py/prettytable-0.7.2/MANIFEST.in
D shell/ext-py/prettytable-0.7.2/PKG-INFO
D shell/ext-py/prettytable-0.7.2/README
D shell/ext-py/prettytable-0.7.2/prettytable.py
D shell/ext-py/prettytable-0.7.2/setup.cfg
D shell/ext-py/prettytable-0.7.2/setup.py
D shell/ext-py/sasl-0.3.1/LICENSE.txt
D shell/ext-py/sasl-0.3.1/MANIFEST.in
D shell/ext-py/sasl-0.3.1/PKG-INFO
D shell/ext-py/sasl-0.3.1/sasl/__init__.py
D shell/ext-py/sasl-0.3.1/sasl/saslwrapper.cpp
D shell/ext-py/sasl-0.3.1/sasl/saslwrapper.h
D shell/ext-py/sasl-0.3.1/sasl/saslwrapper.pyx
D shell/ext-py/sasl-0.3.1/setup.cfg
D shell/ext-py/sasl-0.3.1/setup.py
D shell/ext-py/six-1.14.0/CHANGES
D shell/ext-py/six-1.14.0/CONTRIBUTORS
D shell/ext-py/six-1.14.0/LICENSE
D shell/ext-py/six-1.14.0/MANIFEST.in
D shell/ext-py/six-1.14.0/README.rst
D shell/ext-py/six-1.14.0/setup.cfg
D shell/ext-py/six-1.14.0/setup.py
D shell/ext-py/six-1.14.0/six.py
D shell/ext-py/six-1.14.0/test_six.py
D shell/ext-py/six-1.14.0/tox.ini
D shell/ext-py/sqlparse-0.3.1/AUTHORS
D shell/ext-py/sqlparse-0.3.1/CHANGELOG
D shell/ext-py/sqlparse-0.3.1/LICENSE
D shell/ext-py/sqlparse-0.3.1/MANIFEST.in
D shell/ext-py/sqlparse-0.3.1/README.rst
D shell/ext-py/sqlparse-0.3.1/TODO
D shell/ext-py/sqlparse-0.3.1/setup.cfg
D shell/ext-py/sqlparse-0.3.1/setup.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/__init__.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/__main__.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/cli.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/compat.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/engine/__init__.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/engine/filter_stack.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/engine/grouping.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/engine/statement_splitter.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/exceptions.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/__init__.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/aligned_indent.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/others.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/output.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/reindent.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/right_margin.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/filters/tokens.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/formatter.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/keywords.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/lexer.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/sql.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/tokens.py
D shell/ext-py/sqlparse-0.3.1/sqlparse/utils.py
D shell/ext-py/sqlparse-0.3.1/tests/__init__.py
D shell/ext-py/sqlparse-0.3.1/tests/conftest.py
D shell/ext-py/sqlparse-0.3.1/tests/files/_Make_DirEntry.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/begintag.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/begintag_2.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/dashcomment.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/encoding_gbk.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/encoding_utf8.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/function.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/function_psql.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/function_psql2.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/function_psql3.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/function_psql4.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/huge_select.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/stream.sql
D shell/ext-py/sqlparse-0.3.1/tests/files/test_cp1251.sql
D shell/ext-py/sqlparse-0.3.1/tests/test_cli.py
D shell/ext-py/sqlparse-0.3.1/tests/test_format.py
D shell/ext-py/sqlparse-0.3.1/tests/test_grouping.py
D shell/ext-py/sqlparse-0.3.1/tests/test_keywords.py
D shell/ext-py/sqlparse-0.3.1/tests/test_parse.py
D shell/ext-py/sqlparse-0.3.1/tests/test_regressions.py
D shell/ext-py/sqlparse-0.3.1/tests/test_split.py
D shell/ext-py/sqlparse-0.3.1/tests/test_tokenize.py
D shell/ext-py/sqlparse-0.3.1/tox.ini
D shell/ext-py/thrift-0.16.0/MANIFEST.in
D shell/ext-py/thrift-0.16.0/README.md
D shell/ext-py/thrift-0.16.0/setup.cfg
D shell/ext-py/thrift-0.16.0/setup.py
D shell/ext-py/thrift-0.16.0/src/TMultiplexedProcessor.py
D shell/ext-py/thrift-0.16.0/src/TRecursive.py
D shell/ext-py/thrift-0.16.0/src/TSCons.py
D shell/ext-py/thrift-0.16.0/src/TSerialization.py
D shell/ext-py/thrift-0.16.0/src/TTornado.py
D shell/ext-py/thrift-0.16.0/src/Thrift.py
D shell/ext-py/thrift-0.16.0/src/__init__.py
D shell/ext-py/thrift-0.16.0/src/compat.py
D shell/ext-py/thrift-0.16.0/src/ext/binary.cpp
D shell/ext-py/thrift-0.16.0/src/ext/binary.h
D shell/ext-py/thrift-0.16.0/src/ext/compact.cpp
D shell/ext-py/thrift-0.16.0/src/ext/compact.h
D shell/ext-py/thrift-0.16.0/src/ext/endian.h
D shell/ext-py/thrift-0.16.0/src/ext/module.cpp
D shell/ext-py/thrift-0.16.0/src/ext/protocol.h
D shell/ext-py/thrift-0.16.0/src/ext/protocol.tcc
D shell/ext-py/thrift-0.16.0/src/ext/types.cpp
D shell/ext-py/thrift-0.16.0/src/ext/types.h
D shell/ext-py/thrift-0.16.0/src/protocol/TBase.py
D shell/ext-py/thrift-0.16.0/src/protocol/TBinaryProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/TCompactProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/THeaderProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/TJSONProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/TMultiplexedProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/TProtocol.py
D shell/ext-py/thrift-0.16.0/src/protocol/TProtocolDecorator.py
D shell/ext-py/thrift-0.16.0/src/protocol/__init__.py
D shell/ext-py/thrift-0.16.0/src/server/THttpServer.py
D shell/ext-py/thrift-0.16.0/src/server/TNonblockingServer.py
D shell/ext-py/thrift-0.16.0/src/server/TProcessPoolServer.py
D shell/ext-py/thrift-0.16.0/src/server/TServer.py
D shell/ext-py/thrift-0.16.0/src/server/__init__.py
D shell/ext-py/thrift-0.16.0/src/transport/THeaderTransport.py
D shell/ext-py/thrift-0.16.0/src/transport/THttpClient.py
D shell/ext-py/thrift-0.16.0/src/transport/TSSLSocket.py
D shell/ext-py/thrift-0.16.0/src/transport/TSocket.py
D shell/ext-py/thrift-0.16.0/src/transport/TTransport.py
D shell/ext-py/thrift-0.16.0/src/transport/TTwisted.py
D shell/ext-py/thrift-0.16.0/src/transport/TZlibTransport.py
D shell/ext-py/thrift-0.16.0/src/transport/__init__.py
D shell/ext-py/thrift-0.16.0/src/transport/sslcompat.py
D shell/ext-py/thrift-0.16.0/test/test_socket.py
D shell/ext-py/thrift-0.16.0/test/test_sslsocket.py
D shell/ext-py/thrift_sasl-0.4.3/CHANGELOG.md
D shell/ext-py/thrift_sasl-0.4.3/LICENSE
D shell/ext-py/thrift_sasl-0.4.3/README.md
D shell/ext-py/thrift_sasl-0.4.3/setup.py
D shell/ext-py/thrift_sasl-0.4.3/thrift_sasl/__init__.py
A shell/gen_impala_build_version.sh
M shell/impala-shell
M shell/make_shell_tarball.sh
D shell/pkg_resources.py
178 files changed, 132 insertions(+), 49,378 deletions(-)
git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/71/20171/2
--
To view, visit http://gerrit.cloudera.org:8080/20171
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ifbb66ab2c5bc7180221f98d9bf5e38d62f4ac036
Gerrit-Change-Number: 20171
Gerrit-PatchSet: 2
Gerrit-Owner: Joe McDonnell <joemcdonn...@cloudera.com>
Gerrit-Reviewer: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
