Explorar o código

pep8 is now pycodestyle, use pip not easy_install

Kyle P Davis %!s(int64=8) %!d(string=hai) anos
pai
achega
4ed87f7521
Modificáronse 2 ficheiros con 4 adicións e 8 borrados
  1. 4 8
      gimmes/_python_pkg
  2. 0 0
      gimmes/pycodestyle

+ 4 - 8
gimmes/_python_pkg

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

+ 0 - 0
gimmes/pep8 → gimmes/pycodestyle