diff --git a/base_requirements.txt b/base_requirements.txt index ab33b1c06..0438d8025 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -102,7 +102,3 @@ redis # SVG image rendering (used for rack elevations) # https://github.com/mozman/svgwrite svgwrite - -# Python package management tool -# https://pythonwheels.com/ -wheel diff --git a/requirements.txt b/requirements.txt index d8e704874..758d2d98b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,4 +24,3 @@ pycryptodome==3.9.4 PyYAML==5.3 redis==3.3.11 svgwrite==1.3.1 -wheel==0.34.2 diff --git a/upgrade.sh b/upgrade.sh index bd1a06f67..fe1df715b 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -29,9 +29,14 @@ eval $COMMAND || { # Activate the virtual environment source "${VIRTUALENV}/bin/activate" +# Install necessary system packages +COMMAND="pip3 install wheel" +echo "Installing Python system packages ($COMMAND)..." +eval $COMMAND || exit 1 + # Install Python packages COMMAND="pip3 install -r requirements.txt" -echo "Installing Python packages ($COMMAND)..." +echo "Installing dependencies ($COMMAND)..." eval $COMMAND || exit 1 # Apply any database migrations