Skip to content

Commit 63651e0

Browse files
authored
Add support for PyPy 2.7 and 3.6 version 7.3.2 (#1081)
Since they were released yesterday: https://morepypy.blogspot.com/2020/09/pypy-732-triple-release-python-27-36.html The archive URL had to be updated now that PyPy has migrated from BitBucket. The new URLs are from: https://www.pypy.org/download.html Skipping PyPy 3.7 for now, since it's in alpha. Closes @W-8128094@.
1 parent c0609a8 commit 63651e0

File tree

8 files changed

+17
-8
lines changed

8 files changed

+17
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Unreleased
44

5+
- PyPy 2.7 and 3.6, version 7.3.2 are now available (Note: PyPy support is in beta) (#1081).
56

67
## v180 (2020-09-24)
78

bin/default_pythons

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ LATEST_36="python-3.6.12"
1212
LATEST_35="python-3.5.10"
1313
LATEST_34="python-3.4.10"
1414
LATEST_27="python-2.7.18"
15-
LATEST_PYPY_36="pypy3.6-7.3.1"
16-
LATEST_PYPY_27="pypy2.7-7.3.1"
15+
LATEST_PYPY_36="pypy3.6-7.3.2"
16+
LATEST_PYPY_27="pypy2.7-7.3.2"

builds/runtimes/pypy2.7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver
1313
dep_package=${dep_name}-v${dep_version} # it's always "pypy2-…"
1414
dep_dirname=${dep_package}-linux64
1515
dep_archive_name=${dep_dirname}.tar.bz2
16-
dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name}
16+
dep_url="https://downloads.python.org/pypy/${dep_archive_name}"
1717

1818
echo "Building PyPy…"
1919
echo "${dep_url}"
2020

21-
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
21+
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
2222

2323
ln "$OUT_PREFIX/bin/pypy" "$OUT_PREFIX/bin/python"

builds/runtimes/pypy2.7-7.3.2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
# Build Path: /app/.heroku/python/
3+
4+
source $(dirname $0)/pypy2.7

builds/runtimes/pypy3.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ dep_version=${dep_formula##*"/${dep_name}-"} # "subtract" our name from full ver
1313
dep_package=${dep_name}${dep_version_prefix:-}-v${dep_version}${dep_version_suffix:-}
1414
dep_dirname=${dep_package}-linux64
1515
dep_archive_name=${dep_dirname}.tar.bz2
16-
dep_url=https://bitbucket.org/pypy/pypy/downloads/${dep_archive_name}
16+
dep_url="https://downloads.python.org/pypy/${dep_archive_name}"
1717

1818
echo "Building PyPy3…"
1919
echo "${dep_url}"
2020

21-
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
21+
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
2222

2323
ln "$OUT_PREFIX/bin/pypy3" "$OUT_PREFIX/bin/python"

builds/runtimes/pypy3.6-7.3.2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
# Build Path: /app/.heroku/python/
3+
4+
source $(dirname $0)/pypy3.6

test/fixtures/pypy2_7/runtime.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pypy2.7-7.3.1
1+
pypy2.7-7.3.2

test/fixtures/pypy3_6/runtime.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pypy3.6-7.3.1
1+
pypy3.6-7.3.2

0 commit comments

Comments
 (0)