From 4a14d2f62aeafdb10a81f53f71e854453f459960 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 9 Jan 2018 14:07:27 -0500 Subject: [PATCH 1/2] Allow binary installs of PyPy on Xenial --- plugins/python-build/share/python-build/pypy2.7-5.10.0 | 2 ++ plugins/python-build/share/python-build/pypy3.5-5.10.0 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/plugins/python-build/share/python-build/pypy2.7-5.10.0 b/plugins/python-build/share/python-build/pypy2.7-5.10.0 index cf886400..a3d68e65 100644 --- a/plugins/python-build/share/python-build/pypy2.7-5.10.0 +++ b/plugins/python-build/share/python-build/pypy2.7-5.10.0 @@ -7,6 +7,8 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux64" ) if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip + elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip else { echo colorize 1 "ERROR" diff --git a/plugins/python-build/share/python-build/pypy3.5-5.10.0 b/plugins/python-build/share/python-build/pypy3.5-5.10.0 index 1f3310ca..ace9f795 100644 --- a/plugins/python-build/share/python-build/pypy3.5-5.10.0 +++ b/plugins/python-build/share/python-build/pypy3.5-5.10.0 @@ -7,6 +7,8 @@ case "$(pypy_architecture 2>/dev/null || true)" in "linux64" ) if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip + elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then + install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip else { echo colorize 1 "ERROR" From 9a59c8490a396924a13d0086d08f77a316c5ff72 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Tue, 9 Jan 2018 20:50:38 -0500 Subject: [PATCH 2/2] Use multi-arg form of require_distro --- plugins/python-build/share/python-build/pypy2.7-5.10.0 | 4 +--- plugins/python-build/share/python-build/pypy3.5-5.10.0 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/python-build/share/python-build/pypy2.7-5.10.0 b/plugins/python-build/share/python-build/pypy2.7-5.10.0 index a3d68e65..0920ecaa 100644 --- a/plugins/python-build/share/python-build/pypy2.7-5.10.0 +++ b/plugins/python-build/share/python-build/pypy2.7-5.10.0 @@ -5,9 +5,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then - install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip - elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip else { echo diff --git a/plugins/python-build/share/python-build/pypy3.5-5.10.0 b/plugins/python-build/share/python-build/pypy3.5-5.10.0 index ace9f795..294497cf 100644 --- a/plugins/python-build/share/python-build/pypy3.5-5.10.0 +++ b/plugins/python-build/share/python-build/pypy3.5-5.10.0 @@ -5,9 +5,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in fi ;; "linux64" ) - if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then - install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip - elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then + if require_distro "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip else { echo