Merge branch 'devel' into upstream_diagnostics

.appveyor.yml

@@ -32,11 +32,6 @@ environment:
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
 
-branches:
-  only:
-    - master
-    - devel
-
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable.
 platform:

.travis.yml

@@ -2,19 +2,10 @@
 
 language: generic
 
-branches:
-  only:
-  - master
-  - devel
-  
 cache:
   directories:
    - $HOME/.ccache
 
-env:
-  global:
-    - HOMEBREW_NO_AUTO_UPDATE=1
-
 matrix:
   include:
     - os: linux
@@ -32,11 +23,6 @@ matrix:
         - TEST_BUILDS=1
         - USE_CCACHE=1
       sudo: required
-    - os: osx
-      osx_image: xcode6.4
-      env:
-        - PYTHON_VERSION=2.7.11
-        - TEST_BUILDS=1
     - os: osx
       osx_image: xcode6.4
       env:

README.rst

@@ -322,15 +322,20 @@ To use these scripts
 
   Optionally you can specify a different location for ``config.sh`` file with
   the ``$CONFIG_PATH`` environment variable.
-  
+
 * Optionally, create an ``env_vars.sh`` file to override the defaults for any
-  environment variables used by ``configure_build.sh``/``library_builders.sh``.
-  In Linux, they cannot be just set in the initial environment because the
-  build runs in Docker, so only the variables explicitly passed to
-  ``docker run`` are propagated.
-  
-  Likewise, you can specify a different location for the file by setting the
-  the ``$ENV_VARS_PATH`` environment variable.
+  environment variables used by
+  ``configure_build.sh``/``library_builders.sh``. In Linux, the environment
+  variables used for the build cannot be set in the ``.travis.yml`` file,
+  because the build processing runs in a Docker container, so only the only
+  environment variables that reach the container are those passed in via the
+  ``docker run`` command, or those set in ``env_vars.sh``.
+
+  As for the ``config.sh`` file, you can specify a different location for the
+  file by setting the ``$ENV_VARS_PATH`` environment variable.  The path in
+  ``$ENV_VARS_PATH`` is relative to the repository root directory.  For
+  example, if your repository had a subdirectory ``scripts`` with a file
+  ``my_env_vars.sh``, you should set ``ENV_VARS_PATH=scripts/my_env_vars.sh``.
 
 * Make sure your project is set up to build on travis-ci, and you should now
   be ready (to begin the long slow debugging process, probably).

common_utils.sh

@@ -311,7 +311,7 @@ function fill_submodule {
 
 PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
 
-# As of 2017-11-19, the latest verions of PyPy.
+# As of 2018-01-14, the latest verions of PyPy.
 LATEST_PP_1=1.9
 
 LATEST_PP_2p0=2.0.2

configure_build.sh

@@ -22,6 +22,16 @@ if [ -n "$IS_OSX" ]; then
     export CFLAGS="${CFLAGS:-$ARCH_FLAGS}"
     export CXXFLAGS="${CXXFLAGS:-$ARCH_FLAGS}"
     export FFLAGS="${FFLAGS:-$ARCH_FLAGS}"
+
+    # Disable homebrew auto-update
+    export HOMEBREW_NO_AUTO_UPDATE=1
+else
+    # Strip all binaries after compilation.
+    STRIP_FLAGS=${STRIP_FLAGS:-"-Wl,-strip-all"}
+
+    export CFLAGS="${CFLAGS:-$STRIP_FLAGS}"
+    export CXXFLAGS="${CXXFLAGS:-$STRIP_FLAGS}"
+    export FFLAGS="${FFLAGS:-$STRIP_FLAGS}"
 fi
 
 # Promote BUILD_PREFIX on search path to any newly built libs

docker_build_wrap.sh

@@ -17,7 +17,8 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
 # Location of `config.sh` file, default "./config.sh"
 CONFIG_PATH=${CONFIG_PATH:-config.sh}
 
-ENV_VARS_PATH=${ENV_VARS_PATH:-env_vars.sh}
+# Path is relative to repository from which we ran
+ENV_VARS_PATH="/io/${ENV_VARS_PATH:-env_vars.sh}"
 
 # Always pull in common and library builder utils
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")

osx_utils.sh

@@ -281,9 +281,6 @@ function get_macpython_environment {
     local version=$1
     local venv_dir=$2
 
-    # We MUST set this before calling homebrew or it could potentially fail
-    # See travis-ci issue #8552 for more details
-    export HOMEBREW_NO_AUTO_UPDATE=1
 
     if [ "$USE_CCACHE" == "1" ]; then
         activate_ccache

tests/test_library_builders.sh

@@ -12,7 +12,7 @@ suppress build_libpng
 suppress build_libwebp
 suppress build_szip
 suppress build_swig
-suppress build_github fredrik-johansson/arb 2.11.1
+suppress build_github fredrik-johansson/arb 2.12.0
 suppress build_flex
 suppress build_openblas
 

travis_osx_steps.sh

@@ -18,6 +18,8 @@ source $MULTIBUILD_DIR/library_builders.sh
 # config.sh can override any function defined here.
 
 function before_install {
+    # Uninstall oclint. See Travis-CI gh-8826
+    brew cask uninstall oclint || true    
     export CC=clang
     export CXX=clang++
     get_macpython_environment $MB_PYTHON_VERSION venv