diff --git a/dependencies_since_image.sh b/dependencies_common.sh old mode 100755 new mode 100644 similarity index 83% rename from dependencies_since_image.sh rename to dependencies_common.sh index 410d35b39e..74c9aea0a5 --- a/dependencies_since_image.sh +++ b/dependencies_common.sh @@ -2,8 +2,6 @@ set -e set -x -# Important: always use the python-X library if available, -# rather than doing "pip install X". sudo apt install -y \ python-frozendict \ @@ -25,8 +23,11 @@ pip install --upgrade --user \ conftools \ comptests \ procgraph \ - pymongo \ + pymongo==3.5.1 \ ruamel.yaml==0.15.34 + + + # None of this should be needed. Next time you think you need it, let me know and we figure it out. -AC # sudo pip install --upgrade pip setuptools wheel diff --git a/dependencies_for_duckiebot.sh b/dependencies_for_duckiebot.sh new file mode 100755 index 0000000000..59beea4794 --- /dev/null +++ b/dependencies_for_duckiebot.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e +set -x + +# Important: always use the python-X library if available, +# rather than doing "pip install X". + +./dependencies_common.sh diff --git a/dependencies_for_laptop.sh b/dependencies_for_laptop.sh index ac1f43b72f..ed71a35f39 100755 --- a/dependencies_for_laptop.sh +++ b/dependencies_for_laptop.sh @@ -2,27 +2,4 @@ set -e set -x -# Important: always use the python-X library if available, -# rather than doing "pip install X". - -sudo apt install -y \ - python-frozendict \ - libxslt-dev \ - libxml2-dev \ - python-lxml \ - python-bs4 \ - python-tables - -sudo apt remove -y \ - python-ruamel.yaml \ - python-ruamel.ordereddict - - -pip install --upgrade --user \ - PyContracts \ - QuickApp \ - conftools \ - comptests \ - procgraph \ - pymongo \ - ruamel.yaml==0.15.34 +./dependencies_common.sh