diff options
| author | Gina Häußge <gina@octoprint.org> | 2020-09-30 14:17:27 +0300 |
|---|---|---|
| committer | Gina Häußge <gina@octoprint.org> | 2020-09-30 14:17:27 +0300 |
| commit | 4003dbd388263676a63e20e72291e14419659597 (patch) | |
| tree | 93a0765030fdd9fef528f65903020345f41fee53 /src/modules/octopi | |
| parent | d2a7016c8b1760dcb10d0c14e1b049f173579c86 (diff) | |
Remove pybonjour dependency install
OctoPrint no longer depends on it (it's no longer maintained and
also not compatible to Python 3) and instead now uses zeroconf.
As it's incompatible to Python 3 anyhow, installing it no longer
makes sense.
Diffstat (limited to 'src/modules/octopi')
| -rwxr-xr-x | src/modules/octopi/config | 6 | ||||
| -rwxr-xr-x | src/modules/octopi/start_chroot_script | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/modules/octopi/config b/src/modules/octopi/config index 996b1bc..e9f3d06 100755 --- a/src/modules/octopi/config +++ b/src/modules/octopi/config @@ -6,9 +6,6 @@ [ -n "$OCTOPI_OCTOPRINT_REPO_SHIP" ] || OCTOPI_OCTOPRINT_REPO_SHIP=https://github.com/foosel/OctoPrint.git [ -n "$OCTOPI_INCLUDE_OCTOPRINT" ] || OCTOPI_INCLUDE_OCTOPRINT=yes -# PyBonjour archive -[ -n "$OCTOPI_PYBONJOUR_ARCHIVE" ] || OCTOPI_PYBONJOUR_ARCHIVE=https://github.com/OctoPrint/pybonjour-python3/archive/master.zip - # CuraEngine archive & version [ -n "$OCTOPI_CURAENGINE_VERSION" ] || OCTOPI_CURAENGINE_VERSION=15.04.6 [ -n "$OCTOPI_CURAENGINE_ARCHIVE" ] || OCTOPI_CURAENGINE_ARCHIVE=https://github.com/Ultimaker/CuraEngine/archive/$OCTOPI_CURAENGINE_VERSION.zip @@ -36,4 +33,5 @@ [ -n "$OCTOPI_COMMIT" ] || OCTOPI_COMMIT=`pushd "${DIST_PATH}" > /dev/null ; git rev-parse HEAD ; popd > /dev/null` # Fixed apt mirror -[ -n "$OCTOPI_APTMIRROR" ] || OCTOPI_APTMIRROR=
\ No newline at end of file +[ -n "$OCTOPI_APTMIRROR" ] || OCTOPI_APTMIRROR= + diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script index 216e08a..ded7833 100755 --- a/src/modules/octopi/start_chroot_script +++ b/src/modules/octopi/start_chroot_script @@ -44,15 +44,10 @@ pushd /home/pi sudo -u pi python3 -m virtualenv --python=python3 oprint sudo -u pi /home/pi/oprint/bin/pip install --upgrade pip - # OctoPrint & pyserial + # OctoPrint if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ] then echo "--- Installing OctoPrint" - - #pybonjour (for mdns discovery) - sudo -u pi /home/pi/oprint/bin/pip install $OCTOPI_PYBONJOUR_ARCHIVE - - #OctoPrint PIP_DEFAULT_TIMEOUT=60 sudo -u pi /home/pi/oprint/bin/pip install $OCTOPI_OCTOPRINT_ARCHIVE fi |