diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-01-25 10:32:23 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-01-25 10:34:24 -0500 |
| commit | 264aac585680b36490ed80625e26efde0482af83 (patch) | |
| tree | 0afae2eb27829a09b8548480e3838abb56cc4e80 /scripts | |
| parent | 2b3ea29f30f5169f523d02b3d899efa7ab462da5 (diff) | |
| download | kutter-264aac585680b36490ed80625e26efde0482af83.tar.gz kutter-264aac585680b36490ed80625e26efde0482af83.tar.xz kutter-264aac585680b36490ed80625e26efde0482af83.zip | |
scripts: Revert virtualenv workarounds
Revert "scripts: Disable "virtualenv setuptools" in install-octopi.sh script"
This reverts commit 5fc92ff6b7f2c824346fdfd559f2d44978f380ab.
Revert "scripts: Install "virtualenv setuptools==44.0.0" in install-octopi.sh"
This reverts commit 730c7cfc207aec2199220601018c6fc2b9da0235.
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-octopi.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/install-octopi.sh b/scripts/install-octopi.sh index 82056a4b..bec01d1a 100755 --- a/scripts/install-octopi.sh +++ b/scripts/install-octopi.sh @@ -34,11 +34,9 @@ create_virtualenv() report_status "Updating python virtual environment..." # Create virtualenv if it doesn't already exist - [ ! -d ${PYTHONDIR} ] && virtualenv --no-setuptools ${PYTHONDIR} - [ ! -x ${PYTHONDIR}/bin/pip ] && virtualenv ${PYTHONDIR} + [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} # Install/update dependencies - ${PYTHONDIR}/bin/pip install setuptools==44.0.0 ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt } |