[impala] branch master updated: IMPALA-12434: Isolate pkg_resources.py to its own directory

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a1a84ee2 IMPALA-12434: Isolate pkg_resources.py to its own directory
1a1a84ee2 is described below

commit 1a1a84ee23b85e3dc097c7e64d86418c7f289c90
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Fri Sep 8 09:40:51 2023 -0700

    IMPALA-12434: Isolate pkg_resources.py to its own directory
    
    In some build environments, the impala-shell Python 3
    virtualenv install fails due to interactions with
    shell/pkg_resources.py. This doesn't reproduce in the standard
    development environment, but it is consistent. It seems to
    be related to invoking a command in ${IMPALA_HOME}/shell
    and the pkg_resources.py being in that directory.
    
    To avoid any interactions, this moves shell/pkg_resources.py
    to shell/legacy/pkg_resources.py. This keeps it off of the
    path for the failing command, and it also keeps it off of
    our PYTHONPATH (which includes ${IMPALA_HOME}/shell).
    
    Testing:
     - Ran a build in the affected build environment
     - Ran a core job
    
    Change-Id: Id8f2d8a8472c7bb405bf88673ed9779e23cde1d6
    Reviewed-on: http://gerrit.cloudera.org:8080/20468
    Reviewed-by: Michael Smith <mi...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/check-python-syntax.sh          | 2 +-
 bin/rat_exclude_files.txt           | 2 +-
 shell/{ => legacy}/pkg_resources.py | 0
 shell/make_shell_tarball.sh         | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/check-python-syntax.sh b/bin/check-python-syntax.sh
index 952360b5a..5576297ff 100755
--- a/bin/check-python-syntax.sh
+++ b/bin/check-python-syntax.sh
@@ -28,7 +28,7 @@ for file in $(git ls-files '**/*.py'); do
         continue
     fi
     # Skip the shell's pkg_resources.py
-    if [[ "${file}" == "shell/pkg_resources.py" ]]; then
+    if [[ "${file}" == "shell/legacy/pkg_resources.py" ]]; then
         continue
     fi
 
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index 13edc28e0..a936c650d 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -225,7 +225,7 @@ cmake_modules/FindJNI.cmake
 
 # http://www.apache.org/legal/resolved.html#category-a : Python Software Foundation
 # License is allowed.
-shell/pkg_resources.py
+shell/legacy/pkg_resources.py
 
 # Notices in Impala as required by ASF rules:
 DISCLAIMER
diff --git a/shell/pkg_resources.py b/shell/legacy/pkg_resources.py
similarity index 100%
rename from shell/pkg_resources.py
rename to shell/legacy/pkg_resources.py
diff --git a/shell/make_shell_tarball.sh b/shell/make_shell_tarball.sh
index 8e0658f41..20704e86a 100755
--- a/shell/make_shell_tarball.sh
+++ b/shell/make_shell_tarball.sh
@@ -186,7 +186,7 @@ cp ${SHELL_HOME}/impala_shell.py ${TARBALL_ROOT}
 cp ${SHELL_HOME}/compatibility.py ${TARBALL_ROOT}
 cp ${SHELL_HOME}/thrift_printer.py ${TARBALL_ROOT}
 
-cp ${SHELL_HOME}/pkg_resources.py ${TARBALL_ROOT}/legacy
+cp ${SHELL_HOME}/legacy/pkg_resources.py ${TARBALL_ROOT}/legacy
 
 pushd ${BUILD_DIR} > /dev/null
 echo "Making tarball in ${BUILD_DIR}"