diff --git a/on-demand-linkcollector.patch b/on-demand-linkcollector.patch deleted file mode 100644 index d396d51..0000000 --- a/on-demand-linkcollector.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: pip-24.2/src/pip/_internal/cli/req_command.py -=================================================================== ---- pip-24.2.orig/src/pip/_internal/cli/req_command.py -+++ pip-24.2/src/pip/_internal/cli/req_command.py -@@ -15,7 +15,6 @@ from pip._internal.cli import cmdoptions - from pip._internal.cli.index_command import IndexGroupCommand - from pip._internal.cli.index_command import SessionCommandMixin as SessionCommandMixin - from pip._internal.exceptions import CommandError, PreviousBuildDirError --from pip._internal.index.collector import LinkCollector - from pip._internal.index.package_finder import PackageFinder - from pip._internal.models.selection_prefs import SelectionPreferences - from pip._internal.models.target_python import TargetPython -@@ -313,6 +312,7 @@ class RequirementCommand(IndexGroupComma - :param ignore_requires_python: Whether to ignore incompatible - "Requires-Python" values in links. Defaults to False. - """ -+ from pip._internal.index.collector import LinkCollector - link_collector = LinkCollector.create(session, options=options) - selection_prefs = SelectionPreferences( - allow_yanked=True, diff --git a/python-pip.changes b/python-pip.changes index 89194c4..dbae277 100644 --- a/python-pip.changes +++ b/python-pip.changes @@ -97,9 +97,6 @@ Mon Aug 12 16:49:06 UTC 2024 - Dirk Müller --ignore-conflicts. * Fix finding hardlink targets in tar files with an ignored top-level directory. -- add on-demand-linkcollector.patch to delay loading the - linkcollector in build environments which have no network - and no useful set of certificates ------------------------------------------------------------------- Sun Jun 30 18:45:16 UTC 2024 - Dirk Müller diff --git a/python-pip.spec b/python-pip.spec index 0007f78..a1f5f58 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -46,8 +46,6 @@ Patch0: pip-shipped-requests-cabundle.patch # PATCH-FIX-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com # To get reproducible builds, byte_compile() of distutils.util now sorts filenames. Patch1: distutils-reproducible-compile.patch -# PATCH-FIX-OPENSUSE: delay loading requests and ca-certificates to avoid build cycles -Patch2: on-demand-linkcollector.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools >= 40.8.0} # The rpm python-wheel build is bootstrap friendly since 0.42