From edb14ec347ddf9b04f0c35a5fcf1fd3d1163f789 Mon Sep 17 00:00:00 2001 From: Catherine Garabedian Date: Tue, 29 Jan 2019 14:03:14 -0600 Subject: [PATCH 1/2] Adding python dependencies for Python3.5 --- base/script/privileged-provision.sh | 5 ++++- kubos-dev/script/privileged-provision.sh | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/base/script/privileged-provision.sh b/base/script/privileged-provision.sh index 489a967..a1980b1 100644 --- a/base/script/privileged-provision.sh +++ b/base/script/privileged-provision.sh @@ -8,7 +8,7 @@ add-apt-repository -y ppa:team-gcc-arm-embedded/ppa add-apt-repository -y ppa:george-edison55/cmake-3.x apt-get update -apt-get upgrade -y python2.7 ncurses-dev bc +apt-get upgrade -y python2.7 python3.5 ncurses-dev bc apt-get install -y build-essential libssl-dev libffi-dev libhidapi-hidraw0 gdb apt-get install -y python-setuptools build-essential ninja-build python-dev libffi-dev libssl-dev apt-get install -y gcc-arm-embedded @@ -36,6 +36,9 @@ easy_install pip # Forcibly controlling version until this is resolved pip install pip==9.0.3 +# Set up pip for Python3.5 +apt-get install -y python3-pip + #sqlite apt-get install -y sqlite3 libsqlite3-dev diff --git a/kubos-dev/script/privileged-provision.sh b/kubos-dev/script/privileged-provision.sh index 8905a43..27cbc83 100644 --- a/kubos-dev/script/privileged-provision.sh +++ b/kubos-dev/script/privileged-provision.sh @@ -5,6 +5,10 @@ pip install idna==2.6 pip install toml pip install graphene +python3 -m pip install graphene +python3 -m pip install mock +python3 -m pip install toml + mkdir -p /usr/local/lib/yotta_modules mkdir -p /usr/local/lib/yotta_targets mkdir -p /home/vagrant/.kubos From 1c51317ffbb6eb87a3d018679e2625b1b3454659 Mon Sep 17 00:00:00 2001 From: Catherine Garabedian Date: Tue, 29 Jan 2019 14:14:04 -0600 Subject: [PATCH 2/2] Adding Python HTTP dependencies --- kubos-dev/script/non-privileged-provision.sh | 4 ++-- kubos-dev/script/privileged-provision.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kubos-dev/script/non-privileged-provision.sh b/kubos-dev/script/non-privileged-provision.sh index f9b8591..15e921d 100644 --- a/kubos-dev/script/non-privileged-provision.sh +++ b/kubos-dev/script/non-privileged-provision.sh @@ -22,10 +22,10 @@ mv /home/vagrant/cargo_config /home/vagrant/.cargo/config /home/vagrant/.cargo/bin/cargo install --path /home/vagrant/.kubos/kubos/clients/uart-comms-client/ # Install app-api python module -cd /home/vagrant/.kubos/kubos/apis/app-api/python && pip install . +cd /home/vagrant/.kubos/kubos/apis/app-api/python && python3 -m pip install . # Install kubos-service python module -cd /home/vagrant/.kubos/kubos/libs/kubos-service && pip install . +cd /home/vagrant/.kubos/kubos/libs/kubos-service && python3 -m pip install . kubos update --tab-completion diff --git a/kubos-dev/script/privileged-provision.sh b/kubos-dev/script/privileged-provision.sh index 27cbc83..7ef22d6 100644 --- a/kubos-dev/script/privileged-provision.sh +++ b/kubos-dev/script/privileged-provision.sh @@ -5,6 +5,8 @@ pip install idna==2.6 pip install toml pip install graphene +python3 -m pip install flask +python3 -m pip install flask_graphql python3 -m pip install graphene python3 -m pip install mock python3 -m pip install toml