Parcourir la source

Install wheel before NetBox dependencies

Jeremy Stretch il y a 6 ans
Parent
commit
17c76e413d
3 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. 0 4
      base_requirements.txt
  2. 0 1
      requirements.txt
  3. 6 1
      upgrade.sh

+ 0 - 4
base_requirements.txt

@@ -102,7 +102,3 @@ redis
 # SVG image rendering (used for rack elevations)
 # SVG image rendering (used for rack elevations)
 # https://github.com/mozman/svgwrite
 # https://github.com/mozman/svgwrite
 svgwrite
 svgwrite
-
-# Python package management tool
-# https://pythonwheels.com/
-wheel

+ 0 - 1
requirements.txt

@@ -24,4 +24,3 @@ pycryptodome==3.9.4
 PyYAML==5.3
 PyYAML==5.3
 redis==3.3.11
 redis==3.3.11
 svgwrite==1.3.1
 svgwrite==1.3.1
-wheel==0.34.2

+ 6 - 1
upgrade.sh

@@ -29,9 +29,14 @@ eval $COMMAND || {
 # Activate the virtual environment
 # Activate the virtual environment
 source "${VIRTUALENV}/bin/activate"
 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
 # Install Python packages
 COMMAND="pip3 install -r requirements.txt"
 COMMAND="pip3 install -r requirements.txt"
-echo "Installing Python packages ($COMMAND)..."
+echo "Installing dependencies ($COMMAND)..."
 eval $COMMAND || exit 1
 eval $COMMAND || exit 1
 
 
 # Apply any database migrations
 # Apply any database migrations