diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md index 32a631fb0..b3a86cfb6 100644 --- a/docs/release-notes/version-2.6.md +++ b/docs/release-notes/version-2.6.md @@ -9,6 +9,7 @@ ## Bug Fixes * [#3340](https://github.com/netbox-community/netbox/issues/3340) - Add missing options to connect front ports to console ports +* [#3460](https://github.com/netbox-community/netbox/issues/3460) - Extend upgrade script to validate Python dependencies * [#3596](https://github.com/netbox-community/netbox/issues/3596) - Prevent server error when reassigning a device to a new device bay --- diff --git a/upgrade.sh b/upgrade.sh index d1157e3ca..d17dec06d 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -20,6 +20,17 @@ COMMAND="${PIP} install -r requirements.txt --upgrade" echo "Updating required Python packages ($COMMAND)..." eval $COMMAND +# Validate Python dependencies +COMMAND="${PIP} check" +echo "Validating Python dependencies ($COMMAND)..." +eval $COMMAND || ( + echo "******** PLEASE FIX THE DEPENDENCIES BEFORE CONTINUING ********" + echo "* Manually install newer version(s) of the highlighted packages" + echo "* so that 'pip3 check' passes. For more information see:" + echo "* https://github.com/pypa/pip/issues/988" + exit 1 +) + # Apply any database migrations COMMAND="${PYTHON} netbox/manage.py migrate" echo "Applying database migrations ($COMMAND)..."