diff --git a/rpm-wheels.patch b/rpm-wheels.patch index 5f6e50f..5e2391c 100644 --- a/rpm-wheels.patch +++ b/rpm-wheels.patch @@ -1,4 +1,4 @@ -From 915453288bf883c912f2b31bc654ed24e0382a0f Mon Sep 17 00:00:00 2001 +From 3f22c840a0b26dae8dd09985501eaa33846f063c Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 27 Oct 2022 11:50:54 +0200 Subject: [PATCH] RPM wheels @@ -101,25 +101,23 @@ index f31ecf6..d7a0f5a 100644 pip_version = name_to_whl["pip"].version_tuple if "pip" in name_to_whl else None installer_class = self.installer_class(pip_version) diff --git a/src/virtualenv/seed/wheels/acquire.py b/src/virtualenv/seed/wheels/acquire.py -index 21fde34..d6ae171 100644 +index 21fde34..4370b0d 100644 --- a/src/virtualenv/seed/wheels/acquire.py +++ b/src/virtualenv/seed/wheels/acquire.py -@@ -97,13 +97,14 @@ def find_compatible_in_house(distribution, version_spec, for_py_version, in_fold +@@ -24,11 +24,12 @@ def get_wheel(distribution, version, for_py_version, search_dirs, download, app_ - - def pip_wheel_env_run(search_dirs, app_data, env): -+ from virtualenv.util.path._system_wheels import get_system_wheels_paths - env = env.copy() - env.update({"PIP_USE_WHEEL": "1", "PIP_USER": "0", "PIP_NO_INPUT": "1"}) - wheel = get_wheel( - distribution="pip", - version=None, - for_py_version=f"{sys.version_info.major}.{sys.version_info.minor}", -- search_dirs=search_dirs, -+ search_dirs=get_system_wheels_paths(sys), - download=False, - app_data=app_data, - do_periodic_update=False, + if download and wheel is None and version != Version.embed: + # 2. download from the internet ++ from virtualenv.util.path._system_wheels import get_system_wheels_paths + wheel = download_wheel( + distribution=distribution, + version_spec=Version.as_version_spec(version), + for_py_version=for_py_version, +- search_dirs=search_dirs, ++ search_dirs=get_system_wheels_paths(sys), + app_data=app_data, + to_folder=app_data.house, + env=env, diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py index 782051a..71ec712 100644 --- a/src/virtualenv/seed/wheels/embed/__init__.py @@ -170,5 +168,5 @@ index 0000000..fc7e942 + if wheels_dir.exists(): + yield wheels_dir -- -2.44.0 +2.47.0