v20140705 (fixes #204)

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Version History
 
+#### 20140705
+
+* python-build: Add new CPython release; 2.7.8 (#201)
+* python-build: Support `SETUPTOOLS_VERSION` and `PIP_VERSION` to allow installing specific version of setuptools/pip (#202)
+
 #### 20140628
 
 * python-build: Add new Anaconda releases; anaconda-2.0.1, anaconda3-2.0.1 (#195)

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="20140628"
+version="20140705"
 
 if cd "$PYENV_ROOT" 2>/dev/null; then
   git_revision="$(git describe --tags HEAD 2>/dev/null || true)"

libexec/pyenv-init

@@ -140,7 +140,6 @@ function pyenv
   end
 end
 EOS
-  exit 0
   ;;
 ksh )
   cat <<EOS
@@ -156,6 +155,7 @@ EOS
   ;;
 esac
 
+if [ "$shell" != "fish" ]; then
 IFS="|"
 cat <<EOS
   command="\$1"
@@ -171,3 +171,4 @@ cat <<EOS
   esac
 }
 EOS
+fi

plugins/python-build/bin/python-build

@@ -1630,6 +1630,14 @@ if [ -e "$HOME/.pydistutils.cfg" ]; then
   } >&2
 fi
 
+# Download specified version of ez_setup.py/get-pip.py (#202)
+if [ -n "${SETUPTOOLS_VERSION}" ]; then
+  EZ_SETUP_URL="https://bitbucket.org/pypa/setuptools/raw/${SETUPTOOLS_VERSION}/ez_setup.py"
+fi
+if [ -n "${PIP_VERSION}" ]; then
+  GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py"
+fi
+
 SEED="$(date "+%Y%m%d%H%M%S").$$"
 LOG_PATH="${TMP}/python-build.${SEED}.log"
 PYTHON_BIN="${PREFIX_PATH}/bin/python"

plugins/python-build/share/python-build/2.7.8

@@ -0,0 +1,3 @@
+require_cc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" ldflags_dirs standard verify_py27 ensurepip

test/pyenv.bats

@@ -5,7 +5,7 @@ load test_helper
 @test "blank invocation" {
   run pyenv
   assert_success
-  assert [ "${lines[0]}" == "pyenv 20140628" ]
+  assert [ "${lines[0]}" == "pyenv 20140705" ]
 }
 
 @test "invalid command" {