diff options
| author | Guy Sheffer <guysoft@gmail.com> | 2020-07-04 01:05:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-04 01:05:44 +0300 |
| commit | 7bde94e2544bc6f5a667db5edc13b88a43fb4bbd (patch) | |
| tree | 20d7412c5307d68220d3b13973d698c3b77dcb83 | |
| parent | 2a5910b24eb1b2c0dc923fa6c46f7c73f2bedc12 (diff) | |
| parent | 7f6170adb5150a1c8ffe19dbd0328b9cdb8fd877 (diff) | |
Merge pull request #658 from guysoft/improve/switch_to_python3
Switch to Python 3
| -rwxr-xr-x | src/modules/octopi/config | 2 | ||||
| -rwxr-xr-x | src/modules/octopi/start_chroot_script | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/modules/octopi/config b/src/modules/octopi/config index c0d3d12..ade885f 100755 --- a/src/modules/octopi/config +++ b/src/modules/octopi/config @@ -7,7 +7,7 @@ [ -n "$OCTOPI_INCLUDE_OCTOPRINT" ] || OCTOPI_INCLUDE_OCTOPRINT=yes # PyBonjour archive -[ -n "$OCTOPI_PYBONJOUR_ARCHIVE" ] || OCTOPI_PYBONJOUR_ARCHIVE=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pybonjour/pybonjour-1.1.1.tar.gz +[ -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 diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script index de87db3..eb77a28 100755 --- a/src/modules/octopi/start_chroot_script +++ b/src/modules/octopi/start_chroot_script @@ -26,7 +26,7 @@ echo "removing:" $remove_extra apt-get remove -y --purge $remove_extra apt-get autoremove -y -apt-get -y --force-yes install python2.7 python-virtualenv python-dev git screen subversion cmake checkinstall avahi-daemon libavahi-compat-libdnssd1 libffi-dev libssl-dev +apt-get -y --force-yes install python3 python3-virtualenv python3-dev git screen subversion cmake checkinstall avahi-daemon libavahi-compat-libdnssd1 libffi-dev libssl-dev echo " - Reinstall iputils-ping" apt-get install --reinstall iputils-ping @@ -34,13 +34,8 @@ apt-get install --reinstall iputils-ping pushd /home/pi # build virtualenv - # uncomment when setup tools issue has been fixed - # sudo -u pi virtualenv oprint - # sudo -u pi /home/pi/oprint/bin/pip install --upgrade pip - - sudo -u pi virtualenv --no-setuptools oprint + sudo -u pi python3 -m virtualenv --python=python3 oprint sudo -u pi /home/pi/oprint/bin/pip install --upgrade pip - sudo -u pi /home/pi/oprint/bin/pip install "setuptools<45" # OctoPrint & pyserial if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ] |