From 1335e09866729c664b801e1084057bda8bff606e Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Tue, 12 Nov 2024 14:50:56 -0800 Subject: [PATCH 1/3] Update install_requirements.sh to support python 3.10 >= , <3.13 --- install/install_requirements.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 2b623e831..4f0bf18e5 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -19,14 +19,14 @@ fi echo "Using python executable: $PYTHON_EXECUTABLE" PYTHON_SYS_VERSION="$($PYTHON_EXECUTABLE -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" -# Check python version. Expect 3.10.x or 3.11.x +# Check python version. Expect 3.10.x to 3.12.x. Note 3.13 may work, but no guarantees if ! $PYTHON_EXECUTABLE -c " import sys -if sys.version_info < (3, 10) or sys.version_info >= (3, 12): +if sys.version_info < (3, 10) or sys.version_info >= (3, 13): sys.exit(1) "; then - echo "Python version must be 3.10.x or 3.11.x. Detected version: $PYTHON_SYS_VERSION" + echo "Python version must be between 3.10.x and 3.12.x. Detected version: $PYTHON_SYS_VERSION" exit 1 fi From 803c41e233b749fff9380fbc22c72d88ed06f242 Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Tue, 12 Nov 2024 19:06:58 -0800 Subject: [PATCH 2/3] Update install_requirements.sh --- install/install_requirements.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 4f0bf18e5..6c5068b5d 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -14,19 +14,21 @@ then if [[ -z ${CONDA_DEFAULT_ENV:-} ]] || [[ ${CONDA_DEFAULT_ENV:-} == "base" ]] || [[ ! -x "$(command -v python)" ]]; then PYTHON_EXECUTABLE=python3 + else + PYTHON_EXECUTABLE=python fi fi echo "Using python executable: $PYTHON_EXECUTABLE" PYTHON_SYS_VERSION="$($PYTHON_EXECUTABLE -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" -# Check python version. Expect 3.10.x to 3.12.x. Note 3.13 may work, but no guarantees +# Check python version. Expect greater than 3.10.x if ! $PYTHON_EXECUTABLE -c " import sys -if sys.version_info < (3, 10) or sys.version_info >= (3, 13): +if sys.version_info < (3, 10): sys.exit(1) "; then - echo "Python version must be between 3.10.x and 3.12.x. Detected version: $PYTHON_SYS_VERSION" + echo "Python version must be greater than 3.10.x. Detected version: $PYTHON_SYS_VERSION" exit 1 fi From a2917eac05d1d028825f97cb39885b6a824b741b Mon Sep 17 00:00:00 2001 From: Jack-Khuu Date: Wed, 13 Nov 2024 11:16:40 -0800 Subject: [PATCH 3/3] Update install_requirements.sh --- install/install_requirements.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_requirements.sh b/install/install_requirements.sh index 6c5068b5d..635789de6 100755 --- a/install/install_requirements.sh +++ b/install/install_requirements.sh @@ -21,14 +21,14 @@ fi echo "Using python executable: $PYTHON_EXECUTABLE" PYTHON_SYS_VERSION="$($PYTHON_EXECUTABLE -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" -# Check python version. Expect greater than 3.10.x +# Check python version. Expect at least 3.10.x if ! $PYTHON_EXECUTABLE -c " import sys if sys.version_info < (3, 10): sys.exit(1) "; then - echo "Python version must be greater than 3.10.x. Detected version: $PYTHON_SYS_VERSION" + echo "Python version must be at least 3.10.x. Detected version: $PYTHON_SYS_VERSION" exit 1 fi