From 63266cf9edfbe760dab8234988723688d6670550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 12 May 2018 10:48:48 +0200 Subject: [PATCH 1/2] Rebase the rewheel patch It was not rebased before, because it was never applied --- 00189-add-rewheel-module.patch | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/00189-add-rewheel-module.patch b/00189-add-rewheel-module.patch index bae64d4..d8ba671 100644 --- a/00189-add-rewheel-module.patch +++ b/00189-add-rewheel-module.patch @@ -1,5 +1,5 @@ diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index d69e09f..5cb12df 100644 +index 7ff938b..8c3d062 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,8 +1,10 @@ @@ -13,16 +13,25 @@ index d69e09f..5cb12df 100644 __all__ = ["version", "bootstrap"] -@@ -25,6 +27,8 @@ def _run_pip(args, additional_paths=None): +@@ -24,8 +26,15 @@ def _run_pip(args, additional_paths=None): + sys.path = additional_paths + sys.path # Install the bundled software - import pip +- import pip._internal +- return pip._internal.main(args) ++ try: ++ # pip 10 ++ from pip._internal import main ++ except ImportError: ++ # pip 9 ++ from pip import main + if args[0] in ["install", "list", "wheel"]: + args.append('--pre') - return pip.main(args) ++ return main(args) -@@ -88,20 +92,39 @@ def _bootstrap(*, root=None, upgrade=False, user=False, + def version(): +@@ -88,20 +97,39 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # omit pip and easy_install os.environ["ENSUREPIP_OPTIONS"] = "install" @@ -222,10 +231,10 @@ index 0000000..753c764 + pass # bad RECORD or empty line + return to_write, to_omit diff --git a/Makefile.pre.in b/Makefile.pre.in -index 51e8132..42b3d29 100644 +index d07b312..1c6720e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1241,7 +1241,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1301,7 +1301,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_asyncio \ collections concurrent concurrent/futures encodings \ email email/mime test/test_email test/test_email/data \ From 611414f20d556b4e9d869aaab25d1794a7000362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 12 May 2018 10:51:09 +0200 Subject: [PATCH 2/2] Bump the bundled pip version to 10.0.1 --- python37.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python37.spec b/python37.spec index a0097d9..e2cf7a3 100644 --- a/python37.spec +++ b/python37.spec @@ -18,7 +18,7 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well Version: %{pybasever}.0 -Release: 0.17.%{?prerel}%{?dist} +Release: 0.18.%{?prerel}%{?dist} License: Python @@ -616,7 +616,7 @@ Requires: redhat-rpm-config %global __provides_exclude ^python\\(abi\\) = 3\\..$ # We keep those inside on purpose -Provides: bundled(python3-pip) = 9.0.3 +Provides: bundled(python3-pip) = 10.0.1 Provides: bundled(python3-setuptools) = 39.0.1 # The description for the flat package @@ -1565,6 +1565,9 @@ CheckPython optimized # ====================================================== %changelog +* Sat May 12 2018 Miro Hrončok - 3.7.0-0.18.b4 +- Bump the bundled pip version to 10.0.1 + * Thu May 10 2018 Miro Hrončok - 3.7.0-0.17.b4 - Update to 3.7.0b4