Merge branch 'devel'

* devel:
  Add Python 3.7 test.
  Add extra test for fill of Python version
  Added Python 3.7
  Updated Python versions
  Updated redirected URL
  Added Xcode 9.4 Travis build
  NF: add distutils platform check

Author: matthew-brett

.travis.yml

@@ -73,7 +73,11 @@ matrix:
         - VENV=venv
     - os: osx
       env:
-        - PYTHON_VERSION=3.6
+        - PYTHON_VERSION=3.7
+        - VENV=venv
+    - os: osx
+      env:
+        - PYTHON_VERSION=3.7
         - VENV=venv
         - USE_CCACHE=1
     - os: osx
@@ -114,6 +118,10 @@ matrix:
         - VENV=venv
     # Default OSX (xcode image) is 10.12 (xcode 8.3.3) as of 2018-03-29
     # See: https://docs.travis-ci.com/user/reference/osx/
+    - os: osx
+      osx_image: xcode9.4
+      env:
+        - PYTHON_VERSION=3.5
     - os: osx
       osx_image: xcode9.3
       env:

common_utils.sh

@@ -299,6 +299,12 @@ function get_platform {
     python -c 'import platform; print(platform.uname()[4])'
 }
 
+function get_distutils_platform {
+    # Report platform as given by distutils get_platform.
+    # This is the platform tag that pip will use.
+    python -c "import distutils.util; print(distutils.util.get_platform())"
+}
+
 function install_wheel {
     # Install test dependencies and built wheel
     #

library_builders.sh

@@ -225,7 +225,7 @@ function build_hdf5 {
     build_zlib
     # libaec is a drop-in replacement for szip
     build_libaec
-    local hdf5_url=https://www.hdfgroup.org/ftp/HDF5/releases
+    local hdf5_url=https://support.hdfgroup.org/ftp/HDF5/releases
     local short=$(echo $HDF5_VERSION | awk -F "." '{printf "%d.%d", $1, $2}')
     fetch_unpack $hdf5_url/hdf5-$short/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.gz
     (cd hdf5-$HDF5_VERSION \

osx_utils.sh

@@ -12,7 +12,7 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
 DOWNLOADS_SDIR=downloads
 WORKING_SDIR=working
 
-# As of 1 May 2018 - latest Python of each version with binary download
+# As of 28 June 2018 - latest Python of each version with binary download
 # available.
 # See: https://www.python.org/downloads/mac-osx/
 LATEST_2p7=2.7.15
@@ -21,7 +21,8 @@ LATEST_3p2=3.2.5
 LATEST_3p3=3.3.5
 LATEST_3p4=3.4.4
 LATEST_3p5=3.5.4
-LATEST_3p6=3.6.5
+LATEST_3p6=3.6.6
+LATEST_3p7=3.7.0
 
 
 function check_python {
@@ -80,7 +81,9 @@ function fill_pyver {
         echo $LATEST_2p7
     elif [ $ver == "2.6" ]; then
         echo $LATEST_2p6
-    elif [ $ver == 3 ] || [ $ver == "3.6" ]; then
+    elif [ $ver == 3 ] || [ $ver == "3.7" ]; then
+        echo $LATEST_3p7
+    elif [ $ver == "3.6" ]; then
         echo $LATEST_3p6
     elif [ $ver == "3.5" ]; then
         echo $LATEST_3p5

tests/test_common_utils.sh

@@ -88,3 +88,7 @@ set_opts $ORIG_OPTS
 
 # On Linux docker containers in travis, can only be x86_64 or i686
 [ "$(get_platform)" == x86_64 ] || [ "$(get_platform)" == i686 ] || exit 1
+
+# Crudest possible check for get_distutils_platform
+expected=$(python -c "import distutils.util as du; print(du.get_platform())")
+[ "$(get_distutils_platform)" == "$expected" ] || ingest "bad distutils platform"

tests/test_fill_pyver.sh

@@ -4,7 +4,9 @@
 [ "$(fill_pyver 2.7.8)" == "2.7.8" ] || ingest
 [ "$(fill_pyver 2.6)" == $LATEST_2p6 ] || ingest
 [ "$(fill_pyver 2.6.2)" == "2.6.2" ] || ingest
-[ "$(fill_pyver 3)" == $LATEST_3p6 ] || ingest
+[ "$(fill_pyver 3)" == $LATEST_3p7 ] || ingest
+[ "$(fill_pyver 3.7.0)" == "3.7.0" ] || ingest
+[ "$(fill_pyver 3.7)" == $LATEST_3p7 ] || ingest
 [ "$(fill_pyver 3.6)" == $LATEST_3p6 ] || ingest
 [ "$(fill_pyver 3.6.0)" == "3.6.0" ] || ingest
 [ "$(fill_pyver 3.5)" == $LATEST_3p5 ] || ingest