Browse Source

simplify python packages

Kyle P Davis 8 years ago
parent
commit
04a328c281
4 changed files with 4 additions and 10 deletions
  1. 2 4
      gimmes/_python_pkg
  2. 1 0
      gimmes/notebook
  3. 1 3
      gimmes/pip
  4. 0 3
      gimmes/python

+ 2 - 4
gimmes/_python_pkg

@@ -6,13 +6,11 @@ gimme pip
 PKG=${0##*/}
 PKG=${0##*/}
 if ! has "$PKG" && ! python -c "import $PKG" &>/dev/null; then
 if ! has "$PKG" && ! python -c "import $PKG" &>/dev/null; then
 	if [[ "$OS" = "Darwin" ]]; then
 	if [[ "$OS" = "Darwin" ]]; then
-		mkdir -p "$PYTHONPATH"
-		pip install --install-option="--prefix=$(brew --prefix)" "$PKG"
-		! [ -f "$PYTHONPATH/$PKG" ]  ||  ln -sfv "$PYTHONPATH/$PKG" "$(brew --prefix)/bin/$PKG"
+		pip install --user "$PKG"
 	else
 	else
 		if ! gimme_pkg "$PKG"; then
 		if ! gimme_pkg "$PKG"; then
 			echo "# WARN: Unable to get system package \"$PKG\", trying pip/easy_install instead ..."
 			echo "# WARN: Unable to get system package \"$PKG\", trying pip/easy_install instead ..."
-			sudo pip install "$PKG"
+			pip install --user "$PKG"
 		fi
 		fi
 	fi
 	fi
 fi
 fi

+ 1 - 0
gimmes/notebook

@@ -0,0 +1 @@
+_python_pkg

+ 1 - 3
gimmes/pip

@@ -5,9 +5,7 @@ gimme python
 
 
 if ! has pip; then
 if ! has pip; then
 	if [[ "$OS" = "Darwin" ]]; then
 	if [[ "$OS" = "Darwin" ]]; then
-		mkdir -p "$PYTHONPATH"
-		easy_install -d "$PYTHONPATH" "pip"
-		ln -sfv "$PYTHONPATH/pip" "$(brew --prefix)/bin/pip"
+		easy_install --user "pip"
 	else
 	else
 		sudo easy_install pip
 		sudo easy_install pip
 	fi
 	fi

+ 0 - 3
gimmes/python

@@ -1,7 +1,4 @@
 #!/bin/bash
 #!/bin/bash
 set -o errexit -o pipefail
 set -o errexit -o pipefail
-if [[ "$OS" = "Darwin" ]]; then
-	mkdir -p "$PYTHONPATH"
-fi
 has python  ||  gimme_pkg python
 has python  ||  gimme_pkg python
 has easy_install || gimme_pkg python-setuptools
 has easy_install || gimme_pkg python-setuptools