From fddcb19a4fe172030efd8d5855c72798fe9faccf Mon Sep 17 00:00:00 2001 From: Jiten Thakkar Date: Mon, 1 Nov 2021 19:57:22 -0700 Subject: [PATCH] Install Pyparsing-2.0.2 Before Build And Bundle (#42) * Pass Env Variable to All Build And Bundle Commands * Update PYTHONPATH Env variable * Fix Env Variable * Pass env Variable to setup command * Pass Exec Options to Setup * Install pyparsing to default path --- .../src/aws-robomaker-sample-application-ci.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/robomaker-sample-app-ci/src/aws-robomaker-sample-application-ci.ts b/robomaker-sample-app-ci/src/aws-robomaker-sample-application-ci.ts index 56f1631..435221d 100644 --- a/robomaker-sample-app-ci/src/aws-robomaker-sample-application-ci.ts +++ b/robomaker-sample-app-ci/src/aws-robomaker-sample-application-ci.ts @@ -93,7 +93,7 @@ async function fetchRosinstallDependencies() { await exec.exec("bash", ["-c", `ln -snf /usr/share/zoneinfo/${timezone} /etc/localtime`]); await exec.exec("bash" , ["-c", `echo ${timezone} > /etc/timezone`]); } - await exec.exec("bash", ["-c", `scripts/setup.sh --install-ros ${ROS_DISTRO}`]); + await exec.exec("bash", ["-c", `scripts/setup.sh --install-ros ${ROS_DISTRO}`], getWorkingDirParentExecOptions()); await loadROSEnvVariables(); await exec.exec("apt-get", ["update"]); //zip required for prepare_sources step. @@ -133,8 +133,9 @@ async function bundle() { } async function installPyparsing() { - //install pyparsing-2.0.2 to a local directory so that it can be added to PYTHONPATH env variable - await exec.exec("bash", ["-c", `pip3 install --install-option="--prefix=/home/pypackages" pyparsing==2.0.2`], getWorkingDirExecOptions()); + // install pyparsing-2.0.2 since pyparsing-3.0 is no supported by python pyconfig + // https://github.com/pypa/packaging/commit/20cd09e00917adbc4afeaa753be831a6bc2740f7 + await exec.exec("bash", ["-c", `pip3 install pyparsing==2.0.2`], getWorkingDirExecOptions()); } async function run() {