From b26b83a11f7a89aea11470a61f8478a84f4c6389 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Wed, 29 Oct 2014 03:35:29 -0700 Subject: [PATCH 1/3] Import changes from ruby-build v20141028 --- plugins/python-build/bin/pyenv-install | 33 +++- plugins/python-build/bin/python-build | 173 ++++++++++++++++----- plugins/python-build/test/build.bats | 42 ++++- plugins/python-build/test/compiler.bats | 85 ++++++++++ plugins/python-build/test/definitions.bats | 112 +++++++++++++ plugins/python-build/test/installer.bats | 2 +- plugins/python-build/test/pyenv.bats | 148 ++++++++++++++++++ plugins/python-build/test/version.bats | 39 +++++ 8 files changed, 579 insertions(+), 55 deletions(-) create mode 100644 plugins/python-build/test/compiler.bats create mode 100644 plugins/python-build/test/definitions.bats create mode 100644 plugins/python-build/test/pyenv.bats create mode 100644 plugins/python-build/test/version.bats diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index fcd56f93..ffa070d3 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -25,15 +25,24 @@ set -e [ -n "$PYENV_DEBUG" ] && set -x +if [ -z "$PYENV_ROOT" ]; then + PYENV_ROOT="${HOME}/.pyenv" +fi + +# Add `share/python-build/` directory from each pyenv plugin to the list of +# paths where build definitions are looked up. +shopt -s nullglob +for plugin_path in "$PYENV_ROOT"/plugins/*/share/python-build; do + PYTHON_BUILD_DEFINITIONS="${PYTHON_BUILD_DEFINITIONS}:${plugin_path}" +done +export PYTHON_BUILD_DEFINITIONS +shopt -u nullglob + # Provide pyenv completions if [ "$1" = "--complete" ]; then exec python-build --definitions fi -if [ -z "$PYENV_ROOT" ]; then - PYENV_ROOT="${HOME}/.pyenv" -fi - # Load shared library functions eval "$(python-build --lib)" @@ -221,17 +230,25 @@ python-build $KEEP $VERBOSE $HAS_PATCH $DEBUG "$DEFINITION" "$PREFIX" || STATUS= # Display a more helpful message if the definition wasn't found. if [ "$STATUS" == "2" ]; then { candidates="$(definitions "$DEFINITION")" + here="$(dirname "${0%/*}")" if [ -n "$candidates" ]; then echo echo "The following versions contain \`$DEFINITION' in the name:" echo "$candidates" | indent fi echo - echo "You can list all available versions with \`pyenv install --list'." + echo "See all available versions with \`pyenv install --list'." echo - echo "If the version you're looking for is not present, first try upgrading" - echo "pyenv. If it's still missing, open a request on the pyenv" - echo "issue tracker: https://github.com/yyuu/pyenv/issues" + echo -n "If the version you need is missing, try upgrading python-build" + if [ "$here" != "${here#$(brew --prefix 2>/dev/null)}" ]; then + printf ":\n\n" + echo " brew update && brew upgrade pyenv" + elif [ -d "${here}/.git" ]; then + printf ":\n\n" + echo " cd ${here} && git pull" + else + printf ".\n" + fi } >&2 fi diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 78816b2a..ae23f9c4 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PYTHON_BUILD_VERSION="20140524" +PYTHON_BUILD_VERSION="20141028" set -E exec 3<&2 # preserve original stderr at fd 3 @@ -71,17 +71,42 @@ colorize() { fi } +os_information() { + if type -p lsb_release >/dev/null; then + lsb_release -sir | xargs echo + elif type -p sw_vers >/dev/null; then + echo "OS X $(sw_vers -productVersion)" + elif [ -r /etc/os-release ]; then + source /etc/os-release + echo "$NAME" $VERSION_ID + else + local os="$(cat /etc/{centos,redhat,fedora,system}-release /etc/debian_version 2>/dev/null | head -1)" + echo "${os:-$(uname -sr)}" + fi +} + +# 9.1 -> 901 +# 10.9 -> 1009 +# 10.10 -> 1010 +osx_version() { + local ver="$(sw_vers -productVersion)" + local major="${ver%.*}" + local minor="${ver#*.}" + echo $(( major*100 + minor )) +} + build_failed() { { echo - echo "BUILD FAILED" + colorize 1 "BUILD FAILED" + echo " ($(os_information) using $(version))" echo if ! rmdir "${BUILD_PATH}" 2>/dev/null; then echo "Inspect or clean up the working tree at ${BUILD_PATH}" if file_is_not_empty "$LOG_PATH"; then - echo "Results logged to ${LOG_PATH}" - echo + colorize 33 "Results logged to ${LOG_PATH}" + printf "\n\n" echo "Last 10 log lines:" tail -n 10 "$LOG_PATH" fi @@ -103,13 +128,16 @@ file_is_not_empty() { } num_cpu_cores() { - local num="" - if [ "Darwin" = "$(uname -s)" ]; then + local num + case "$(uname -s)" in + Darwin | *BSD ) num="$(sysctl -n hw.ncpu 2>/dev/null || true)" - elif [ -r /proc/cpuinfo ]; then - num="$(grep ^processor /proc/cpuinfo | wc -l)" - [ "$num" -gt 0 ] || num="" - fi + ;; + * ) + num="$(grep ^processor /proc/cpuinfo 2>/dev/null | wc -l | xargs)" + num="${num#0}" + ;; + esac echo "${num:-2}" } @@ -190,7 +218,8 @@ compute_sha2() { output="$(shasum -a 256 -b)" || return 1 echo "${output% *}" elif type openssl &>/dev/null; then - output="$(openssl dgst -sha256)" || return 1 + local openssl="$(command -v "$(brew --prefix openssl 2>/dev/null)"/bin/openssl openssl | head -1)" + output="$("$openssl" dgst -sha256 2>/dev/null)" || return 1 echo "${output##* }" elif type sha256sum &>/dev/null; then output="$(sha256sum --quiet)" || return 1 @@ -295,7 +324,7 @@ fetch_tarball() { fi fi - local tar_args="xzvf" + local tar_args="xzf" local package_filename="${package_name}.tar.gz" if [ "$package_url" != "${package_url%tgz}" ]; then @@ -607,6 +636,9 @@ build_package_standard() { ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then export CFLAGS="$CFLAGS ${!PACKAGE_CFLAGS}" fi + if [ -z "$CC" ] && [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then + export CC=clang + fi ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" \ --libdir="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}/lib" \ $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}" @@ -659,8 +691,12 @@ build_package_ree_installer() { build_package_rbx() { local package_name="$1" - { bundle --path=vendor/bundle - RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS + { [ ! -e "Gemfile" ] || bundle --path=vendor/bundle + if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then + mkdir -p vendor + ln -s "$RUBY_BUILD_CACHE_PATH" vendor/prebuilt + fi + RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS "${RUBY_CONFIGURE_OPTS_ARRAY[@]}" rake install fix_rbx_gem_binstubs "$PREFIX_PATH" fix_rbx_irb "$PREFIX_PATH" @@ -909,7 +945,7 @@ fix_rbx_gem_binstubs() { local bindir="${prefix}/bin" local file binstub # Symlink Rubinius' `gems/bin/` into `bin/` - if [ -d "$gemdir" ]; then + if [ -d "$gemdir" ] && [ ! -L "$gemdir" ]; then for file in "$gemdir"/*; do binstub="${bindir}/${file##*/}" rm -f "$binstub" @@ -985,6 +1021,9 @@ require_gcc() { fi export CC="$gcc" + if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then + export MACOSX_DEPLOYMENT_TARGET=10.9 + fi } locate_gcc() { @@ -1023,7 +1062,7 @@ verify_gcc() { return 1 fi - local version="$("$gcc" --version || true)" + local version="$("$gcc" --version 2>/dev/null || true)" if [ -z "$version" ]; then return 1 fi @@ -1035,6 +1074,15 @@ verify_gcc() { echo "$gcc" } +require_llvm() { + local llvm_version="$1" + if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then + if [[ "$PYTHON_CONFIGURE_OPTS" != *--llvm-* ]]; then + package_option python configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2" + fi + fi +} + require_cc() { local cc="$(command -v "$CC" || command -v "cc" || true)" @@ -1087,6 +1135,7 @@ require_java() { } needs_yaml() { + [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] && ! use_homebrew_yaml } @@ -1136,7 +1185,8 @@ use_homebrew_readline() { has_broken_mac_openssl() { [ "$(uname -s)" = "Darwin" ] && - [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] && + [[ "$(/usr/bin/openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] && + [[ "$RUBY_CONFIGURE_OPTS" != *--with-openssl-dir=* ]] && ! use_homebrew_openssl } @@ -1166,7 +1216,7 @@ build_package_mac_openssl() { OPENSSL_CONFIGURE="${OPENSSL_CONFIGURE:-./config}" # Compile a shared lib with zlib dynamically linked, no kerberos. - package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-krb5 shared + package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-ssl2 no-ssl3 no-krb5 shared # Default MAKE_OPTS are -j 2 which can confuse the build. Thankfully, make # gives precedence to the last -j option, so we can override that. @@ -1185,7 +1235,11 @@ build_package_verify_openssl() { "$RUBY_BIN" -e 'begin require "openssl" rescue LoadError - abort "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?" + $stderr.puts "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?" + $stderr.puts "Configure options used:" + require "rbconfig"; require "shellwords" + RbConfig::CONFIG.fetch("configure_args").shellsplit.each { |arg| $stderr.puts " #{arg}" } + exit 1 end' >&4 2>&1 } @@ -1449,7 +1503,13 @@ build_package_ensurepip() { } version() { - echo "python-build ${PYTHON_BUILD_VERSION}" + local git_revision + # Read the revision from git if the remote points to "python-build" repository + if GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git remote -v 2>/dev/null | grep -q /python-build; then + git_revision="$(GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git describe --tags HEAD 2>/dev/null || true)" + git_revision="${git_revision#v}" + fi + echo "python-build ${git_revision:-$PYTHON_BUILD_VERSION}" } usage() { @@ -1464,20 +1524,29 @@ usage() { } list_definitions() { - { for definition in "${PYTHON_BUILD_ROOT}/share/python-build/"*; do - [ -f "${definition}" ] && echo "${definition##*/}" + { for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do + [ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR" done - } | sort + } | sort_versions | uniq } +sort_versions() { + sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | \ + LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}' +} unset VERBOSE unset KEEP_BUILD_PATH unset HAS_PATCH -PYTHON_BUILD_ROOT="$(abs_dirname "$0")/.." unset DEBUG +PYTHON_BUILD_INSTALL_PREFIX="$(abs_dirname "$0")/.." + +OLDIFS="$IFS" +IFS=: PYTHON_BUILD_DEFINITIONS=($PYTHON_BUILD_DEFINITIONS ${PYTHON_BUILD_ROOT:-$PYTHON_BUILD_INSTALL_PREFIX}/share/python-build) +IFS="$OLDIFS" + parse_options "$@" for option in "${OPTIONS[@]}"; do @@ -1521,10 +1590,14 @@ DEFINITION_PATH="${ARGUMENTS[0]}" if [ -z "$DEFINITION_PATH" ]; then usage elif [ ! -f "$DEFINITION_PATH" ]; then - BUILTIN_DEFINITION_PATH="${PYTHON_BUILD_ROOT}/share/python-build/${DEFINITION_PATH}" - if [ -e "$BUILTIN_DEFINITION_PATH" ]; then - DEFINITION_PATH="$BUILTIN_DEFINITION_PATH" - else + for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do + if [ -f "${DEFINITION_DIR}/${DEFINITION_PATH}" ]; then + DEFINITION_PATH="${DEFINITION_DIR}/${DEFINITION_PATH}" + break + fi + done + + if [ ! -f "$DEFINITION_PATH" ]; then echo "python-build: definition not found: ${DEFINITION_PATH}" >&2 exit 2 fi @@ -1543,10 +1616,25 @@ else TMP="${TMPDIR%/}" fi -if [ ! -w "$TMP" ] || [ ! -x "$TMP" ]; then +# Check if TMPDIR is accessible and can hold executables. +tmp_executable="${TMP}/python-build-test.$$" +noexec="" +if mkdir -p "$TMP" && touch "$tmp_executable" 2>/dev/null; then + cat > "$tmp_executable" <<-EOF + #!${BASH} + exit 0 + EOF + chmod +x "$tmp_executable" +else echo "python-build: TMPDIR=$TMP is set to a non-accessible location" >&2 exit 1 fi +"$tmp_executable" 2>/dev/null || noexec=1 +rm -f "$tmp_executable" +if [ -n "$noexec" ]; then + echo "python-build: TMPDIR=$TMP cannot hold executables (partition possibly mounted with \`noexec\`)" >&2 + exit 1 +fi # Work around warnings building Ruby 2.0 on Clang 2.x: # pass -Wno-error=shorten-64-to-32 if the compiler accepts it. @@ -1559,7 +1647,7 @@ fi #fi if [ -z "$MAKE" ]; then - if [[ "FreeBSD" = "$(uname -s)" ]]; then + if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then export MAKE="gmake" else export MAKE="make" @@ -1593,7 +1681,6 @@ if echo test | compute_md5 >/dev/null; then HAS_MD5_SUPPORT=1 else unset HAS_MD5_SUPPORT - unset PYTHON_BUILD_MIRROR_URL fi # Add an option to build a debug version of Python (#11) @@ -1668,18 +1755,18 @@ if [ -n "${PIP_VERSION}" ]; then GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py" fi -# Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220) -if [[ "Darwin" == "$(uname -s)" ]]; then - MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" - MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) - if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then - export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" - else - { colorize 1 "WARNING" - echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting." - } >&2 - fi -fi +## Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220) +#if [[ "Darwin" == "$(uname -s)" ]]; then +# MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" +# MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) +# if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then +# export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" +# else +# { colorize 1 "WARNING" +# echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting." +# } >&2 +# fi +#fi python_bin_suffix() { local version_name version_info diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats index 5cab04b1..210a91b7 100644 --- a/plugins/python-build/test/build.bats +++ b/plugins/python-build/test/build.bats @@ -264,6 +264,31 @@ make install OUT } +@test "number of CPU cores is detected on FreeBSD" { + cached_tarball "Python-3.2.1" + + stub uname '-s : echo FreeBSD' + stub sysctl '-n hw.ncpu : echo 1' + stub_make_install + + export -n MAKE_OPTS + run_inline_definition <&2; echo 4.2.1' + + run_inline_definition < ./configure < "${TMP}/definitions/2.7.8-test" + mkdir -p "${TMP}/other" + echo false > "${TMP}/other/2.7.8-test" + run bin/python-build "2.7.8-test" "${TMP}/install" + assert_success "" +} + +@test "installing nonexistent definition" { + run python-build "nonexistent" "${TMP}/install" + assert [ "$status" -eq 2 ] + assert_output "python-build: definition not found: nonexistent" +} + +@test "sorting Python versions" { + export PYTHON_BUILD_ROOT="$TMP" + mkdir -p "${PYTHON_BUILD_ROOT}/share/python-build" + expected="2.7-dev +2.7.8-preview1 +2.7.8-rc1 +2.7.8-p0 +2.7.8-p125 +3.4.0 +3.4.0-rc1 +3.4.1 +3.4.2 +3.4-dev +2.2.0-dev +jython-2.5.0 +jython-2.5.1 +jython-2.5.2 +jython-2.5.3 +jython-2.5.4-rc1 +jython-2.5-dev +jython-2.7-beta1 +jython-2.7-beta2 +jython-2.7-beta3 +jython-dev" + for ver in "$expected"; do + touch "${PYTHON_BUILD_ROOT}/share/python-build/$ver" + done + run python-build --definitions + assert_success "$expected" +} + +@test "removing duplicate Python versions" { + export PYTHON_BUILD_ROOT="$TMP" + export PYTHON_BUILD_DEFINITIONS="${PYTHON_BUILD_ROOT}/share/python-build" + mkdir -p "$PYTHON_BUILD_DEFINITIONS" + touch "${PYTHON_BUILD_DEFINITIONS}/2.7.8" + touch "${PYTHON_BUILD_DEFINITIONS}/3.4.2" + + run python-build --definitions + assert_success + assert_output <&2 && exit 2' \ + "--definitions : echo 2.6.9 2.7.9-rc1 2.7.9-rc2 3.4.2 | tr ' ' $'\\n'" + + run pyenv-install 2.7.9 + assert_failure + assert_output <&2 && exit 2' \ + "--definitions : true" + + run pyenv-install 1.9.3 + assert_failure + assert_output <&2; exit 1' + run python-build --version + assert_success "python-build ${static_version}" + unstub git +} + +@test "python-build git version" { + stub git \ + 'remote -v : echo origin https://github.com/yyuu/pyenv.git' \ + "describe --tags HEAD : echo v1984-12-gSHA" + run python-build --version + assert_success "python-build 1984-12-gSHA" + unstub git +} + +@test "git describe fails" { + stub git \ + 'remote -v : echo origin https://github.com/yyuu/pyenv.git' \ + "describe --tags HEAD : echo ASPLODE >&2; exit 1" + run python-build --version + assert_success "python-build ${static_version}" + unstub git +} + +@test "git remote doesn't match" { + stub git \ + 'remote -v : echo origin https://github.com/Homebrew/homebrew.git' \ + "describe --tags HEAD : echo v1984-12-gSHA" + run python-build --version + assert_success "python-build ${static_version}" +} From 4a52bfaff971b1326ab023c950f95f663f9dfc6e Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Mon, 3 Nov 2014 00:33:44 -0800 Subject: [PATCH 2/3] Fix broken tests --- plugins/python-build/bin/pyenv-install | 4 +- plugins/python-build/bin/python-build | 65 ++++------------ plugins/python-build/share/python-build/2.1.3 | 2 +- plugins/python-build/share/python-build/2.2.3 | 2 +- plugins/python-build/share/python-build/2.3.7 | 2 +- plugins/python-build/share/python-build/2.4 | 2 +- plugins/python-build/share/python-build/2.4.1 | 2 +- plugins/python-build/share/python-build/2.4.2 | 2 +- plugins/python-build/share/python-build/2.4.3 | 2 +- plugins/python-build/share/python-build/2.4.4 | 2 +- plugins/python-build/share/python-build/2.4.5 | 2 +- plugins/python-build/share/python-build/2.4.6 | 2 +- plugins/python-build/share/python-build/2.5 | 2 +- plugins/python-build/share/python-build/2.5.1 | 2 +- plugins/python-build/share/python-build/2.5.2 | 2 +- plugins/python-build/share/python-build/2.5.3 | 2 +- plugins/python-build/share/python-build/2.5.4 | 2 +- plugins/python-build/share/python-build/2.5.5 | 2 +- plugins/python-build/share/python-build/2.5.6 | 2 +- plugins/python-build/share/python-build/2.6.6 | 2 +- plugins/python-build/share/python-build/2.6.7 | 2 +- plugins/python-build/share/python-build/2.6.8 | 2 +- plugins/python-build/share/python-build/2.6.9 | 2 +- plugins/python-build/share/python-build/2.7 | 2 +- .../python-build/share/python-build/2.7-dev | 2 +- plugins/python-build/share/python-build/2.7.1 | 2 +- plugins/python-build/share/python-build/2.7.2 | 2 +- plugins/python-build/share/python-build/2.7.3 | 2 +- plugins/python-build/share/python-build/2.7.4 | 2 +- plugins/python-build/share/python-build/2.7.5 | 2 +- plugins/python-build/share/python-build/2.7.6 | 2 +- plugins/python-build/share/python-build/2.7.7 | 2 +- plugins/python-build/share/python-build/2.7.8 | 2 +- plugins/python-build/share/python-build/3.0.1 | 2 +- .../python-build/share/python-build/3.1-dev | 2 +- plugins/python-build/share/python-build/3.1.3 | 2 +- plugins/python-build/share/python-build/3.1.4 | 2 +- plugins/python-build/share/python-build/3.1.5 | 2 +- plugins/python-build/share/python-build/3.2 | 2 +- .../python-build/share/python-build/3.2-dev | 2 +- plugins/python-build/share/python-build/3.2.1 | 2 +- plugins/python-build/share/python-build/3.2.2 | 2 +- plugins/python-build/share/python-build/3.2.3 | 2 +- plugins/python-build/share/python-build/3.2.4 | 2 +- plugins/python-build/share/python-build/3.2.5 | 2 +- plugins/python-build/share/python-build/3.2.6 | 2 +- .../python-build/share/python-build/3.3-dev | 2 +- plugins/python-build/share/python-build/3.3.0 | 2 +- plugins/python-build/share/python-build/3.3.1 | 2 +- plugins/python-build/share/python-build/3.3.2 | 2 +- plugins/python-build/share/python-build/3.3.3 | 2 +- plugins/python-build/share/python-build/3.3.4 | 2 +- plugins/python-build/share/python-build/3.3.5 | 2 +- plugins/python-build/share/python-build/3.3.6 | 2 +- .../python-build/share/python-build/3.4-dev | 2 +- plugins/python-build/share/python-build/3.4.0 | 2 +- plugins/python-build/share/python-build/3.4.1 | 2 +- plugins/python-build/share/python-build/3.4.2 | 2 +- .../share/python-build/stackless-2.7-dev | 2 +- .../share/python-build/stackless-2.7.2 | 2 +- .../share/python-build/stackless-2.7.3 | 2 +- .../share/python-build/stackless-2.7.4 | 2 +- .../share/python-build/stackless-2.7.5 | 2 +- .../share/python-build/stackless-2.7.6 | 2 +- .../share/python-build/stackless-2.7.7 | 2 +- .../share/python-build/stackless-2.7.8 | 2 +- .../share/python-build/stackless-3.2-dev | 2 +- .../share/python-build/stackless-3.2.2 | 2 +- .../share/python-build/stackless-3.2.5 | 2 +- .../share/python-build/stackless-3.3-dev | 2 +- .../share/python-build/stackless-3.3.5 | 2 +- .../share/python-build/stackless-3.4.1 | 2 +- .../share/python-build/stackless-dev | 2 +- plugins/python-build/test/build.bats | 74 ++++++++++--------- plugins/python-build/test/compiler.bats | 12 ++- plugins/python-build/test/definitions.bats | 20 +++-- plugins/python-build/test/pyenv.bats | 6 +- 77 files changed, 146 insertions(+), 177 deletions(-) diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index ffa070d3..72e4e964 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -230,7 +230,7 @@ python-build $KEEP $VERBOSE $HAS_PATCH $DEBUG "$DEFINITION" "$PREFIX" || STATUS= # Display a more helpful message if the definition wasn't found. if [ "$STATUS" == "2" ]; then { candidates="$(definitions "$DEFINITION")" - here="$(dirname "${0%/*}")" + here="$(dirname "${0%/*}")/../.." if [ -n "$candidates" ]; then echo echo "The following versions contain \`$DEFINITION' in the name:" @@ -239,7 +239,7 @@ if [ "$STATUS" == "2" ]; then echo echo "See all available versions with \`pyenv install --list'." echo - echo -n "If the version you need is missing, try upgrading python-build" + echo -n "If the version you need is missing, try upgrading pyenv" if [ "$here" != "${here#$(brew --prefix 2>/dev/null)}" ]; then printf ":\n\n" echo " brew update && brew upgrade pyenv" diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index ae23f9c4..9558de5b 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -89,10 +89,9 @@ os_information() { # 10.9 -> 1009 # 10.10 -> 1010 osx_version() { - local ver="$(sw_vers -productVersion)" - local major="${ver%.*}" - local minor="${ver#*.}" - echo $(( major*100 + minor )) + local -a ver + IFS=. ver=( `sw_vers -productVersion` ) + echo $(( ${ver[0]}*100 + ${ver[1]} )) } build_failed() { @@ -1083,40 +1082,6 @@ require_llvm() { fi } -require_cc() { - local cc="$(command -v "$CC" || command -v "cc" || true)" - - if [ -z "$cc" ]; then - { echo - colorize 1 "ERROR" - echo ": This package must be compiled with cc, but python-build couldn't" - echo "find a suitable \`cc\` executable on your system. Please install cc" - echo "and try again." - echo - } >&3 - return 1 - fi - - export CC -} - -require_clang() { - local clang="$(command -v "$CC" || command -v "clang" || true)" - - if [ -z "$clang" ]; then - { echo - colorize 1 "ERROR" - echo ": This package must be compiled with clang, but python-build couldn't" - echo "find a suitable \`clang\` executable on your system. Please install clang" - echo "and try again." - echo - } >&3 - return 1 - fi - - export CC="$clang" -} - require_java() { local java="$(command -v java || true)" @@ -1505,7 +1470,7 @@ build_package_ensurepip() { version() { local git_revision # Read the revision from git if the remote points to "python-build" repository - if GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git remote -v 2>/dev/null | grep -q /python-build; then + if GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git remote -v 2>/dev/null | grep -q /pyenv; then git_revision="$(GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git describe --tags HEAD 2>/dev/null || true)" git_revision="${git_revision#v}" fi @@ -1525,7 +1490,7 @@ usage() { list_definitions() { { for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do - [ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR" + [ -d "$DEFINITION_DIR" ] && find "$DEFINITION_DIR" -maxdepth 1 -type f -print0 | xargs -0 -n 1 basename 2>/dev/null done } | sort_versions | uniq } @@ -1755,18 +1720,14 @@ if [ -n "${PIP_VERSION}" ]; then GET_PIP_URL="https://raw.githubusercontent.com/pypa/pip/${PIP_VERSION}/contrib/get-pip.py" fi -## Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220) -#if [[ "Darwin" == "$(uname -s)" ]]; then -# MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" -# MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) -# if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then -# export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" -# else -# { colorize 1 "WARNING" -# echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting." -# } >&2 -# fi -#fi +# Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220) +if [[ "Darwin" == "$(uname -s)" ]]; then + MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" + MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) + if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then + export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" + fi +fi python_bin_suffix() { local version_name version_info diff --git a/plugins/python-build/share/python-build/2.1.3 b/plugins/python-build/share/python-build/2.1.3 index 6b1526bd..70f5814f 100644 --- a/plugins/python-build/share/python-build/2.1.3 +++ b/plugins/python-build/share/python-build/2.1.3 @@ -1,4 +1,4 @@ -require_cc +#require_gcc install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline install_package "Python-2.1.3" "http://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" ldflags_dirs standard verify_py21 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python diff --git a/plugins/python-build/share/python-build/2.2.3 b/plugins/python-build/share/python-build/2.2.3 index 75265126..8aa05e32 100644 --- a/plugins/python-build/share/python-build/2.2.3 +++ b/plugins/python-build/share/python-build/2.2.3 @@ -1,4 +1,4 @@ -require_cc +#require_gcc install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline install_package "Python-2.2.3" "http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" ldflags_dirs standard verify_py22 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python diff --git a/plugins/python-build/share/python-build/2.3.7 b/plugins/python-build/share/python-build/2.3.7 index d062ef77..7f924e9d 100644 --- a/plugins/python-build/share/python-build/2.3.7 +++ b/plugins/python-build/share/python-build/2.3.7 @@ -1,4 +1,4 @@ -require_cc +#require_gcc install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline install_package "Python-2.3.7" "http://python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" ldflags_dirs standard verify_py23 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python diff --git a/plugins/python-build/share/python-build/2.4 b/plugins/python-build/share/python-build/2.4 index 49183d5d..d69fa729 100644 --- a/plugins/python-build/share/python-build/2.4 +++ b/plugins/python-build/share/python-build/2.4 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.1 b/plugins/python-build/share/python-build/2.4.1 index b0ee75ab..f14a99b8 100644 --- a/plugins/python-build/share/python-build/2.4.1 +++ b/plugins/python-build/share/python-build/2.4.1 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.1" "http://python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.2 b/plugins/python-build/share/python-build/2.4.2 index 170650a1..fdeff6ad 100644 --- a/plugins/python-build/share/python-build/2.4.2 +++ b/plugins/python-build/share/python-build/2.4.2 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.2" "http://python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.3 b/plugins/python-build/share/python-build/2.4.3 index f3c8d53d..8579fc25 100644 --- a/plugins/python-build/share/python-build/2.4.3 +++ b/plugins/python-build/share/python-build/2.4.3 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.3" "http://python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.4 b/plugins/python-build/share/python-build/2.4.4 index 8831d893..1ab47422 100644 --- a/plugins/python-build/share/python-build/2.4.4 +++ b/plugins/python-build/share/python-build/2.4.4 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.4" "http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.5 b/plugins/python-build/share/python-build/2.4.5 index ade0bb04..740e2508 100644 --- a/plugins/python-build/share/python-build/2.4.5 +++ b/plugins/python-build/share/python-build/2.4.5 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.5" "http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.4.6 b/plugins/python-build/share/python-build/2.4.6 index 9774f622..0851da4d 100644 --- a/plugins/python-build/share/python-build/2.4.6 +++ b/plugins/python-build/share/python-build/2.4.6 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.4.6" "http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" ldflags_dirs standard verify_py24 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5 b/plugins/python-build/share/python-build/2.5 index 4d219b93..c26dbff9 100644 --- a/plugins/python-build/share/python-build/2.5 +++ b/plugins/python-build/share/python-build/2.5 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.1 b/plugins/python-build/share/python-build/2.5.1 index c3be79e7..5c0add06 100644 --- a/plugins/python-build/share/python-build/2.5.1 +++ b/plugins/python-build/share/python-build/2.5.1 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.1" "http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.2 b/plugins/python-build/share/python-build/2.5.2 index b21519bd..a0fef3cc 100644 --- a/plugins/python-build/share/python-build/2.5.2 +++ b/plugins/python-build/share/python-build/2.5.2 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.2" "http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.3 b/plugins/python-build/share/python-build/2.5.3 index 8292b33b..e38500b5 100644 --- a/plugins/python-build/share/python-build/2.5.3 +++ b/plugins/python-build/share/python-build/2.5.3 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.3" "http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.4 b/plugins/python-build/share/python-build/2.5.4 index a565f4ef..170aa82e 100644 --- a/plugins/python-build/share/python-build/2.5.4 +++ b/plugins/python-build/share/python-build/2.5.4 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.4" "http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.5 b/plugins/python-build/share/python-build/2.5.5 index cf9e0756..dd5e6873 100644 --- a/plugins/python-build/share/python-build/2.5.5 +++ b/plugins/python-build/share/python-build/2.5.5 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.5" "http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.5.6 b/plugins/python-build/share/python-build/2.5.6 index 4335a374..c3bc694c 100644 --- a/plugins/python-build/share/python-build/2.5.6 +++ b/plugins/python-build/share/python-build/2.5.6 @@ -1,4 +1,4 @@ -require_cc +#require_gcc 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.5.6" "http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" ldflags_dirs standard verify_py25 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python diff --git a/plugins/python-build/share/python-build/2.6.6 b/plugins/python-build/share/python-build/2.6.6 index 302fd321..0a600b0b 100644 --- a/plugins/python-build/share/python-build/2.6.6 +++ b/plugins/python-build/share/python-build/2.6.6 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" ldflags_dirs standard verify_py26 ensurepip diff --git a/plugins/python-build/share/python-build/2.6.7 b/plugins/python-build/share/python-build/2.6.7 index 7d6344f8..f03858ed 100644 --- a/plugins/python-build/share/python-build/2.6.7 +++ b/plugins/python-build/share/python-build/2.6.7 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" ldflags_dirs standard verify_py26 ensurepip diff --git a/plugins/python-build/share/python-build/2.6.8 b/plugins/python-build/share/python-build/2.6.8 index 86cbff5c..e6b3b974 100644 --- a/plugins/python-build/share/python-build/2.6.8 +++ b/plugins/python-build/share/python-build/2.6.8 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" ldflags_dirs standard verify_py26 ensurepip diff --git a/plugins/python-build/share/python-build/2.6.9 b/plugins/python-build/share/python-build/2.6.9 index 82538c5b..7493ee1d 100644 --- a/plugins/python-build/share/python-build/2.6.9 +++ b/plugins/python-build/share/python-build/2.6.9 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" ldflags_dirs standard verify_py26 ensurepip diff --git a/plugins/python-build/share/python-build/2.7 b/plugins/python-build/share/python-build/2.7 index 946e53b5..914523fb 100644 --- a/plugins/python-build/share/python-build/2.7 +++ b/plugins/python-build/share/python-build/2.7 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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" "http://python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7-dev b/plugins/python-build/share/python-build/2.7-dev index 4f2ed077..67126087 100644 --- a/plugins/python-build/share/python-build/2.7-dev +++ b/plugins/python-build/share/python-build/2.7-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.1 b/plugins/python-build/share/python-build/2.7.1 index a1327597..b336df7c 100644 --- a/plugins/python-build/share/python-build/2.7.1 +++ b/plugins/python-build/share/python-build/2.7.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.2 b/plugins/python-build/share/python-build/2.7.2 index 3fb85469..1cf99cdb 100644 --- a/plugins/python-build/share/python-build/2.7.2 +++ b/plugins/python-build/share/python-build/2.7.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.3 b/plugins/python-build/share/python-build/2.7.3 index bb62b8cb..350c4f55 100644 --- a/plugins/python-build/share/python-build/2.7.3 +++ b/plugins/python-build/share/python-build/2.7.3 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.4 b/plugins/python-build/share/python-build/2.7.4 index 7bd60c7b..f3d71702 100644 --- a/plugins/python-build/share/python-build/2.7.4 +++ b/plugins/python-build/share/python-build/2.7.4 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.5 b/plugins/python-build/share/python-build/2.7.5 index b2bf9bb6..dd25978a 100644 --- a/plugins/python-build/share/python-build/2.7.5 +++ b/plugins/python-build/share/python-build/2.7.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.6 b/plugins/python-build/share/python-build/2.7.6 index 5ecb7a47..18b9bf24 100644 --- a/plugins/python-build/share/python-build/2.7.6 +++ b/plugins/python-build/share/python-build/2.7.6 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.7 b/plugins/python-build/share/python-build/2.7.7 index 77c4dbb1..d6f356b3 100644 --- a/plugins/python-build/share/python-build/2.7.7 +++ b/plugins/python-build/share/python-build/2.7.7 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/2.7.8 b/plugins/python-build/share/python-build/2.7.8 index 48c2ea92..a64e77fc 100644 --- a/plugins/python-build/share/python-build/2.7.8 +++ b/plugins/python-build/share/python-build/2.7.8 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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 diff --git a/plugins/python-build/share/python-build/3.0.1 b/plugins/python-build/share/python-build/3.0.1 index c4ed7d13..dc26e01e 100644 --- a/plugins/python-build/share/python-build/3.0.1 +++ b/plugins/python-build/share/python-build/3.0.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30 ensurepip diff --git a/plugins/python-build/share/python-build/3.1-dev b/plugins/python-build/share/python-build/3.1-dev index c739d5e4..48f1a917 100644 --- a/plugins/python-build/share/python-build/3.1-dev +++ b/plugins/python-build/share/python-build/3.1-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31 ensurepip diff --git a/plugins/python-build/share/python-build/3.1.3 b/plugins/python-build/share/python-build/3.1.3 index 0521fa51..92c668c4 100644 --- a/plugins/python-build/share/python-build/3.1.3 +++ b/plugins/python-build/share/python-build/3.1.3 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" ldflags_dirs standard verify_py31 ensurepip diff --git a/plugins/python-build/share/python-build/3.1.4 b/plugins/python-build/share/python-build/3.1.4 index 7b48bec7..657c3969 100644 --- a/plugins/python-build/share/python-build/3.1.4 +++ b/plugins/python-build/share/python-build/3.1.4 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" ldflags_dirs standard verify_py31 ensurepip diff --git a/plugins/python-build/share/python-build/3.1.5 b/plugins/python-build/share/python-build/3.1.5 index 5919b911..de4880fd 100644 --- a/plugins/python-build/share/python-build/3.1.5 +++ b/plugins/python-build/share/python-build/3.1.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" ldflags_dirs standard verify_py31 ensurepip diff --git a/plugins/python-build/share/python-build/3.2 b/plugins/python-build/share/python-build/3.2 index ab38ccc3..8779b7e4 100644 --- a/plugins/python-build/share/python-build/3.2 +++ b/plugins/python-build/share/python-build/3.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2-dev b/plugins/python-build/share/python-build/3.2-dev index 28b983bc..6e0f9089 100644 --- a/plugins/python-build/share/python-build/3.2-dev +++ b/plugins/python-build/share/python-build/3.2-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.1 b/plugins/python-build/share/python-build/3.2.1 index 7407038b..fe29b292 100644 --- a/plugins/python-build/share/python-build/3.2.1 +++ b/plugins/python-build/share/python-build/3.2.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.2 b/plugins/python-build/share/python-build/3.2.2 index 9a352cdd..a0127161 100644 --- a/plugins/python-build/share/python-build/3.2.2 +++ b/plugins/python-build/share/python-build/3.2.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.3 b/plugins/python-build/share/python-build/3.2.3 index 7a96580e..25809742 100644 --- a/plugins/python-build/share/python-build/3.2.3 +++ b/plugins/python-build/share/python-build/3.2.3 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.4 b/plugins/python-build/share/python-build/3.2.4 index f8d8d74b..6fbea02c 100644 --- a/plugins/python-build/share/python-build/3.2.4 +++ b/plugins/python-build/share/python-build/3.2.4 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.5 b/plugins/python-build/share/python-build/3.2.5 index df4cb8e7..dc1e8592 100644 --- a/plugins/python-build/share/python-build/3.2.5 +++ b/plugins/python-build/share/python-build/3.2.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.2.6 b/plugins/python-build/share/python-build/3.2.6 index b25fa08b..de597b9c 100644 --- a/plugins/python-build/share/python-build/3.2.6 +++ b/plugins/python-build/share/python-build/3.2.6 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/3.3-dev b/plugins/python-build/share/python-build/3.3-dev index 3129a093..0bc9232f 100644 --- a/plugins/python-build/share/python-build/3.3-dev +++ b/plugins/python-build/share/python-build/3.3-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.0 b/plugins/python-build/share/python-build/3.3.0 index cf7bb0b1..e9c95526 100644 --- a/plugins/python-build/share/python-build/3.3.0 +++ b/plugins/python-build/share/python-build/3.3.0 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#cfe531eaace2503e13a74addc7f4a89482e99f8b8fca51b469ae5c83f450604e" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.1 b/plugins/python-build/share/python-build/3.3.1 index ab513f77..3fee13a5 100644 --- a/plugins/python-build/share/python-build/3.3.1 +++ b/plugins/python-build/share/python-build/3.3.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#671dc3632f311e63c6733703aa0a1ad90c99277ddc8299d39e487718a50319bd" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.2 b/plugins/python-build/share/python-build/3.3.2 index 06f3dc3c..0455f49b 100644 --- a/plugins/python-build/share/python-build/3.3.2 +++ b/plugins/python-build/share/python-build/3.3.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#de664fca3b8e0ab20fb42bfed1a36e26f116f1853e88ada12dbc938761036172" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.3 b/plugins/python-build/share/python-build/3.3.3 index 77027efc..2d2b2716 100644 --- a/plugins/python-build/share/python-build/3.3.3 +++ b/plugins/python-build/share/python-build/3.3.3 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#30b60839bfe0ae8a2dba11e909328459bb8ee4a258afe7494b06b2ceda080efc" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.4 b/plugins/python-build/share/python-build/3.3.4 index 320a2952..30c2c2b1 100644 --- a/plugins/python-build/share/python-build/3.3.4 +++ b/plugins/python-build/share/python-build/3.3.4 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.4" "http://python.org/ftp/python/3.3.4/Python-3.3.4.tgz#ea055db9dd004a6ecd7690abc9734573763686dd768122316bae2dfd026412af" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.5 b/plugins/python-build/share/python-build/3.3.5 index 57eacdab..e7ffccc4 100644 --- a/plugins/python-build/share/python-build/3.3.5 +++ b/plugins/python-build/share/python-build/3.3.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.5" "http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz#916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.3.6 b/plugins/python-build/share/python-build/3.3.6 index 7f0aff77..069a5a04 100644 --- a/plugins/python-build/share/python-build/3.3.6 +++ b/plugins/python-build/share/python-build/3.3.6 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.3.6" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6.tgz#0a58ad1f1def4ecc90b18b0c410a3a0e1a48cf7692c75d1f83d0af080e5d2034" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/3.4-dev b/plugins/python-build/share/python-build/3.4-dev index b7d90ee8..7dd08510 100644 --- a/plugins/python-build/share/python-build/3.4-dev +++ b/plugins/python-build/share/python-build/3.4-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34 ensurepip diff --git a/plugins/python-build/share/python-build/3.4.0 b/plugins/python-build/share/python-build/3.4.0 index 7b14e2a7..695ccdaa 100644 --- a/plugins/python-build/share/python-build/3.4.0 +++ b/plugins/python-build/share/python-build/3.4.0 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.4.0" "https://www.python.org/ftp/python/3.4.0/Python-3.4.0.tgz#d2c83ea0217769a73e8b1ee33ffbca814903f8568e30f8d13e68e3d1f743449c" ldflags_dirs standard verify_py34 ensurepip diff --git a/plugins/python-build/share/python-build/3.4.1 b/plugins/python-build/share/python-build/3.4.1 index 3d6f4265..ce7da4fa 100644 --- a/plugins/python-build/share/python-build/3.4.1 +++ b/plugins/python-build/share/python-build/3.4.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.4.1" "https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz#8d007e3ef80b128a292be101201e75dec5480e5632e994771e7c231d17720b66" ldflags_dirs standard verify_py34 ensurepip diff --git a/plugins/python-build/share/python-build/3.4.2 b/plugins/python-build/share/python-build/3.4.2 index c03b1be5..63d09eff 100644 --- a/plugins/python-build/share/python-build/3.4.2 +++ b/plugins/python-build/share/python-build/3.4.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc 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-3.4.2" "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tgz#44a3c1ef1c7ca3e4fd25242af80ed72da941203cb4ed1a8c1b724d9078965dd8" ldflags_dirs standard verify_py34 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7-dev b/plugins/python-build/share/python-build/stackless-2.7-dev index 680673e1..31afccda 100644 --- a/plugins/python-build/share/python-build/stackless-2.7-dev +++ b/plugins/python-build/share/python-build/stackless-2.7-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.2 b/plugins/python-build/share/python-build/stackless-2.7.2 index d5e8cc6c..9cc8f0d6 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.2 +++ b/plugins/python-build/share/python-build/stackless-2.7.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#e2e2706b22839e3e3f45085d0ec8030dd7374d8a65d3297981b7189a7c613197" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.3 b/plugins/python-build/share/python-build/stackless-2.7.3 index f50b321c..cf15ab06 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.3 +++ b/plugins/python-build/share/python-build/stackless-2.7.3 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-273-export" "http://www.stackless.com/binaries/stackless-273-export.tar.bz2#77bee863bfd16dc4eca7fc078b12db608db7dd6e2481981bb68250118e001dfc" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.4 b/plugins/python-build/share/python-build/stackless-2.7.4 index 5c2fb5b9..b1d386ec 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.4 +++ b/plugins/python-build/share/python-build/stackless-2.7.4 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-274-export" "http://www.stackless.com/binaries/stackless-274-export.tar.bz2#ba566b18c66b095b65addbcfc4d814fc84f163c9fcffa1d0678755c581e64f45" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.5 b/plugins/python-build/share/python-build/stackless-2.7.5 index 8df82d4f..a391b0c4 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.5 +++ b/plugins/python-build/share/python-build/stackless-2.7.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-275-export" "http://www.stackless.com/binaries/stackless-275-export.tar.bz2#5a389357762b32c590e1154a86b098cc379c71d10238b458a3e9b4fa4aac60d4" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.6 b/plugins/python-build/share/python-build/stackless-2.7.6 index b3a27734..ac62b2ff 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.6 +++ b/plugins/python-build/share/python-build/stackless-2.7.6 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-276-export" "http://www.stackless.com/binaries/stackless-276-export.tar.bz2#1e905deaf74e8922f49b99139aa48e6670e9456c55fec8e60c47501f78c38ff5" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.7 b/plugins/python-build/share/python-build/stackless-2.7.7 index ecec172d..915c1168 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.7 +++ b/plugins/python-build/share/python-build/stackless-2.7.7 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-dev-stackless-a182f63395c3" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.7-slp.tar.bz2#88ca1169d878fd860f6d04d9e509399f2bc25ec0b692fd5998640c5d0d489c85" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-2.7.8 b/plugins/python-build/share/python-build/stackless-2.7.8 index 549b7a3b..72e3e56d 100644 --- a/plugins/python-build/share/python-build/stackless-2.7.8 +++ b/plugins/python-build/share/python-build/stackless-2.7.8 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-dev-stackless-ff29dd4f67de" "https://bitbucket.org/stackless-dev/stackless/get/v2.7.8-slp.tar.bz2#4d61c630c9a6c445b03c3b1a7d2391d5014a89d55b6d9d94be561fea34f158dc" ldflags_dirs standard verify_py27 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.2-dev b/plugins/python-build/share/python-build/stackless-3.2-dev index cbea35b2..76c5b6db 100644 --- a/plugins/python-build/share/python-build/stackless-3.2-dev +++ b/plugins/python-build/share/python-build/stackless-3.2-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "stackless-3.2-dev" "http://hg.python.org/stackless" "3.2-slp" standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.2.2 b/plugins/python-build/share/python-build/stackless-3.2.2 index ee7b8dbe..5b0fb4de 100644 --- a/plugins/python-build/share/python-build/stackless-3.2.2 +++ b/plugins/python-build/share/python-build/stackless-3.2.2 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-322-export" "http://www.stackless.com/binaries/stackless-322-export.tar.bz2#779700f12b451a350fe7af4cd2849842adc7006dc83fe14712dd1a0999277b07" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.2.5 b/plugins/python-build/share/python-build/stackless-3.2.5 index f5892a9a..ef1aed8e 100644 --- a/plugins/python-build/share/python-build/stackless-3.2.5 +++ b/plugins/python-build/share/python-build/stackless-3.2.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-325-export" "http://www.stackless.com/binaries/stackless-325-export.tar.bz2#b021125e578ddd267d38feee9e1cbdb675f6aab247a2b88f4494abcf23babb05" ldflags_dirs standard verify_py32 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.3-dev b/plugins/python-build/share/python-build/stackless-3.3-dev index 87c4a8d9..aca727c7 100644 --- a/plugins/python-build/share/python-build/stackless-3.3-dev +++ b/plugins/python-build/share/python-build/stackless-3.3-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "stackless-3.3-dev" "http://hg.python.org/stackless" "3.3-slp" standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.3.5 b/plugins/python-build/share/python-build/stackless-3.3.5 index 681d80e9..6c9e535a 100644 --- a/plugins/python-build/share/python-build/stackless-3.3.5 +++ b/plugins/python-build/share/python-build/stackless-3.3.5 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-dev-stackless-c856cc204b1c" "https://bitbucket.org/stackless-dev/stackless/get/v3.3.5-slp.tar.bz2#197b41ccd7ec998ff612c67df9b8eb827a58f4eda715ca034c43c94bf17d5c0f" ldflags_dirs standard verify_py33 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-3.4.1 b/plugins/python-build/share/python-build/stackless-3.4.1 index c6a596bb..7c133c29 100644 --- a/plugins/python-build/share/python-build/stackless-3.4.1 +++ b/plugins/python-build/share/python-build/stackless-3.4.1 @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_package "stackless-dev-stackless-983d1323d146" "https://bitbucket.org/stackless-dev/stackless/get/v3.4.1-slp.tar.bz2#cae24c9d1d9b9ffd27d3ed0d9baae980df4a55fb27c497ef939709a3950ba538" ldflags_dirs standard verify_py34 ensurepip diff --git a/plugins/python-build/share/python-build/stackless-dev b/plugins/python-build/share/python-build/stackless-dev index 70aa369e..ac88fcbd 100644 --- a/plugins/python-build/share/python-build/stackless-dev +++ b/plugins/python-build/share/python-build/stackless-dev @@ -1,3 +1,3 @@ -require_cc +#require_gcc install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline install_hg "stackless-dev" "http://hg.python.org/stackless" "default" standard verify_py33 ensurepip diff --git a/plugins/python-build/test/build.bats b/plugins/python-build/test/build.bats index 210a91b7..1b9724f5 100644 --- a/plugins/python-build/test/build.bats +++ b/plugins/python-build/test/build.bats @@ -4,6 +4,7 @@ load test_helper export PYTHON_BUILD_CACHE_PATH="$TMP/cache" export MAKE=make export MAKE_OPTS="-j 2" +export CC=cc setup() { mkdir -p "$INSTALL_ROOT" @@ -216,7 +217,10 @@ OUT @test "number of CPU cores defaults to 2" { cached_tarball "Python-3.2.1" + # yyuu/pyenv#222 stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 10.10' + stub uname '-s : echo Darwin' stub sysctl false stub_make_install @@ -241,7 +245,10 @@ OUT @test "number of CPU cores is detected on Mac" { cached_tarball "Python-3.2.1" + # yyuu/pyenv#222 stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 10.10' + stub uname '-s : echo Darwin' stub sysctl '-n hw.ncpu : echo 4' stub_make_install @@ -271,6 +278,9 @@ OUT stub sysctl '-n hw.ncpu : echo 1' stub_make_install + # yyuu/pyenv#222 + stub uname '-s : echo FreeBSD' + export -n MAKE_OPTS run_inline_definition < "$INSTALL_ROOT/build.log" -DEF - assert_success - - assert_build_log < "$INSTALL_ROOT/build.log" -DEF - assert_success - - assert_build_log < Date: Tue, 4 Nov 2014 00:14:24 -0800 Subject: [PATCH 3/3] Need to chdir before running tests of `python-build` --- .travis.yml | 4 ++-- Makefile | 3 ++- script/test | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100755 script/test diff --git a/.travis.yml b/.travis.yml index 46f4fc37..62059e3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ -install: git clone https://github.com/sstephenson/bats.git -script: bats/bin/bats --tap test plugins/python-build/test +install: git clone --depth 1 https://github.com/sstephenson/bats.git +script: script/test language: c notifications: email: diff --git a/Makefile b/Makefile index fc3a6032..ef8946e6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ test: build/bats/bin/bats - build/bats/bin/bats --tap test plugins/python-build/test + build/bats/bin/bats --tap test + cd plugins/python-build && $(PWD)/build/bats/bin/bats --tap test build/bats/bin/bats: git clone https://github.com/sstephenson/bats.git build/bats diff --git a/script/test b/script/test new file mode 100755 index 00000000..2764644d --- /dev/null +++ b/script/test @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -e + +[ -d ./bats/bin ] && export PATH="$(pwd)"/bats/bin:"$PATH" + +STATUS=0 +bats -t test && ( cd plugins/python-build && bats -t test ) || STATUS="$?" + +#if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -z "$TRAVIS_COMMIT_RANGE" ]; then +# first_sha="$(curl -fsSL https://github.com/${TRAVIS_REPO_SLUG}/pull/${TRAVIS_PULL_REQUEST}.patch | head -1 | awk '{print $2}')" +# export TRAVIS_COMMIT_RANGE="${first_sha}^..${TRAVIS_COMMIT}" +#fi + +#if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then +# ./script/mirror update "$TRAVIS_COMMIT_RANGE" +#elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then +# ./script/mirror verify "$TRAVIS_COMMIT_RANGE" +#fi + +exit "$STATUS"