Преглед изворни кода

[multi-python] Reset virtualenv VIRTUAL_ENV_VERSION version to the original version.

Change-Id: Ia3f318a6302fb808e3d8925a122150f04510cafa
(cherry picked from commit 33fd8930ff28786f8812d1729e8b82d37fb17eb9)
(cherry picked from commit 5e540eaf3a6828be039e7ca6361ca982fa7a2a68)
agl29 пре 7 месеци
родитељ
комит
99266a4799
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 2 2
      Makefile.vars
  2. 3 3
      tools/cloudera/build_hue_common.sh

+ 2 - 2
Makefile.vars

@@ -166,7 +166,7 @@ VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
 ##############################
 ##############################
 ifeq ($(PYTHON_VER),python3.8)
 ifeq ($(PYTHON_VER),python3.8)
   PIP_VERSION := 22.2.2
   PIP_VERSION := 22.2.2
-  VIRTUAL_ENV_VERSION := 20.19.0
+  VIRTUAL_ENV_VERSION := 20.24.4
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
   REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le.txt
   REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le.txt
 else ifeq ($(PYTHON_VER),python3.9)
 else ifeq ($(PYTHON_VER),python3.9)
@@ -180,7 +180,7 @@ else ifeq ($(PYTHON_VER),python3.10)
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
 else ifeq ($(PYTHON_VER),python3.11)
 else ifeq ($(PYTHON_VER),python3.11)
   PIP_VERSION := 22.2.2
   PIP_VERSION := 22.2.2
-  VIRTUAL_ENV_VERSION := 20.30.0
+  VIRTUAL_ENV_VERSION := 20.24.4
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
 endif
 endif
 
 

+ 3 - 3
tools/cloudera/build_hue_common.sh

@@ -129,7 +129,7 @@ function install_python311() {
 
 
   export PYTHON311_PATH="${INSTALL_PREFIX}"
   export PYTHON311_PATH="${INSTALL_PREFIX}"
   export pip_bin=${PYTHON311_PATH}/bin/pip3.11
   export pip_bin=${PYTHON311_PATH}/bin/pip3.11
-  export VIRTUAL_ENV_VERSION="20.30.0"
+  export VIRTUAL_ENV_VERSION="20.24.4"
   # Pip modules install
   # Pip modules install
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'
@@ -174,7 +174,7 @@ function install_python39() {
 
 
   export PYTHON39_PATH="${INSTALL_PREFIX}"
   export PYTHON39_PATH="${INSTALL_PREFIX}"
   export pip_bin=${PYTHON39_PATH}/bin/pip3.9
   export pip_bin=${PYTHON39_PATH}/bin/pip3.9
-  export VIRTUAL_ENV_VERSION="20.30.0"
+  export VIRTUAL_ENV_VERSION="20.19.0"
   # Pip modules install
   # Pip modules install
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'
@@ -213,7 +213,7 @@ function install_python38() {
 
 
   export PYTHON38_PATH="${INSTALL_PREFIX}"
   export PYTHON38_PATH="${INSTALL_PREFIX}"
   export pip_bin=${PYTHON38_PATH}/bin/pip3.8
   export pip_bin=${PYTHON38_PATH}/bin/pip3.8
-  export VIRTUAL_ENV_VERSION="20.19.0"
+  export VIRTUAL_ENV_VERSION="20.24.4"
   # Pip modules install
   # Pip modules install
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install virtualenv=='${VIRTUAL_ENV_VERSION}' virtualenv-make-relocatable==0.0.1 mysqlclient==2.1.1'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'
   sudo pip_bin=${pip_bin} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -- sh -c '${pip_bin} install psycopg2==2.9.6 --global-option=build_ext --global-option="--pg-config=$PG_CONFIG"'