diff --git a/aztk/node_scripts/setup_host.sh b/aztk/node_scripts/setup_host.sh index 1390b1ba..acc5c06d 100644 --- a/aztk/node_scripts/setup_host.sh +++ b/aztk/node_scripts/setup_host.sh @@ -62,7 +62,6 @@ pull_docker_container () { docker login $DOCKER_ENDPOINT --username $DOCKER_USERNAME --password $DOCKER_PASSWORD fi - for i in {1..5}; do docker pull $docker_repo_name && break || echo "ERROR: docker pull $docker_repo_name failed ... retrying after $($i**2) seconds" && @@ -106,20 +105,14 @@ run_docker_container () { ln -s $docker_log $AZ_BATCH_TASK_WORKING_DIR/logs/docker.log fi echo "Finished running docker container" - } - - - main () { - time( install_prerequisites ) 2>&1 - # set hostname in /etc/hosts if dns cannot resolve if ! host $HOSTNAME ; then echo $(hostname -I | awk '{print $1}') $HOSTNAME >> /etc/hosts @@ -149,7 +142,11 @@ main () { # set up aztk python environment export LC_ALL=C.UTF-8 export LANG=C.UTF-8 - # ensure these packages are compatibile before upgrading + # pin pipenv dependencies (and transitive dependencies) since pipenv does not + python3 -m pip install setuptools=="42.0.2" + python3 -m pip install zipp=="1.1.0" + python3 -m pip install virtualenv=="20.0.0" + # ensure these packages (pip, pipenv) are compatibile before upgrading python3 -m pip install pip=="18.0" pipenv=="2018.7.1" mkdir -p $AZTK_WORKING_DIR/.aztk-env cp $AZTK_WORKING_DIR/aztk/node_scripts/Pipfile $AZTK_WORKING_DIR/.aztk-env diff --git a/requirements.txt b/requirements.txt index e974ee01..3c0a7cde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ paramiko~=2.4.2 # Development yapf==0.22.0 pylint==2.1.1 -pytest==3.1.3 +pytest==5.3.5 pytest-xdist==1.22.0 twine==1.11.0 docker==3.2.1