Skip to content

Commit b55b660

Browse files
committed
tooling: Group pip runtime dependencies
1 parent b9b673c commit b55b660

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

oasis_control/oasis_control/lego_models/falcon_manager.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131

3232
THRUST_LED_PIN: int = 3 # D3
3333

34+
#
35+
# LED noodle: 5V source, 22.1 Ohm resistor
36+
#
37+
# Thrust LED ping to 540 Ohm resistor, to base of BC337 NPN transistor. Emitter
38+
# goes to ground, collector to the LED noodle.
39+
#
3440

3541
################################################################################
3642
# ROS parameters

oasis_tooling/scripts/rdepinstall_oasis.sh

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,36 @@ fi
7878

7979
sudo apt install -y --no-install-recommends "${APT_PACKAGES[@]}"
8080

81-
sudo python3 -m pip install \
82-
--upgrade \
83-
--ignore-installed \
84-
--break-system-packages \
85-
mediapipe==0.10.21 \
81+
# Packages to install via pip
82+
PYTHON_PACKAGES=(
83+
pip \
8684
psutil \
8785
git+https://github.com/eigendude/pymata-express@master#egg=pymata-express \
8886
pyserial \
87+
setuptools \
8988
telemetrix-aio \
89+
tox \
90+
)
91+
92+
# If running on ARM, the latest MediaPipe is v0.10.18
93+
if [[ ${PLATFORM_ARCH} == arm* ]] || [[ ${PLATFORM_ARCH} == aarch64 ]]; then
94+
PYTHON_PACKAGES+=(
95+
mediapipe==0.10.18
96+
)
97+
else
98+
PYTHON_PACKAGES+=(
99+
mediapipe==0.10.21
100+
)
101+
fi
90102

91103
# Install Matplotlib from pip to ensure Mediapipe's 3-D tooling has the newer
92104
# wheel even when an older apt package is already present on the system.
105+
PYTHON_PACKAGES+=(
106+
matplotlib
107+
)
108+
93109
sudo python3 -m pip install \
94110
--upgrade \
95111
--ignore-installed \
96112
--break-system-packages \
97-
matplotlib
113+
"${PYTHON_PACKAGES[@]}"

0 commit comments

Comments
 (0)