diff --git a/CHANGELOG.md b/CHANGELOG.md index f4c20e8..def6546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- PyPy 2.7 and 3.6, version 7.3.2 are now available (Note: PyPy support is in beta) (#1081). ## v180 (2020-09-24) diff --git a/bin/default_pythons b/bin/default_pythons index 85f209a..b98efb7 100755 --- a/bin/default_pythons +++ b/bin/default_pythons @@ -12,5 +12,5 @@ LATEST_36="python-3.6.12" LATEST_35="python-3.5.10" LATEST_34="python-3.4.10" LATEST_27="python-2.7.18" -LATEST_PYPY_36="pypy3.6-7.3.1" -LATEST_PYPY_27="pypy2.7-7.3.1" +LATEST_PYPY_36="pypy3.6-7.3.2" +LATEST_PYPY_27="pypy2.7-7.3.2" diff --git a/builds/runtimes/pypy2.7 b/builds/runtimes/pypy2.7 index 698aa17..c9cf1d0 100755 --- a/builds/runtimes/pypy2.7 +++ b/builds/runtimes/pypy2.7 @@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver dep_package=${dep_name}-v${dep_version} # it's always "pypy2-…" dep_dirname=${dep_package}-linux64 dep_archive_name=${dep_dirname}.tar.bz2 -dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name} +dep_url="https://downloads.python.org/pypy/${dep_archive_name}" echo "Building PyPy…" echo "${dep_url}" -curl -L "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name +curl -fL "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name ln "$OUT_PREFIX/bin/pypy" "$OUT_PREFIX/bin/python" diff --git a/builds/runtimes/pypy2.7-7.3.2 b/builds/runtimes/pypy2.7-7.3.2 new file mode 100755 index 0000000..40761e9 --- /dev/null +++ b/builds/runtimes/pypy2.7-7.3.2 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/python/ + +source $(dirname $0)/pypy2.7 diff --git a/builds/runtimes/pypy3.6 b/builds/runtimes/pypy3.6 index f24f806..d86925a 100755 --- a/builds/runtimes/pypy3.6 +++ b/builds/runtimes/pypy3.6 @@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver dep_package=${dep_name}${dep_version_prefix:-}-v${dep_version}${dep_version_suffix:-} dep_dirname=${dep_package}-linux64 dep_archive_name=${dep_dirname}.tar.bz2 -dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name} +dep_url="https://downloads.python.org/pypy/${dep_archive_name}" echo "Building PyPy3…" echo "${dep_url}" -curl -L "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name +curl -fL "${dep_url}" | tar jx -C "${OUT_PREFIX}" --strip-components 1 # extract to $OUT_PREFIX, drop the first directory level, which is the archive name ln "$OUT_PREFIX/bin/pypy3" "$OUT_PREFIX/bin/python" diff --git a/builds/runtimes/pypy3.6-7.3.2 b/builds/runtimes/pypy3.6-7.3.2 new file mode 100755 index 0000000..e429be8 --- /dev/null +++ b/builds/runtimes/pypy3.6-7.3.2 @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Build Path: /app/.heroku/python/ + +source $(dirname $0)/pypy3.6 diff --git a/test/fixtures/pypy2_7/runtime.txt b/test/fixtures/pypy2_7/runtime.txt index e3d29d3..e3930d8 100644 --- a/test/fixtures/pypy2_7/runtime.txt +++ b/test/fixtures/pypy2_7/runtime.txt @@ -1 +1 @@ -pypy2.7-7.3.1 +pypy2.7-7.3.2 diff --git a/test/fixtures/pypy3_6/runtime.txt b/test/fixtures/pypy3_6/runtime.txt index af949aa..52a99c8 100644 --- a/test/fixtures/pypy3_6/runtime.txt +++ b/test/fixtures/pypy3_6/runtime.txt @@ -1 +1 @@ -pypy3.6-7.3.1 +pypy3.6-7.3.2