[gtk-osx: 18/48] Set and use PIP and PIPENV so they don't have to be on the PATH.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx: 18/48] Set and use PIP and PIPENV so they don't have to be on the PATH.
- Date: Tue, 14 May 2019 23:58:00 +0000 (UTC)
commit 2126c100355c49674ecf208adf9ea23c8d6b29dd
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 8 11:41:10 2019 -0700
Set and use PIP and PIPENV so they don't have to be on the PATH.
gtk-osx-setup.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 58a7326..895ddab 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -91,11 +91,13 @@ if test ! -x "`eval echo $PIP`" ; then
else
python -m ensurepip --user
fi
- pip install --upgrade --user pip
+ PIP="$PYTHONUSERBASE/bin/pip"
+ $PIP install --upgrade --user pip
fi
# Install pipenv
-pip install --upgrade --user pipenv
+$PIP install --upgrade --user pipenv
+PIPENV="$PYTHONUSERBASE/bin/pipenv"
# Install jhbuild
if test ! -d "$DEV_SRC_ROOT/jhbuild/.git" ; then
@@ -191,7 +193,7 @@ if test "x`echo $PATH | grep "$DEVPREFIX/bin"`" == x ; then
fi
# pipenv wants enum34 because it's installed with Py2 but that conflicts
# with Py3 so remove it.
-pip uninstall --yes enum34
+$PIP uninstall --yes enum34
SDKROOT=`xcrun --show-sdk-path`
@@ -201,7 +203,7 @@ export PATH="$PYENV_ROOT/shims:$PATH"
export CFLAGS="-isysroot $SDKROOT -I$SDKROOT/usr/include"
export PYTHON_CONFIGURE_OPTS="--enable-shared"
-pipenv install
+$PIPENV install
BASEURL="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]