Use RPM built wheels of pip and setuptools in ensurepip instead of our rewheel patch
This commit is contained in:
parent
d60e5a4fc9
commit
4d74b7c9bf
|
@ -0,0 +1,71 @@
|
||||||
|
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
|
||||||
|
index 89ed1ef..8008222 100644
|
||||||
|
--- a/Lib/ensurepip/__init__.py
|
||||||
|
+++ b/Lib/ensurepip/__init__.py
|
||||||
|
@@ -1,9 +1,10 @@
|
||||||
|
#!/usr/bin/env python2
|
||||||
|
from __future__ import print_function
|
||||||
|
|
||||||
|
+import distutils.version
|
||||||
|
+import glob
|
||||||
|
import os
|
||||||
|
import os.path
|
||||||
|
-import pkgutil
|
||||||
|
import shutil
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
@@ -11,10 +12,20 @@ import tempfile
|
||||||
|
|
||||||
|
__all__ = ["version", "bootstrap"]
|
||||||
|
|
||||||
|
+_WHEEL_DIR = "/usr/share/python-wheels/"
|
||||||
|
|
||||||
|
-_SETUPTOOLS_VERSION = "39.0.1"
|
||||||
|
|
||||||
|
-_PIP_VERSION = "9.0.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))
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
|
||||||
|
+
|
||||||
|
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
|
||||||
|
|
||||||
|
_PROJECTS = [
|
||||||
|
("setuptools", _SETUPTOOLS_VERSION),
|
||||||
|
@@ -28,8 +39,13 @@ def _run_pip(args, additional_paths=None):
|
||||||
|
sys.path = additional_paths + sys.path
|
||||||
|
|
||||||
|
# Install the bundled software
|
||||||
|
- import pip
|
||||||
|
- return pip.main(args)
|
||||||
|
+ try:
|
||||||
|
+ # pip 10
|
||||||
|
+ from pip._internal import main
|
||||||
|
+ except ImportError:
|
||||||
|
+ # pip 9
|
||||||
|
+ from pip import main
|
||||||
|
+ return main(args)
|
||||||
|
|
||||||
|
|
||||||
|
def version():
|
||||||
|
@@ -100,12 +116,9 @@ def _bootstrap(root=None, upgrade=False, user=False,
|
||||||
|
additional_paths = []
|
||||||
|
for project, version in _PROJECTS:
|
||||||
|
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)
|
||||||
|
+ 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())
|
||||||
|
|
||||||
|
additional_paths.append(os.path.join(tmpdir, wheel_name))
|
||||||
|
|
|
@ -1,249 +0,0 @@
|
||||||
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
|
|
||||||
index 89ed1ef..e2a4c25 100644
|
|
||||||
--- a/Lib/ensurepip/__init__.py
|
|
||||||
+++ b/Lib/ensurepip/__init__.py
|
|
||||||
@@ -7,6 +7,7 @@ import pkgutil
|
|
||||||
import shutil
|
|
||||||
import sys
|
|
||||||
import tempfile
|
|
||||||
+from ensurepip import rewheel
|
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["version", "bootstrap"]
|
|
||||||
@@ -29,6 +30,8 @@ def _run_pip(args, additional_paths=None):
|
|
||||||
|
|
||||||
# Install the bundled software
|
|
||||||
import pip
|
|
||||||
+ if args[0] in ["install", "list", "wheel"]:
|
|
||||||
+ args.append('--pre')
|
|
||||||
return pip.main(args)
|
|
||||||
|
|
||||||
|
|
||||||
@@ -93,21 +96,40 @@ def _bootstrap(root=None, upgrade=False, user=False,
|
|
||||||
# omit pip and easy_install
|
|
||||||
os.environ["ENSUREPIP_OPTIONS"] = "install"
|
|
||||||
|
|
||||||
+ whls = []
|
|
||||||
+ rewheel_dir = None
|
|
||||||
+ # try to see if we have system-wide versions of _PROJECTS
|
|
||||||
+ dep_records = rewheel.find_system_records([p[0] for p in _PROJECTS])
|
|
||||||
+ # TODO: check if system-wide versions are the newest ones
|
|
||||||
+ # if --upgrade is used?
|
|
||||||
+ if all(dep_records):
|
|
||||||
+ # if we have all _PROJECTS installed system-wide, we'll recreate
|
|
||||||
+ # wheels from them and install those
|
|
||||||
+ rewheel_dir = tempfile.mkdtemp()
|
|
||||||
+ for dr in dep_records:
|
|
||||||
+ new_whl = rewheel.rewheel_from_record(dr, rewheel_dir)
|
|
||||||
+ whls.append(os.path.join(rewheel_dir, new_whl))
|
|
||||||
+ else:
|
|
||||||
+ # if we don't have all the _PROJECTS installed system-wide,
|
|
||||||
+ # let's just fall back to bundled wheels
|
|
||||||
+ for project, version in _PROJECTS:
|
|
||||||
+ whl = os.path.join(
|
|
||||||
+ os.path.dirname(__file__),
|
|
||||||
+ "_bundled",
|
|
||||||
+ "{}-{}-py2.py3-none-any.whl".format(project, version)
|
|
||||||
+ )
|
|
||||||
+ whls.append(whl)
|
|
||||||
+
|
|
||||||
tmpdir = tempfile.mkdtemp()
|
|
||||||
try:
|
|
||||||
# Put our bundled wheels into a temporary directory and construct the
|
|
||||||
# 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)
|
|
||||||
- whl = pkgutil.get_data(
|
|
||||||
- "ensurepip",
|
|
||||||
- "_bundled/{}".format(wheel_name),
|
|
||||||
- )
|
|
||||||
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
|
|
||||||
- fp.write(whl)
|
|
||||||
-
|
|
||||||
- additional_paths.append(os.path.join(tmpdir, wheel_name))
|
|
||||||
+ for whl in whls:
|
|
||||||
+ shutil.copy(whl, tmpdir)
|
|
||||||
+ additional_paths.append(os.path.join(tmpdir, os.path.basename(whl)))
|
|
||||||
+ if rewheel_dir:
|
|
||||||
+ shutil.rmtree(rewheel_dir)
|
|
||||||
|
|
||||||
# Construct the arguments to be passed to the pip command
|
|
||||||
args = ["install", "--no-index", "--find-links", tmpdir]
|
|
||||||
diff --git a/Lib/ensurepip/rewheel/__init__.py b/Lib/ensurepip/rewheel/__init__.py
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..75c2094
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Lib/ensurepip/rewheel/__init__.py
|
|
||||||
@@ -0,0 +1,158 @@
|
|
||||||
+import argparse
|
|
||||||
+import codecs
|
|
||||||
+import csv
|
|
||||||
+import email.parser
|
|
||||||
+import os
|
|
||||||
+import io
|
|
||||||
+import re
|
|
||||||
+import site
|
|
||||||
+import subprocess
|
|
||||||
+import sys
|
|
||||||
+import zipfile
|
|
||||||
+
|
|
||||||
+def run():
|
|
||||||
+ parser = argparse.ArgumentParser(description='Recreate wheel of package with given RECORD.')
|
|
||||||
+ parser.add_argument('record_path',
|
|
||||||
+ help='Path to RECORD file')
|
|
||||||
+ parser.add_argument('-o', '--output-dir',
|
|
||||||
+ help='Dir where to place the wheel, defaults to current working dir.',
|
|
||||||
+ dest='outdir',
|
|
||||||
+ default=os.path.curdir)
|
|
||||||
+
|
|
||||||
+ ns = parser.parse_args()
|
|
||||||
+ retcode = 0
|
|
||||||
+ try:
|
|
||||||
+ print(rewheel_from_record(**vars(ns)))
|
|
||||||
+ except BaseException as e:
|
|
||||||
+ print('Failed: {}'.format(e))
|
|
||||||
+ retcode = 1
|
|
||||||
+ sys.exit(1)
|
|
||||||
+
|
|
||||||
+def find_system_records(projects):
|
|
||||||
+ """Return list of paths to RECORD files for system-installed projects.
|
|
||||||
+
|
|
||||||
+ If a project is not installed, the resulting list contains None instead
|
|
||||||
+ of a path to its RECORD
|
|
||||||
+ """
|
|
||||||
+ records = []
|
|
||||||
+ # get system site-packages dirs
|
|
||||||
+ if hasattr(sys, 'real_prefix'):
|
|
||||||
+ #we are in python2 virtualenv and sys.real_prefix is the original sys.prefix
|
|
||||||
+ _orig_prefixes = site.PREFIXES
|
|
||||||
+ setattr(site, 'PREFIXES', [sys.real_prefix]*2)
|
|
||||||
+ sys_sitepack = site.getsitepackages()
|
|
||||||
+ setattr(site, 'PREFIXES', _orig_prefixes)
|
|
||||||
+ elif hasattr(sys, 'base_prefix'): # python3 venv doesn't inject real_prefix to sys
|
|
||||||
+ # we are on python3 and base(_exec)_prefix is unchanged in venv
|
|
||||||
+ sys_sitepack = site.getsitepackages([sys.base_prefix, sys.base_exec_prefix])
|
|
||||||
+ else:
|
|
||||||
+ # we are in python2 without virtualenv
|
|
||||||
+ sys_sitepack = site.getsitepackages()
|
|
||||||
+
|
|
||||||
+ sys_sitepack = [sp for sp in sys_sitepack if os.path.exists(sp)]
|
|
||||||
+ # try to find all projects in all system site-packages
|
|
||||||
+ for project in projects:
|
|
||||||
+ path = None
|
|
||||||
+ for sp in sys_sitepack:
|
|
||||||
+ dist_info_re = os.path.join(sp, project) + '-[^\{0}]+\.dist-info'.format(os.sep)
|
|
||||||
+ candidates = [os.path.join(sp, p) for p in os.listdir(sp)]
|
|
||||||
+ # filter out candidate dirs based on the above regexp
|
|
||||||
+ filtered = [c for c in candidates if re.match(dist_info_re, c)]
|
|
||||||
+ # if we have 0 or 2 or more dirs, something is wrong...
|
|
||||||
+ if len(filtered) == 1:
|
|
||||||
+ path = filtered[0]
|
|
||||||
+ if path is not None:
|
|
||||||
+ records.append(os.path.join(path, 'RECORD'))
|
|
||||||
+ else:
|
|
||||||
+ records.append(None)
|
|
||||||
+ return records
|
|
||||||
+
|
|
||||||
+def rewheel_from_record(record_path, outdir):
|
|
||||||
+ """Recreates a whee of package with given record_path and returns path
|
|
||||||
+ to the newly created wheel."""
|
|
||||||
+ site_dir = os.path.dirname(os.path.dirname(record_path))
|
|
||||||
+ record_relpath = record_path[len(site_dir):].strip(os.path.sep)
|
|
||||||
+ to_write, to_omit = get_records_to_pack(site_dir, record_relpath)
|
|
||||||
+ new_wheel_name = get_wheel_name(record_path)
|
|
||||||
+ new_wheel_path = os.path.join(outdir, new_wheel_name + '.whl')
|
|
||||||
+
|
|
||||||
+ new_wheel = zipfile.ZipFile(new_wheel_path, mode='w', compression=zipfile.ZIP_DEFLATED)
|
|
||||||
+ # we need to write a new record with just the files that we will write,
|
|
||||||
+ # e.g. not binaries and *.pyc/*.pyo files
|
|
||||||
+ if sys.version_info[0] < 3:
|
|
||||||
+ new_record = io.BytesIO()
|
|
||||||
+ else:
|
|
||||||
+ new_record = io.StringIO()
|
|
||||||
+ writer = csv.writer(new_record)
|
|
||||||
+
|
|
||||||
+ # handle files that we can write straight away
|
|
||||||
+ for f, sha_hash, size in to_write:
|
|
||||||
+ new_wheel.write(os.path.join(site_dir, f), arcname=f)
|
|
||||||
+ writer.writerow([f, sha_hash,size])
|
|
||||||
+
|
|
||||||
+ # rewrite the old wheel file with a new computed one
|
|
||||||
+ writer.writerow([record_relpath, '', ''])
|
|
||||||
+ new_wheel.writestr(record_relpath, new_record.getvalue())
|
|
||||||
+
|
|
||||||
+ new_wheel.close()
|
|
||||||
+
|
|
||||||
+ return new_wheel.filename
|
|
||||||
+
|
|
||||||
+def get_wheel_name(record_path):
|
|
||||||
+ """Return proper name of the wheel, without .whl."""
|
|
||||||
+
|
|
||||||
+ wheel_info_path = os.path.join(os.path.dirname(record_path), 'WHEEL')
|
|
||||||
+ with codecs.open(wheel_info_path, encoding='utf-8') as wheel_info_file:
|
|
||||||
+ wheel_info = email.parser.Parser().parsestr(wheel_info_file.read().encode('utf-8'))
|
|
||||||
+
|
|
||||||
+ metadata_path = os.path.join(os.path.dirname(record_path), 'METADATA')
|
|
||||||
+ with codecs.open(metadata_path, encoding='utf-8') as metadata_file:
|
|
||||||
+ metadata = email.parser.Parser().parsestr(metadata_file.read().encode('utf-8'))
|
|
||||||
+
|
|
||||||
+ # construct name parts according to wheel spec
|
|
||||||
+ distribution = metadata.get('Name')
|
|
||||||
+ version = metadata.get('Version')
|
|
||||||
+ build_tag = '' # nothing for now
|
|
||||||
+ lang_tag = []
|
|
||||||
+ for t in wheel_info.get_all('Tag'):
|
|
||||||
+ lang_tag.append(t.split('-')[0])
|
|
||||||
+ lang_tag = '.'.join(lang_tag)
|
|
||||||
+ abi_tag, plat_tag = wheel_info.get('Tag').split('-')[1:3]
|
|
||||||
+ # leave out build tag, if it is empty
|
|
||||||
+ to_join = filter(None, [distribution, version, build_tag, lang_tag, abi_tag, plat_tag])
|
|
||||||
+ return '-'.join(list(to_join))
|
|
||||||
+
|
|
||||||
+def get_records_to_pack(site_dir, record_relpath):
|
|
||||||
+ """Accepts path of sitedir and path of RECORD file relative to it.
|
|
||||||
+ Returns two lists:
|
|
||||||
+ - list of files that can be written to new RECORD straight away
|
|
||||||
+ - list of files that shouldn't be written or need some processing
|
|
||||||
+ (pyc and pyo files, scripts)
|
|
||||||
+ """
|
|
||||||
+ record_file_path = os.path.join(site_dir, record_relpath)
|
|
||||||
+ with codecs.open(record_file_path, encoding='utf-8') as record_file:
|
|
||||||
+ record_contents = record_file.read()
|
|
||||||
+ # temporary fix for https://github.com/pypa/pip/issues/1376
|
|
||||||
+ # we need to ignore files under ".data" directory
|
|
||||||
+ data_dir = os.path.dirname(record_relpath).strip(os.path.sep)
|
|
||||||
+ data_dir = data_dir[:-len('dist-info')] + 'data'
|
|
||||||
+
|
|
||||||
+ to_write = []
|
|
||||||
+ to_omit = []
|
|
||||||
+ for l in record_contents.splitlines():
|
|
||||||
+ spl = l.split(',')
|
|
||||||
+ if len(spl) == 3:
|
|
||||||
+ # new record will omit (or write differently):
|
|
||||||
+ # - abs paths, paths with ".." (entry points),
|
|
||||||
+ # - pyc+pyo files
|
|
||||||
+ # - the old RECORD file
|
|
||||||
+ # TODO: is there any better way to recognize an entry point?
|
|
||||||
+ if os.path.isabs(spl[0]) or spl[0].startswith('..') or \
|
|
||||||
+ spl[0].endswith('.pyc') or spl[0].endswith('.pyo') or \
|
|
||||||
+ spl[0] == record_relpath or spl[0].startswith(data_dir):
|
|
||||||
+ to_omit.append(spl)
|
|
||||||
+ else:
|
|
||||||
+ to_write.append(spl)
|
|
||||||
+ else:
|
|
||||||
+ pass # bad RECORD or empty line
|
|
||||||
+ return to_write, to_omit
|
|
||||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
||||||
index 877698c..2c43611 100644
|
|
||||||
--- a/Makefile.pre.in
|
|
||||||
+++ b/Makefile.pre.in
|
|
||||||
@@ -1065,7 +1065,7 @@ LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
|
|
||||||
test/tracedmodules \
|
|
||||||
encodings compiler hotshot \
|
|
||||||
email email/mime email/test email/test/data \
|
|
||||||
- ensurepip ensurepip/_bundled \
|
|
||||||
+ ensurepip ensurepip/_bundled ensurepip/rewheel\
|
|
||||||
json json/tests \
|
|
||||||
sqlite3 sqlite3/test \
|
|
||||||
logging bsddb bsddb/test csv importlib wsgiref \
|
|
62
python2.spec
62
python2.spec
|
@ -5,8 +5,9 @@
|
||||||
# Note that the bcond macros are named for the CLI option they create.
|
# Note that the bcond macros are named for the CLI option they create.
|
||||||
# "%%bcond_without" means "ENABLE by default and create a --without option"
|
# "%%bcond_without" means "ENABLE by default and create a --without option"
|
||||||
|
|
||||||
# Ability to reuse RPM-installed pip using rewheel
|
# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package
|
||||||
%bcond_without rewheel
|
# Uses upstream bundled prebuilt wheels otherwise
|
||||||
|
%bcond_without rpmwheels
|
||||||
|
|
||||||
# Extra build for debugging the interpreter or C-API extensions
|
# Extra build for debugging the interpreter or C-API extensions
|
||||||
# (the -debug subpackages)
|
# (the -debug subpackages)
|
||||||
|
@ -112,7 +113,7 @@ Summary: An interpreted, interactive, object-oriented programming language
|
||||||
Name: %{python}
|
Name: %{python}
|
||||||
# Remember to also rebase python2-docs when changing this:
|
# Remember to also rebase python2-docs when changing this:
|
||||||
Version: 2.7.15
|
Version: 2.7.15
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
@ -182,15 +183,10 @@ BuildRequires: valgrind-devel
|
||||||
|
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
%if %{with rewheel}
|
%if %{with rpmwheels}
|
||||||
BuildRequires: python2-setuptools
|
BuildRequires: python-setuptools-wheel
|
||||||
Requires: python2-setuptools
|
BuildRequires: python-pip-wheel
|
||||||
|
%endif
|
||||||
%if ! 0%{?_module_build}
|
|
||||||
BuildRequires: python2-pip
|
|
||||||
Requires: python2-pip
|
|
||||||
%endif # !module_build
|
|
||||||
%endif # rewheel
|
|
||||||
|
|
||||||
# Providing python27 as now multiple interpreters exist in Fedora
|
# Providing python27 as now multiple interpreters exist in Fedora
|
||||||
# alongside the system one e.g. python26, python33 etc
|
# alongside the system one e.g. python26, python33 etc
|
||||||
|
@ -202,6 +198,12 @@ Provides: python27 = %{version}-%{release}
|
||||||
# python2 back with fixed version, so we just use the path here:
|
# python2 back with fixed version, so we just use the path here:
|
||||||
Recommends: %{_bindir}/python
|
Recommends: %{_bindir}/python
|
||||||
|
|
||||||
|
# Previously, this was required for our rewheel patch to work.
|
||||||
|
# This is technically no longer needed, but we keep it recommended
|
||||||
|
# for the developer experience.
|
||||||
|
Recommends: python2-setuptools
|
||||||
|
Recommends: python2-pip
|
||||||
|
|
||||||
|
|
||||||
# =======================
|
# =======================
|
||||||
# Source code and patches
|
# Source code and patches
|
||||||
|
@ -719,6 +721,11 @@ Patch185: 00185-urllib2-honors-noproxy-for-ftp.patch
|
||||||
# symbol)
|
# symbol)
|
||||||
Patch187: 00187-add-RPATH-to-pyexpat.patch
|
Patch187: 00187-add-RPATH-to-pyexpat.patch
|
||||||
|
|
||||||
|
# 00189 #
|
||||||
|
# Instead of bundled wheels, use our RPM packaged wheels from
|
||||||
|
# /usr/share/python-wheels
|
||||||
|
Patch189: 00189-use-rpm-wheels.patch
|
||||||
|
|
||||||
# 00190 #
|
# 00190 #
|
||||||
# Fixes gdb py-bt command not to raise exception while processing
|
# Fixes gdb py-bt command not to raise exception while processing
|
||||||
# statements from eval
|
# statements from eval
|
||||||
|
@ -736,9 +743,6 @@ Patch191: 00191-disable-NOOP.patch
|
||||||
# Patch provided by John C. Peterson
|
# Patch provided by John C. Peterson
|
||||||
Patch193: 00193-enable-loading-sqlite-extensions.patch
|
Patch193: 00193-enable-loading-sqlite-extensions.patch
|
||||||
|
|
||||||
# 00198 #
|
|
||||||
Patch198: 00198-add-rewheel-module.patch
|
|
||||||
|
|
||||||
# 00289 #
|
# 00289 #
|
||||||
# Disable automatic detection for the nis module
|
# Disable automatic detection for the nis module
|
||||||
# (we handle it it in Setup.dist, see Patch0)
|
# (we handle it it in Setup.dist, see Patch0)
|
||||||
|
@ -818,6 +822,14 @@ Requires: glibc%{?_isa} >= 2.24.90-26
|
||||||
Requires: gdbm%{?_isa} >= 1:1.13
|
Requires: gdbm%{?_isa} >= 1:1.13
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with rpmwheels}
|
||||||
|
Requires: python-setuptools-wheel
|
||||||
|
Requires: python-pip-wheel
|
||||||
|
%else
|
||||||
|
Provides: bundled(python2-pip) = 9.0.3
|
||||||
|
Provides: bundled(python2-setuptools) = 39.0.1
|
||||||
|
%endif
|
||||||
|
|
||||||
Provides: python-libs = %{version}-%{release}
|
Provides: python-libs = %{version}-%{release}
|
||||||
Provides: python-libs%{?_isa} = %{version}-%{release}
|
Provides: python-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
@ -1058,12 +1070,15 @@ mv Modules/cryptmodule.c Modules/_cryptmodule.c
|
||||||
%patch181 -p1
|
%patch181 -p1
|
||||||
%patch185 -p1
|
%patch185 -p1
|
||||||
%patch187 -p1
|
%patch187 -p1
|
||||||
|
|
||||||
|
%if %{with rpmwheels}
|
||||||
|
%patch189 -p1
|
||||||
|
rm Lib/ensurepip/_bundled/*.whl
|
||||||
|
%endif
|
||||||
|
|
||||||
%patch190 -p1
|
%patch190 -p1
|
||||||
%patch191 -p1
|
%patch191 -p1
|
||||||
%patch193 -p1
|
%patch193 -p1
|
||||||
%if %{with rewheel}
|
|
||||||
%patch198 -p1
|
|
||||||
%endif
|
|
||||||
%patch289 -p1
|
%patch289 -p1
|
||||||
|
|
||||||
|
|
||||||
|
@ -1748,11 +1763,11 @@ CheckPython \
|
||||||
|
|
||||||
%dir %{pylibdir}/ensurepip/
|
%dir %{pylibdir}/ensurepip/
|
||||||
%{pylibdir}/ensurepip/*.py*
|
%{pylibdir}/ensurepip/*.py*
|
||||||
|
%if %{with rpmwheels}
|
||||||
%exclude %{pylibdir}/ensurepip/_bundled
|
%exclude %{pylibdir}/ensurepip/_bundled
|
||||||
|
%else
|
||||||
%if %{with rewheel}
|
%dir %{pylibdir}/ensurepip/_bundled
|
||||||
%dir %{pylibdir}/ensurepip/rewheel/
|
%{pylibdir}/ensurepip/_bundled/*.whl
|
||||||
%{pylibdir}/ensurepip/rewheel/*.py*
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -1964,6 +1979,9 @@ CheckPython \
|
||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 21 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.15-7
|
||||||
|
- Use RPM built wheels of pip and setuptools in ensurepip instead of our rewheel patch
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.15-6
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.15-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue