From 2ba2d8797b94f7354950e270fb12caf0e98a4405 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Thu, 8 Feb 2018 08:27:18 -0500 Subject: [PATCH 1/2] Add 3.8-dev to point to `master` Push 3.7-dev to `3.7` branch --- plugins/python-build/bin/python-build | 5 +++++ plugins/python-build/share/python-build/3.7-dev | 2 +- plugins/python-build/share/python-build/3.8-dev | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 plugins/python-build/share/python-build/3.8-dev diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 95fe4e7e..35e68218 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1773,6 +1773,11 @@ build_package_verify_py37() { build_package_verify_py36 "$1" "${2:-3.7}" } +# Post-install check for Python 3.8.x +build_package_verify_py38() { + build_package_verify_py37 "$1" "${2:-3.8}" +} + build_package_ez_setup() { local ez_setup="ez_setup.py" rm -f "${ez_setup}" diff --git a/plugins/python-build/share/python-build/3.7-dev b/plugins/python-build/share/python-build/3.7-dev index 88631c7e..76d9babd 100644 --- a/plugins/python-build/share/python-build/3.7-dev +++ b/plugins/python-build/share/python-build/3.7-dev @@ -1,4 +1,4 @@ #require_gcc install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline -install_git "Python-3.7-dev" "https://github.com/python/cpython" master standard verify_py37 ensurepip +install_git "Python-3.7-dev" "https://github.com/python/cpython" "3.7" standard verify_py37 ensurepip diff --git a/plugins/python-build/share/python-build/3.8-dev b/plugins/python-build/share/python-build/3.8-dev new file mode 100644 index 00000000..a533dd25 --- /dev/null +++ b/plugins/python-build/share/python-build/3.8-dev @@ -0,0 +1,4 @@ +#require_gcc +install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl +install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline +install_git "Python-3.8-dev" "https://github.com/python/cpython" master standard verify_py38 ensurepip From 42349d9d24c2fa0a6d38bfb6634c8907a6b10901 Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Thu, 8 Feb 2018 08:34:01 -0500 Subject: [PATCH 2/2] Update 3.4.8rc1 to 3.4.8 release --- plugins/python-build/share/python-build/{3.4.8rc1 => 3.4.8} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename plugins/python-build/share/python-build/{3.4.8rc1 => 3.4.8} (50%) diff --git a/plugins/python-build/share/python-build/3.4.8rc1 b/plugins/python-build/share/python-build/3.4.8 similarity index 50% rename from plugins/python-build/share/python-build/3.4.8rc1 rename to plugins/python-build/share/python-build/3.4.8 index d3e2845e..c36209ef 100644 --- a/plugins/python-build/share/python-build/3.4.8rc1 +++ b/plugins/python-build/share/python-build/3.4.8 @@ -2,7 +2,7 @@ install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline if has_tar_xz_support; then - install_package "Python-3.4.8rc1" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8rc1.tar.xz#12f70493de116887a75e49ce88c1ba9aed76c0350e612e96676fd6b1f3c957ef" ldflags_dirs standard verify_py34 ensurepip + install_package "Python-3.4.8" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tar.xz#8b1a1ce043e132082d29a5d09f2841f193c77b631282a82f98895a5dbaba1639" ldflags_dirs standard verify_py34 ensurepip else - install_package "Python-3.4.8rc1" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8rc1.tgz#58d7739843d713b77dee478d7eadc358bf2d6648e6a667a1f8c21ace4c982c73" ldflags_dirs standard verify_py34 ensurepip + install_package "Python-3.4.8" "https://www.python.org/ftp/python/3.4.8/Python-3.4.8.tgz#29a472fa902c7b2add152f5e1e82e0885a8d360645689c1db5d1949a7e8ac3ea" ldflags_dirs standard verify_py34 ensurepip fi