Merge branch 'devel' into ubuntu-step-up

# Conflicts:
#	README.rst

.travis.yml

@@ -19,21 +19,18 @@ matrix:
       dist: xenial
       env:
         - TEST_BUILDS=1
-      sudo: required
     # 32-bit builds
     - os: linux
       dist: xenial
       env:
         - TEST_BUILDS=1
         - PLAT=i686
-      sudo: required
     # Builds with caching
     - os: linux
       dist: xenial
       env:
         - TEST_BUILDS=1
         - USE_CCACHE=1
-      sudo: required
     # OSX builds
     - os: osx
       osx_image: xcode6.4
@@ -108,6 +105,10 @@ matrix:
       env:
         - PYTHON_VERSION=pypy-6.0
         - VENV=venv
+    - os: osx
+      env:
+        - PYTHON_VERSION=pypy-7.0
+        - VENV=venv
     # Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
     # See: https://docs.travis-ci.com/user/reference/osx/
     - os: osx

README.rst

@@ -189,7 +189,6 @@ To use these scripts
     # The Travis Python version is unrelated to the version we build and test
     # with.  This is set with the MB_PYTHON_VERSION variable.
     python: 3.5
-    sudo: required
     dist: xenial
     services: docker
 

common_utils.sh

@@ -359,7 +359,7 @@ function fill_submodule {
 
 PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
 
-# As of 2018-04-25, the latest verions of PyPy.
+# As of 2019-02-07, the latest verions of PyPy.
 LATEST_PP_4p0=4.0.1
 LATEST_PP_4=$LATEST_PP_4p0
 
@@ -377,6 +377,9 @@ LATEST_PP_5=$LATEST_PP_5p10
 LATEST_PP_6p0=6.0.0
 LATEST_PP_6=$LATEST_PP_6p0
 
+LATEST_PP_7p0=7.0.0
+LATEST_PP_7=$LATEST_PP_7p0
+
 function unroll_version {
     # Convert major or major.minor format to major.minor.micro using the above
     # values recursively
@@ -413,7 +416,9 @@ function get_pypy_build_prefix {
     if [[ $version =~ ([0-9]+)\.([0-9]+) ]]; then
         local major=${BASH_REMATCH[1]}
         local minor=${BASH_REMATCH[2]}
-        if (( $major > 5 || ($major == 5 && $minor >= 3) )); then
+        if (( $major > 6 )); then
+            echo "pypy2.7-v"
+        elif (( $major > 5 || ($major == 5 && $minor >= 3) )); then
             echo "pypy2-v"
         else
             echo "pypy-"

library_builders.sh

@@ -41,9 +41,9 @@ FLEX_VERSION=${FLEX_VERSION:-2.6.4}
 BISON_VERSION=${BISON_VERSION:-3.0.4}
 FFTW_VERSION=${FFTW_VERSION:-3.3.7}
 CFITSIO_VERSION=${CFITSIO_VERSION:-3370}
-OPENSSL_ROOT=openssl-1.0.2l
+OPENSSL_ROOT=openssl-1.0.2q
 # Hash from https://www.openssl.org/source/openssl-1.0.2?.tar.gz.sha256
-OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c
+OPENSSL_HASH=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684
 OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source
 
 

osx_utils.sh

@@ -12,14 +12,14 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
 DOWNLOADS_SDIR=downloads
 WORKING_SDIR=working
 
-# As of 20 October 2018 - latest Python of each version with binary download
+# As of 25 December 2018 - latest Python of each version with binary download
 # available.
 # See: https://www.python.org/downloads/mac-osx/
 LATEST_2p7=2.7.15
 LATEST_3p4=3.4.4
 LATEST_3p5=3.5.4
-LATEST_3p6=3.6.7
-LATEST_3p7=3.7.1
+LATEST_3p6=3.6.8
+LATEST_3p7=3.7.2
 
 
 function check_python {

tests/test_fill_pypy_ver.sh

@@ -2,6 +2,7 @@
 [ "$(fill_pypy_ver 4)" == $LATEST_PP_4 ] || ingest "lpp4"
 [ "$(fill_pypy_ver 5)" == $LATEST_PP_5 ] || ingest "lpp5"
 [ "$(fill_pypy_ver 6)" == $LATEST_PP_6 ] || ingest "lpp6"
+[ "$(fill_pypy_ver 7)" == $LATEST_PP_7 ] || ingest "lpp7"
 [ "$(fill_pypy_ver 4.0)" == $LATEST_PP_4p0 ] || ingest
 [ "$(fill_pypy_ver 5.0)" == $LATEST_PP_5p0 ] || ingest
 [ "$(fill_pypy_ver 5.1)" == $LATEST_PP_5p1 ] || ingest
@@ -13,5 +14,6 @@
 [ "$(fill_pypy_ver 5.9)" == $LATEST_PP_5p9 ] || ingest
 [ "$(fill_pypy_ver 5.10)" == $LATEST_PP_5p10 ] || ingest
 [ "$(fill_pypy_ver 6.0)" == $LATEST_PP_6p0 ] || ingest
+[ "$(fill_pypy_ver 7.0)" == $LATEST_PP_7p0 ] || ingest
 [ "$(fill_pypy_ver 4.0.1)" == "4.0.1" ] || ingest
 [ "$(fill_pypy_ver 5.0.1)" == "5.0.1" ] || ingest

tests/test_library_builders.sh

@@ -18,7 +18,7 @@ suppress build_swig
 # E.g. arb (below) requires a couple of other libraries.
 # Run here just for the output, even though they fail.
 (set +e ;
-    build_github fredrik-johansson/arb 2.15.0 ;
+    build_github fredrik-johansson/arb 2.16.0 ;
     build_github glennrp/libpng v1.6.36 ;
     build_github wbhart/mpir mpir-3.0.0
     )