Skip to content
This repository was archived by the owner on Mar 15, 2022. It is now read-only.

Commit 022979e

Browse files
committed
Adding 7.3.0rc3
1 parent cccf45d commit 022979e

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

docker/build_scripts_pypy/install_pypy.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ function install_one_pypy {
1818
cd /opt/pypy
1919
tar xf $tarball
2020

21+
# the new PyPy 3 distributions don't have pypy symlinks to pypy3
22+
if [ ! -f "$outdir/bin/pypy" ]; then
23+
ln -s pypy3 $outdir/bin/pypy
24+
fi
25+
2126
# rename the directory to something shorter like pypy2.7-7.1.1
2227
shortdir=$(get_shortdir $outdir/bin/pypy)
2328
mv "$outdir" "$shortdir"

docker/build_scripts_pypy/prefetch_pypy.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
set -ex
44

55
SOURCES=docker/sources
6-
BITBUCKET_URL=https://bitbucket.org/squeaky/portable-pypy/downloads # old releases
7-
URL=https://github.com/squeaky-pl/portable-pypy/releases/download # new releases
6+
SQUEAKY_BITBUCKET_URL=https://bitbucket.org/squeaky/portable-pypy/downloads # older releases
7+
SQUEAKY_GITHUB_URL=https://github.com/squeaky-pl/portable-pypy/releases/download # old releases
8+
URL=https://bitbucket.org/pypy/pypy/downloads # new releases
9+
810

911
MY_DIR=$(dirname "${BASH_SOURCE[0]}")
1012
. $MY_DIR/../build_scripts/build_utils.sh
@@ -13,9 +15,13 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
1315
cd "$SOURCES"
1416

1517
# pypy 7.1.1
16-
fetch_source pypy-7.1.1-linux_x86_64-portable.tar.bz2 "$BITBUCKET_URL"
17-
fetch_source pypy3.6-7.1.1-beta-linux_x86_64-portable.tar.bz2 "$BITBUCKET_URL"
18+
fetch_source pypy-7.1.1-linux_x86_64-portable.tar.bz2 "$SQUEAKY_BITBUCKET_URL"
19+
fetch_source pypy3.6-7.1.1-beta-linux_x86_64-portable.tar.bz2 "$SQUEAKY_BITBUCKET_URL"
1820

1921
# pypy 7.2.0
20-
fetch_source pypy-7.2.0-linux_x86_64-portable.tar.bz2 "$URL/pypy-7.2.0"
21-
fetch_source pypy3.6-7.2.0-linux_x86_64-portable.tar.bz2 "$URL/pypy3.6-7.2.0"
22+
fetch_source pypy-7.2.0-linux_x86_64-portable.tar.bz2 "$SQUEAKY_GITHUB_URL/pypy-7.2.0"
23+
fetch_source pypy3.6-7.2.0-linux_x86_64-portable.tar.bz2 "$SQUEAKY_GITHUB_URL/pypy3.6-7.2.0"
24+
25+
# pypy 7.3.0rc3
26+
fetch_source pypy2.7-v7.3.0rc3-linux64.tar.bz2 "$URL"
27+
fetch_source pypy3.6-v7.3.0rc3-linux64.tar.bz2 "$URL"

0 commit comments

Comments
 (0)