Resolve merge conflict with

Author: BanzaiMan

.travis.yml

@@ -11,37 +11,52 @@ matrix:
       env:
         - RELEASE=precise
     - os: osx
+      osx_image: xcode8.2
       env:
-        - RELEASE=mavericks
+        - RELEASE=sierra
+    - os: osx
+      osx_image: xcode7.3
+      env:
+        - RELEASE=sierra
+    - os: osx
+      osx_image: xcode6.4
+      env:
+        - RELEASE=yosemite
 
 env:
   global:
     - VERSION='3.6-dev'
     - ALIAS='nightly'
 
 install:
-  - pushd /opt/pyenv/
-  - sudo git checkout master
-  - sudo git pull
-  - popd
+- pushd /opt/pyenv/
+- sudo git checkout master
+- sudo git pull
+- popd
+- python -m pip install virtualenv
 
 before_script:
-  - 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
-  - export LSB_RELEASE=$(lsb_release -rs 2>/dev/null || sw_vers -productVersion | sed 's/^\([0-9][0-9]*.[0-9][0-9]*\).*/\1/')
-  - 'export OS_NAME=${OS_NAME:-$((lsb_release -is || echo "osx") | tr "A-Z" "a-z")}'
-  - 'export ARCH=${ARCH:-$(uname -m)}'
-  - 'export PACKAGES=${PACKAGES:-pip numpy nose pytest mock wheel}'
+- 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
+- 'export LSB_RELEASE=${LSB_RELEASE:-$(lsb_release -rs || echo ${$(sw_vers -productVersion)%*.*})}'
+- 'export OS_NAME=${OS_NAME:-$(lsb_release -is | tr "A-Z" "a-z" || echo "osx")}'
+- 'export ARCH=${ARCH:-$(uname -m)}'
+- 'export PACKAGES=${PACKAGES:-pip nose pytest mock wheel}'
+- 'export CPYTHON_ONLY_PKGS="numpy"'
+- export PYTHON_CONFIGURE_OPTS="--with-wide-unicode --enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos $CONFIGURE_OPTS"
 
-script: ./build-python
+script: ./bin/compile
 
-after_success: ./create-archive
+after_success: ./bin/archive
 
-after_failure:
-  - cat /tmp/python-build.*.log
+after_failure: cat /tmp/python-build.*.log
 
 addons:
+  apt:
+    packages:
+      - openssl
   artifacts:
     paths:
     - $LSB_RELEASE/
     target_paths:
     - /binaries/$OS_NAME/$LSB_RELEASE/$ARCH
+

README.md

@@ -1,2 +1,3 @@
-# cpython-builder
+# `cpython-builder`
+
 Clones and builds CPython using `python-build`

bin/archive

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+if [[ ! $LSB_RELEASE ]] ; then
+  echo 'Missing LSB_RELEASE'
+  exit 1
+fi
+
+if [[ ! $INSTALL_DEST ]] ; then
+  echo 'Missing INSTALL_DEST'
+  exit 1
+fi
+
+if [[ ! $VERSION ]] ; then
+  echo 'Missing VERSION'
+  exit 1
+fi
+
+set -o xtrace
+
+: ${TAR_PATHS:=$INSTALL_DEST/$VERSION}
+: ${DESTS:=}
+
+if [[ $VERSION =~ ^python|pypy ]] ; then
+  VERSION="${VERSION}"
+  SHORT_VERSION="${VERSION}"
+else
+  SHORT_VERSION="python${VERSION}"
+  VERSION="python-${VERSION}"
+fi
+
+TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$VERSION $HOME/virtualenv/${SHORT_VERSION}"
+DESTS="$TRAVIS_BUILD_DIR/$LSB_RELEASE/${VERSION}.tar.bz2"
+
+if [[ $ALIAS ]] ; then
+  if [[ $ALIAS =~ ^python|pypy ]] ; then
+    SHORT_ALIAS="${ALIAS}"
+    LONG_ALIAS="${ALIAS}"
+  else
+    SHORT_ALIAS="python${ALIAS}"
+    LONG_ALIAS="python-${ALIAS}"
+  fi
+  TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$ALIAS $HOME/virtualenv/${SHORT_ALIAS}"
+  DESTS="$DESTS $TRAVIS_BUILD_DIR/$LSB_RELEASE/${LONG_ALIAS}.tar.bz2"
+fi
+
+for DEST in $DESTS ; do
+  mkdir -p $(dirname $DEST)
+  tar -cjf $DEST $(ls -d $TAR_PATHS 2>/dev/null || true)
+
+  pushd $(dirname $DEST) &>/dev/null
+
+  shopt -s nullglob
+  for f in *.* ; do
+    sha256sum $f > ${f}.sha256sum.txt
+  done
+
+  popd &>/dev/null
+
+  echo "---> $DEST"
+done

bin/compile

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+if [[ ! $INSTALL_DEST ]] ; then
+  echo 'Missing INSTALL_DEST'
+  exit 1
+fi
+
+if [[ ! $VERSION ]] ; then
+  echo 'Missing $VERSION'
+  exit 1
+fi
+
+function install_numpy() {
+  if [[ $VERSION == pypy* ]]; then
+    $HOME/virtualenv/$VIRTENV_VERSION/bin/pypy -m ensurepip
+  fi
+  $HOME/virtualenv/$VIRTENV_VERSION/bin/pip install --upgrade numpy
+}
+
+set -o xtrace
+
+sudo env PYTHON_BUILD_ROOT=/opt/pyenv/plugins/python-build \
+  /opt/pyenv/plugins/python-build/bin/python-build $VERSION $INSTALL_DEST/$VERSION
+
+if [[ $ALIAS ]] ; then
+  rm -f $INSTALL_DEST/$ALIAS
+  sudo ln -sf $INSTALL_DEST/$VERSION $INSTALL_DEST/$ALIAS
+fi
+
+# set up virtualenv arguments
+if [[ $VERSION = pypy-* ]]; then
+  PYTHON_BIN=pypy
+  VIRTENV_VERSION=$VERSION
+elif [[ $VERSION = pypy3* ]]; then
+  PYTHON_BIN=pypy3
+  VIRTENV_VERSION=$VERSION
+else
+  PYTHON_BIN=python
+  VIRTENV_VERSION=python$VERSION
+fi
+
+virtualenv --distribute --python=$INSTALL_DEST/$VERSION/bin/python \
+  $HOME/virtualenv/$VIRTENV_VERSION
+
+if [[ $ALIAS ]] ; then
+  rm -f $HOME/virtualenv/python$ALIAS
+  ln -sf $HOME/virtualenv/$VIRTENV_VERSION $HOME/virtualenv/python$ALIAS
+fi
+
+$HOME/virtualenv/$VIRTENV_VERSION/bin/python -c "import sys; assert sys.maxunicode > 65535"
+
+if [[ $PACKAGES ]] ; then
+  $HOME/virtualenv/$VIRTENV_VERSION/bin/pip install --upgrade $PACKAGES
+fi
+
+install_numpy
+