From 1cf243c04d8881b683eb04c4d77271a20ef69157 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 4 Oct 2019 00:48:10 +0300 Subject: [PATCH 1/4] include 3.8.0rc1 in manylinux1 --- docker/build_scripts/build_env.sh | 2 +- docker/build_scripts/build_utils.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/build_scripts/build_env.sh b/docker/build_scripts/build_env.sh index 7f1d5f5b3..f2efcd60e 100644 --- a/docker/build_scripts/build_env.sh +++ b/docker/build_scripts/build_env.sh @@ -1,7 +1,7 @@ # source me PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python -CPYTHON_VERSIONS="2.7.16 3.4.10 3.5.7 3.6.9 3.7.4" +CPYTHON_VERSIONS="2.7.16 3.4.10 3.5.7 3.6.9 3.7.4 3.8.0rc1" # openssl version to build, with expected sha256 hash of .tar.gz # archive. diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index 6902111d6..c1505ae28 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -94,6 +94,8 @@ function build_cpythons { # Import public keys used to verify downloaded Python source tarballs. # https://www.python.org/static/files/pubkeys.txt gpg --import ${MY_DIR}/cpython-pubkeys.txt + # Add version 3.8 release manager's key + gpg --recv-keys "B26995E310250568" for py_ver in $@; do build_cpython $py_ver done From 7d98b1b47b25d3db8b652fa651572dfd71b064bf Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 4 Oct 2019 01:36:44 +0300 Subject: [PATCH 2/4] add keyserver --- docker/build_scripts/build_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index c1505ae28..dbc2ffddf 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -95,7 +95,7 @@ function build_cpythons { # https://www.python.org/static/files/pubkeys.txt gpg --import ${MY_DIR}/cpython-pubkeys.txt # Add version 3.8 release manager's key - gpg --recv-keys "B26995E310250568" + gpg --keyserver keys.gnupg.net --recv-keys "B26995E310250568" for py_ver in $@; do build_cpython $py_ver done From 99351cc1d635abc6060eb44e37f94312ee8a1eca Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 4 Oct 2019 14:43:48 +0300 Subject: [PATCH 3/4] update key for 3.8 --- docker/build_scripts/build_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index dbc2ffddf..76a019320 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -95,7 +95,7 @@ function build_cpythons { # https://www.python.org/static/files/pubkeys.txt gpg --import ${MY_DIR}/cpython-pubkeys.txt # Add version 3.8 release manager's key - gpg --keyserver keys.gnupg.net --recv-keys "B26995E310250568" + gpg --keyserver keys.gnupg.net --recv-keys E3FF2839C048B25C084DEBE9B26995E310250568 for py_ver in $@; do build_cpython $py_ver done From 9e7a01381c6bf34ae1e55832cad1310f4e7e48a7 Mon Sep 17 00:00:00 2001 From: mattip Date: Sat, 5 Oct 2019 20:28:56 +0300 Subject: [PATCH 4/4] fixes from review --- docker/build_scripts/build_utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index 76a019320..947345de9 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -76,7 +76,7 @@ function build_cpython { local py_dist_dir=$(pyver_dist_dir $py_ver) curl -fsSLO $PYTHON_DOWNLOAD_URL/$py_dist_dir/Python-$py_ver.tgz curl -fsSLO $PYTHON_DOWNLOAD_URL/$py_dist_dir/Python-$py_ver.tgz.asc - gpg --verify Python-$py_ver.tgz.asc + gpg --verify --no-auto-key-locate Python-$py_ver.tgz.asc if [ $(lex_pyver $py_ver) -lt $(lex_pyver 3.3) ]; then do_cpython_build $py_ver ucs2 do_cpython_build $py_ver ucs4 @@ -94,7 +94,7 @@ function build_cpythons { # Import public keys used to verify downloaded Python source tarballs. # https://www.python.org/static/files/pubkeys.txt gpg --import ${MY_DIR}/cpython-pubkeys.txt - # Add version 3.8 release manager's key + # Add version 3.8 release manager's key https://keybase.io/ambv/ gpg --keyserver keys.gnupg.net --recv-keys E3FF2839C048B25C084DEBE9B26995E310250568 for py_ver in $@; do build_cpython $py_ver