Merge branch 'master' into xcode94

.travis.yml

@@ -5,7 +5,7 @@ env:
       - PLAT=x86_64
       - UNICODE_WIDTH=32
       - BUILD_DEPENDS=""
-      - TEST_DEPENDS="pytest pytest-cov numpy scipy"
+      - TEST_DEPENDS="pytest pytest-cov numpy scipy wheel==0.31.1"
       - MACOSX_DEPLOYMENT_TARGET=10.10
       - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
       # Following generated with

config.sh

@@ -75,3 +75,33 @@ function run_tests {
     fi
     return $ret
 }
+
+# Custom functions to temporarily pin wheel to 0.31.1
+if [ -n "$IS_OSX" ]; then
+	function before_install {
+		brew cask uninstall oclint || true
+		export CC=clang
+		export CXX=clang++
+		get_macpython_environment $MB_PYTHON_VERSION venv
+		source venv/bin/activate
+		pip install --upgrade pip
+		pip install wheel==0.31.1
+	}
+else
+	function build_wheel_cmd {
+		local cmd=${1:-pip_wheel_cmd}
+		local repo_dir=${2:-$REPO_DIR}
+		[ -z "$repo_dir" ] && echo "repo_dir not defined" && exit 1
+		local wheelhouse=$(abspath ${WHEEL_SDIR:-wheelhouse})
+		start_spinner
+		if [ -n "$(is_function "pre_build")" ]; then pre_build; fi
+		stop_spinner
+		if [ -n "$BUILD_DEPENDS" ]; then
+			pip install $(pip_opts) $BUILD_DEPENDS
+		fi
+		/opt/python/cp36-cp36m/bin/pip3 install wheel==0.31.1
+		(cd $repo_dir && $cmd $wheelhouse)
+		pip show wheel
+		repair_wheelhouse $wheelhouse
+	}	
+fi