From d54e9424862f0ef3a948dd1e1533fc4d798b7fc0 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 28 Jun 2018 13:52:14 +0300 Subject: [PATCH] python3: Update to 3.6.6 --- python3/00189-add-rewheel-module.patch | 4 ++-- python3/00260-require-setuptools-dependencies.patch | 3 +-- python3/PKGBUILD | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/python3/00189-add-rewheel-module.patch b/python3/00189-add-rewheel-module.patch index 9b5469f9..bbdda531 100644 --- a/python3/00189-add-rewheel-module.patch +++ b/python3/00189-add-rewheel-module.patch @@ -15,10 +15,10 @@ diff -Nur Python-3.4.1/Lib/ensurepip/__init__.py Python-3.4.1-rewheel/Lib/ensure @@ -25,6 +27,8 @@ # Install the bundled software - import pip + import pip._internal + if args[0] in ["install", "list", "wheel"]: + args.append('--pre') - return pip.main(args) + return pip._internal.main(args) @@ -73,20 +77,39 @@ diff --git a/python3/00260-require-setuptools-dependencies.patch b/python3/00260-require-setuptools-dependencies.patch index 095e7923..521bd42b 100644 --- a/python3/00260-require-setuptools-dependencies.patch +++ b/python3/00260-require-setuptools-dependencies.patch @@ -9,8 +9,7 @@ index 9f5d151..4dfa8a1 100644 -_SETUPTOOLS_VERSION = "39.0.1" +_SETUPTOOLS_VERSION = "39.2.0" --_PIP_VERSION = "9.0.3" -+_PIP_VERSION = "10.0.1" + _PIP_VERSION = "10.0.1" + +_SIX_VERSION = "1.10.0" + diff --git a/python3/PKGBUILD b/python3/PKGBUILD index 3d0d3ade..62b1b12e 100644 --- a/python3/PKGBUILD +++ b/python3/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=python3 pkgname=python -pkgver=3.6.5 +pkgver=3.6.6 pkgrel=1 _pybasever=3.6 pkgdesc="Next generation of the python high-level scripting language" @@ -50,7 +50,7 @@ source=(https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz 00264-skip-test-failing-on-aarch64.patch python3-powerppc-arch.patch 016-3.6-mpdec-cygwin.patch) -sha256sums=('f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6' +sha256sums=('d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f' 'de52e4722a6902e09dd6f343fdac0e7d45339f89386c8096b9c582c31aeb82e7' 'b5a787f02811f46800f98bf242448770492643a4431771bb4283e6ae97016263' '4d7601b62e73c04553d22d480a873983a28b11df1f06be6898014453ce04afc3' @@ -76,11 +76,11 @@ sha256sums=('f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6' 'e70369c7096b8204b0af968679d493bf272996df637e53ca6fad4a236f1a2b02' '4e7ce358f0650545ee9ae112b26cee4dce8f763eac5612f556e975ad38056fb8' 'd04b7bec35418c699358c8140a7213efe1a133772972715800b7a6101e0d699a' - 'b5106a6a6db3ef9c0b41f34a4e0795558e2eeb268fa70333cd3eb03334d58972' + '8c7ba55643635cc9dcfb57dec8cf4f50261bb2d5c169e82f991573e42400dd36' 'd61273d74f734bcdef933531cbd3cc77cf79b5826837cbd40cd48e5b1bc76072' 'f81a0a0907e65a00bff1a1ede4827a33984a6f2aee3aed2ce6a2423decdfd26d' '735257fc216be2300b35dab8a97ff76199cc98d69b0bce36f099d476fb0f30e5' - 'bd44cd6782854789ce6aad5e5b15fc05f87b6a626902551d7a509484d846660e' + '66d016758216565a4e69d81b44eb978518f572042a4afe1ee0a996158e59a983' '843c26c4325f1d42f30f6e1fac5e6ff06122903bd37aa67683838ae49609e276' '0de3e6e67d86f7e3593c504385399537b42920aca94329424cc8b1d65ae2ac4f' 'e3ef181333d5c9d20297849a46a68271a2190b7fc611c40c68c1ae240fa7ec36')