3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: Revert virtualenv workarounds 

Revert "scripts: Disable "virtualenv setuptools" in install-octopi.sh script"
This reverts commit 5fc92ff6b7.

Revert "scripts: Install "virtualenv setuptools==44.0.0" in install-octopi.sh"
This reverts commit 730c7cfc20.

The online setuptools repository was fixed upstream, so it is no
longer necessary to implement a local virtualenv workaround.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-01-25 10:32:23 -05:00
parent 2b3ea29f30
commit 264aac5856
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/install-octopi.sh
View File

@ -34,11 +34,9 @@ create_virtualenv()
report_status "Updating python virtual environment..." report_status "Updating python virtual environment..."
# Create virtualenv if it doesn't already exist # Create virtualenv if it doesn't already exist
[ ! -d ${PYTHONDIR} ] && virtualenv --no-setuptools ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
[ ! -x ${PYTHONDIR}/bin/pip ] && virtualenv ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install setuptools==44.0.0
${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt
} }