#175 Fedora 32: Rebased to 3.8.2 final
Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.
rpms/ churchyard/python3 3.8.2  into  f32

file modified
+1 -1
@@ -1,4 +1,4 @@ 

- From e74acc597bbe66f8cb27c7e16408c1a105f99465 Mon Sep 17 00:00:00 2001

+ From bf01d6c367d9cb8f6594afa87c16f0498ae7321f Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Wed, 13 Jan 2010 21:25:18 +0000

  Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard

file modified
+1 -1
@@ -1,4 +1,4 @@ 

- From b56b51af018e3b1223b708950de968585313a8b8 Mon Sep 17 00:00:00 2001

+ From 96580364051672475607c88cdb31ec875cea6e97 Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Wed, 13 Jan 2010 21:25:18 +0000

  Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/

file modified
+1 -1
@@ -1,4 +1,4 @@ 

- From f1f74b920972146b0255366baca2e033ec45057e Mon Sep 17 00:00:00 2001

+ From fb93392b0f4975a02775a608611dc9ceb20c06ad Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Mon, 18 Jan 2010 17:59:07 +0000

  Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a

file modified
+17 -11
@@ -1,18 +1,18 @@ 

- From 3b1cea43d3da4229c210c44f4694675cba341a19 Mon Sep 17 00:00:00 2001

+ From 72d6cb277804f58b660bf96d8f5efff78d88491c Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  Date: Wed, 15 Aug 2018 15:36:29 +0200

  Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels

  

  We keep them in /usr/share/python-wheels

  ---

-  Lib/ensurepip/__init__.py | 26 +++++++++++++++++---------

-  1 file changed, 17 insertions(+), 9 deletions(-)

+  Lib/ensurepip/__init__.py | 32 ++++++++++++++++++++++----------

+  1 file changed, 22 insertions(+), 10 deletions(-)

  

  diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py

- index fc0edec6e3..4d17e413db 100644

+ index fc0edec6e3..731817a3f0 100644

  --- a/Lib/ensurepip/__init__.py

  +++ b/Lib/ensurepip/__init__.py

- @@ -1,16 +1,27 @@

+ @@ -1,16 +1,31 @@

  +import distutils.version

  +import glob

   import os
@@ -27,14 +27,18 @@ 

  +_WHEEL_DIR = "/usr/share/python-wheels/"

   

  -_SETUPTOOLS_VERSION = "41.2.0"

+ +_wheels = {}

   

  -_PIP_VERSION = "19.2.3"

  +def _get_most_recent_wheel_version(pkg):

  +    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))

- +    suffix = "-py2.py3-none-any.whl"

- +    pattern = "{}*{}".format(prefix, suffix)

- +    versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern))

- +    return str(max(versions, key=distutils.version.LooseVersion))

+ +    _wheels[pkg] = {}

+ +    for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":

+ +        pattern = "{}*{}".format(prefix, suffix)

+ +        for path in glob.glob(pattern):

+ +            version_str = path[len(prefix):-len(suffix)]

+ +            _wheels[pkg][version_str] = os.path.basename(path)

+ +    return str(max(_wheels[pkg], key=distutils.version.LooseVersion))

  +

  +

  +_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
@@ -43,16 +47,18 @@ 

   

   _PROJECTS = [

       ("setuptools", _SETUPTOOLS_VERSION),

- @@ -96,12 +107,9 @@ def _bootstrap(*, root=None, upgrade=False, user=False,

+ @@ -95,13 +110,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,

+          # additional paths that need added to sys.path

           additional_paths = []

           for project, version in _PROJECTS:

-              wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)

+ -            wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)

  -            whl = pkgutil.get_data(

  -                "ensurepip",

  -                "_bundled/{}".format(wheel_name),

  -            )

  -            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:

  -                fp.write(whl)

+ +            wheel_name = _wheels[project][version]

  +            with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:

  +                with open(os.path.join(tmpdir, wheel_name), "wb") as fp:

  +                    fp.write(sfp.read())

@@ -1,4 +1,4 @@ 

- From 67d36e6957a05ec1c757592a808c10b5ee460811 Mon Sep 17 00:00:00 2001

+ From a1f0ea8fae6fb87cdc9d9c16bc0898e8f66fa907 Mon Sep 17 00:00:00 2001

  From: Michal Cyprian <m.cyprian@gmail.com>

  Date: Mon, 26 Jun 2017 16:32:56 +0200

  Subject: [PATCH] 00251: Change user install location

file modified
+1 -1
@@ -1,4 +1,4 @@ 

- From 04d05cd76ec316f429d36e2deb1a6a1fde75a608 Mon Sep 17 00:00:00 2001

+ From b60a8fee7e91e36b48a2ea27d1bb9f42642c3eb2 Mon Sep 17 00:00:00 2001

  From: Petr Viktorin <pviktori@redhat.com>

  Date: Mon, 28 Aug 2017 17:16:46 +0200

  Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change

@@ -1,4 +1,4 @@ 

- From 62a7e06903ff3da08c63b6e247db156e36f1d630 Mon Sep 17 00:00:00 2001

+ From 0d41a311e805af08637e3f6dc0fb6fae32e508ab Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  Date: Thu, 11 Jul 2019 13:44:13 +0200

  Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default

file modified
+7 -1
@@ -14,7 +14,7 @@ 

  #  WARNING  When rebasing to a new Python version,

  #           remember to update the python3-docs package as well

  %global general_version %{pybasever}.2

- %global prerel rc2

+ #global prerel ...

  %global upstream_version %{general_version}%{?prerel}

  Version: %{general_version}%{?prerel:~%{prerel}}

  Release: 1%{?dist}
@@ -1575,6 +1575,12 @@ 

  # ======================================================

  

  %changelog

+ * Wed Feb 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.2-1

+ - Rebased to 3.8.2 final

+ 

+ * Mon Feb 24 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.2~rc2-2

+ - Update the ensurepip module to work with setuptools >= 45

+ 

  * Mon Feb 24 2020 Marcel Plch <mplch@redhat.com> - 3.8.2~rc2-1

  - Rebased to 3.8.2rc2

  

file modified
+2 -2
@@ -1,2 +1,2 @@ 

- SHA512 (Python-3.8.2rc2.tar.xz) = f502ec3fbf9ec618193bdf71a1f0ea4fce5eb584bd1ddee396aad14f41a40e7987fbfb184759c13eeb28b7bf4513aaf678375ca29b51840755056f8af1fbeb99

- SHA512 (Python-3.8.2rc2.tar.xz.asc) = 85a091af0bdc2d62269ce46d0f82a00d051b4487ecea6282147dd181fdba49ca6e8eeb3bbea62e4a792d25ce144441d26ddda194891bc3e67713d650dc8f1b23

+ SHA512 (Python-3.8.2.tar.xz) = ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37

+ SHA512 (Python-3.8.2.tar.xz.asc) = 765796ab5539576bbf1578e05cdb041dbc9a9ca0d6d2040a473a00a293b49f90be11ea6e33b47889da33b25f8e360fad4adeec292f0d43e5fae233d1f03bafd2