From 39562afc4e99386e983b5ee96136efec1aa326d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 28 Feb 2017 10:25:26 +0000 Subject: [PATCH] Remove pip version pin We no longer need to manually setup a solid SSL environment since that's already done for use with Python 2.7.9. The whole issue that we ran into with setting this up under Pip 9+ therefore can be circumvented without having to pin the pip version. Refer to #276 --- src/chroot_script | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/chroot_script b/src/chroot_script index 9f42fa77..8da045cc 100755 --- a/src/chroot_script +++ b/src/chroot_script @@ -66,29 +66,7 @@ pushd /home/pi sudo -u pi virtualenv oprint # first lets upgrade pip (the shipped version is way too old...) - sudo -u pi /home/pi/oprint/bin/pip install --upgrade "pip>=8,<9" - - # we also want pyopenssl so we have a secure SSL context available - # since that stuff takes ages to compile during build, we do a somewhat dirty - # trick here by installing the raspbian versions, copying the libs over - # to our virtualenv and then purging the raspbian versions again - apt-get -y --force-yes install python-openssl - if [ $( is_in_apt python-cryptography ) -eq 1 ]; then - apt-get -y --force-yes install python-cryptography - from=/usr/lib/python2.7/dist-packages - to=/home/pi/oprint/lib/python2.7/site-packages - for pattern in "cffi*" "cryptography*" "OpenSSL*" "ply*" "pycparser*" "pyOpenSSL*" "six*" - do - cp -v -r --preserve=mode,timestamps $from/$pattern $to/ - done - apt-get remove -y --purge python-openssl python-cryptography - else - sudo -u pi /home/pi/oprint/bin/pip install cryptography - apt-get remove -y --purge python-openssl - fi - apt-get autoremove -y - chown -R pi.pi /home/pi/oprint - sudo -u pi /home/pi/oprint/bin/pip install ndg-httpsclient pyasn1 + sudo -u pi /home/pi/oprint/bin/pip install --upgrade pip # OctoPrint & pyserial if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ]