From f531660cddf114c7408a5dfbced7b27b3e05df12 Mon Sep 17 00:00:00 2001 From: gilkal Date: Wed, 7 Dec 2022 17:03:41 +0000 Subject: [PATCH] Update/dependencies (#1987) * Update depednencies * Update typing extensions depedency * Change typing-extensinos back * Update the Couchbase library vsion * Add support for Python3.8 * Change the Shabang * Set the Shabang back * An attempt to run .bashrc, for debugging purpose * Revert the .bashrc call * Rever the troposphere version change Co-authored-by: Gilad Kalchheim --- requirements.txt | 12 +++++------- setup.sh | 15 ++++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8008f7b36f..860d4e8715 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,11 +7,11 @@ backports.functools-lru-cache==1.3 backports.ssl-match-hostname==3.5.0.1 boto3==1.3 botocore==1.4.5 -cffi==1.10.0 +cffi==1.15.1 colorama==0.3.3 configparser==3.5.0 couchbase==3.2.7 -cryptography==2.8 +cryptography==37.0.4 docker==2.2.1 docker-pycreds==0.2.1 docutils==0.12 @@ -22,7 +22,6 @@ futures==3.1.1 idna==2.5 ipaddress==1.0.18 isort==4.2.5 -itsdangerous==2.0.1 Jinja2==2.10.1 jmespath==0.9.0 lazy-object-proxy==1.2.2 @@ -31,8 +30,8 @@ mccabe==0.6.1 netifaces==0.10.4 olefile==0.44 packaging==16.8 -paramiko==2.1.5 -Pillow==6.2.0 +paramiko==2.5.0 +Pillow==9.2.0 py==1.5.1 pyasn1==0.2.3 pycodestyle==2.3.1 @@ -60,8 +59,7 @@ troposphere==4.0.2 websocket-client==0.40.0 wrapt==1.12.1 xmltodict==0.10.2 -numpy==1.17.4 +numpy==1.21.6 pytest-rerunfailures==8.0 flask==1.1.2 typing-extensions==3.7.4.3 -werkzeug==2.0.3 diff --git a/setup.sh b/setup.sh index 50be59811c..baa76105d0 100644 --- a/setup.sh +++ b/setup.sh @@ -4,25 +4,26 @@ # 2. Installs venv/ in this directory containing a python 2.7 interpreter # 3. Installs all pip packages required by this repo # 4. Adds custom library paths to your PYTHONPATH - + # py37version=$(python3.7 -c 'import sys; print("{}.{}.{}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro))') py3version=$(python3 -c 'import sys; print("{}.{}.{}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro))') py2version=$(python -c 'import sys; print("{}.{}.{}".format(sys.version_info.major, sys.version_info.minor, sys.version_info.micro))') -if [[ $py3version == 3.7.* ]]; then - printf "Using Python3 version: %s\n" $py37version + +if [[ $py3version == 3.8.* ]]; then + printf "Using Python3 version: %s\n" $py3version PYTHON=python3 - PIP=pip3 -elif [[ $py3version == 3.6.* ]]; then + PIP=pip3.8 +elif [[ $py3version == 3.7.* ]]; then printf "Using Python3 version: %s\n" $py3version PYTHON=python3 - PIP=pip3.6 + PIP=pip3.7 elif [[ $py2version == 2.7.* ]]; then printf "Using Python2 version: %s\n" $py2version PYTHON=python PIP=pip else - echo "Exiting. Make sure Python version is 3.7 or 2.7." + echo "Exiting. Make sure Python version is 3.8 or 2.7." return 1 fi