Merge pull request #226 from radarhere/pypy

Added pypy 7.0

.travis.yml

@@ -108,6 +108,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

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-"

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