Merge branch 'master' into devel

* master:
  TST: add tests for PyPy fill code

common_utils.sh

@@ -268,24 +268,26 @@ PYPY_URL=https://bitbucket.org/pypy/pypy/downloads
 # As of 2017-03-25, the latest verions of PyPy.
 LATEST_PP_1=1.9
 
-LATEST_PP_2=2.6
 LATEST_PP_2p0=2.0.2
+# No minor version numbers for 2.1
+LATEST_PP_2p1=2.1
 LATEST_PP_2p2=2.2.1
 LATEST_PP_2p3=2.3.1
 LATEST_PP_2p4=2.4.0
 LATEST_PP_2p5=2.5.1
 LATEST_PP_2p6=2.6.1
+LATEST_PP_2=$LATEST_PP_2p6
 
-LATEST_PP_4=4.0
 LATEST_PP_4p0=4.0.1
+LATEST_PP_4=$LATEST_PP_4p0
 
-LATEST_PP_5=5.7
 LATEST_PP_5p0=5.0.1
 LATEST_PP_5p1=5.1.1
 LATEST_PP_5p3=5.3.1
 LATEST_PP_5p4=5.4.1
 LATEST_PP_5p6=5.6.0
 LATEST_PP_5p7=5.7.0
+LATEST_PP_5=$LATEST_PP_5p7
 
 function unroll_version {
     # Convert major or major.minor format to major.minor.micro using the above

tests/test_fill_pypy_ver.sh

+# Test Python version fill utility, for pypy
+[ "$(fill_pypy_ver 1)" == $LATEST_PP_1 ] || ingest "lpp1"
+[ "$(fill_pypy_ver 2)" == $LATEST_PP_2 ] || ingest "lpp2"
+[ "$(fill_pypy_ver 4)" == $LATEST_PP_4 ] || ingest "lpp4"
+[ "$(fill_pypy_ver 5)" == $LATEST_PP_5 ] || ingest "lpp5"
+[ "$(fill_pypy_ver 2.0)" == $LATEST_PP_2p0 ] || ingest
+[ "$(fill_pypy_ver 2.2)" == $LATEST_PP_2p2 ] || ingest
+[ "$(fill_pypy_ver 2.3)" == $LATEST_PP_2p3 ] || ingest
+[ "$(fill_pypy_ver 2.4)" == $LATEST_PP_2p4 ] || ingest
+[ "$(fill_pypy_ver 2.5)" == $LATEST_PP_2p5 ] || ingest
+[ "$(fill_pypy_ver 2.6)" == $LATEST_PP_2p6 ] || ingest
+[ "$(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
+[ "$(fill_pypy_ver 5.3)" == $LATEST_PP_5p3 ] || ingest
+[ "$(fill_pypy_ver 5.4)" == $LATEST_PP_5p4 ] || ingest
+[ "$(fill_pypy_ver 5.6)" == $LATEST_PP_5p6 ] || ingest
+[ "$(fill_pypy_ver 5.7)" == $LATEST_PP_5p7 ] || ingest
+[ "$(fill_pypy_ver 2.6.1)" == "2.6.1" ] || ingest
+[ "$(fill_pypy_ver 4.0.1)" == "4.0.1" ] || ingest
+[ "$(fill_pypy_ver 5.0.1)" == "5.0.1" ] || ingest

tests/test_multibuild.sh

@@ -9,6 +9,7 @@ if [ -n "$IS_OSX" ]; then
     get_macpython_environment $PYTHON_VERSION $VENV
     source tests/test_python_install.sh
     source tests/test_fill_pyver.sh
+    source tests/test_fill_pypy_ver.sh
     source tests/test_osx_utils.sh
 else
     source manylinux_utils.sh