Unverified Commit 63c1418e authored by Andrew Murray's avatar Andrew Murray Committed by GitHub
Browse files

Merge pull request #374 from mattip/pypy733

Update latest PyPy version
parents bfc6d8b8 3794ff52
...@@ -409,7 +409,7 @@ function fill_submodule { ...@@ -409,7 +409,7 @@ function fill_submodule {
(cd "$repo_dir" && git remote set-url origin $origin_url) (cd "$repo_dir" && git remote set-url origin $origin_url)
} }
# As of 2020-04-14, the latest versions of PyPy. # The latest versions of PyPy.
LATEST_PP_5p0=5.0.1 LATEST_PP_5p0=5.0.1
LATEST_PP_5p1=5.1.1 LATEST_PP_5p1=5.1.1
LATEST_PP_5p3=5.3.1 LATEST_PP_5p3=5.3.1
...@@ -426,7 +426,7 @@ LATEST_PP_6=$LATEST_PP_6p0 ...@@ -426,7 +426,7 @@ LATEST_PP_6=$LATEST_PP_6p0
LATEST_PP_7p0=7.0.0 LATEST_PP_7p0=7.0.0
LATEST_PP_7p1=7.1.1 LATEST_PP_7p1=7.1.1
LATEST_PP_7p2=7.2.0 LATEST_PP_7p2=7.2.0
LATEST_PP_7p3=7.3.1 LATEST_PP_7p3=7.3.3
LATEST_PP_7=$LATEST_PP_7p3 LATEST_PP_7=$LATEST_PP_7p3
function unroll_version { function unroll_version {
......
...@@ -57,7 +57,11 @@ else # not virtualenv ...@@ -57,7 +57,11 @@ else # not virtualenv
bin_name="python$python_mm" bin_name="python$python_mm"
else # pypy else # pypy
macpie_bin="$PWD/pypy$python_mm-v$implementer_version-osx64/bin" macpie_bin="$PWD/pypy$python_mm-v$implementer_version-osx64/bin"
bin_name="pypy" if [ "$(lex_ver $implementer_version)" -ge "$(lex_ver 7.3.2)" ]; then
bin_name="pypy3"
else
bin_name="pypy"
fi
fi fi
if [ "$PYTHON_EXE" != "$macpie_bin/$bin_name" ]; then if [ "$PYTHON_EXE" != "$macpie_bin/$bin_name" ]; then
ingest "Wrong macpython python cmd '$PYTHON_EXE'" ingest "Wrong macpython python cmd '$PYTHON_EXE'"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment