Update to 20.16.6
This commit is contained in:
Lumir Balhar
parent
385dca807e
commit
370bb9cf4e
@ -1,6 +1,6 @@
|
||||
Name: python-virtualenv
|
||||
Version: 20.15.1
|
||||
Release: 2%{?dist}
|
||||
Version: 20.16.6
|
||||
Release: 1%{?dist}
|
||||
Summary: Tool to create isolated Python environments
|
||||
|
||||
License: MIT
|
||||
@ -138,8 +138,17 @@ unset SOURCE_DATE_EPOCH
|
||||
# - test_bundle.py (whole file)
|
||||
# Uses disabled functionalities around automatic updates:
|
||||
# - test_periodic_update.py (whole file)
|
||||
# Requires Python 2:
|
||||
# - test_py_pyc_missing
|
||||
PIP_CERT=/etc/pki/tls/certs/ca-bundle.crt \
|
||||
%pytest -vv -k "not test_bundle and not test_acquire and not test_periodic_update and not test_wheel_ and not test_download_ and not test_base_bootstrap_via_pip_invoke and not test_seed_link_via_app_data"
|
||||
%pytest -vv -k "not test_bundle and \
|
||||
not test_acquire and \
|
||||
not test_periodic_update and \
|
||||
not test_wheel_ and \
|
||||
not test_download_ and \
|
||||
not test_base_bootstrap_via_pip_invoke and \
|
||||
not test_seed_link_via_app_data and \
|
||||
not test_py_pyc_missing"
|
||||
|
||||
rm -r tmp_path
|
||||
%endif
|
||||
@ -158,6 +167,10 @@ rm -r tmp_path
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 27 2022 Lumír Balhar <lbalhar@redhat.com> - 20.16.6-1
|
||||
- Update to 20.16.6
|
||||
Resolves: rhbz#2137713
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20.15.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
From e32327e4e06eef42a631e3f21674b4577b40ce77 Mon Sep 17 00:00:00 2001
|
||||
From 5ba67ace2437432ee78d21c68dfbb785ad0e9723 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Tue, 15 Mar 2022 08:07:24 +0100
|
||||
Date: Thu, 27 Oct 2022 11:50:54 +0200
|
||||
Subject: [PATCH] RPM wheels
|
||||
|
||||
---
|
||||
@ -9,15 +9,15 @@ Subject: [PATCH] RPM wheels
|
||||
src/virtualenv/seed/embed/pip_invoke.py | 1 +
|
||||
.../seed/embed/via_app_data/via_app_data.py | 1 +
|
||||
src/virtualenv/seed/wheels/embed/__init__.py | 3 +++
|
||||
src/virtualenv/util/path/_system_wheels.py | 22 +++++++++++++++++++
|
||||
6 files changed, 45 insertions(+), 3 deletions(-)
|
||||
src/virtualenv/util/path/_system_wheels.py | 21 +++++++++++++++++++
|
||||
6 files changed, 44 insertions(+), 3 deletions(-)
|
||||
create mode 100644 src/virtualenv/util/path/_system_wheels.py
|
||||
|
||||
diff --git a/src/virtualenv/run/__init__.py b/src/virtualenv/run/__init__.py
|
||||
index e8e7ab1..617cf67 100644
|
||||
index 6d22b71..19d1791 100644
|
||||
--- a/src/virtualenv/run/__init__.py
|
||||
+++ b/src/virtualenv/run/__init__.py
|
||||
@@ -89,8 +89,9 @@ def build_parser_only(args=None):
|
||||
@@ -87,8 +87,9 @@ def build_parser_only(args=None):
|
||||
|
||||
def handle_extra_commands(options):
|
||||
if options.upgrade_embed_wheels:
|
||||
@ -30,24 +30,21 @@ index e8e7ab1..617cf67 100644
|
||||
|
||||
def load_app_data(args, parser, options):
|
||||
diff --git a/src/virtualenv/seed/embed/base_embed.py b/src/virtualenv/seed/embed/base_embed.py
|
||||
index c794e83..43c636d 100644
|
||||
index f29110b..260b1a9 100644
|
||||
--- a/src/virtualenv/seed/embed/base_embed.py
|
||||
+++ b/src/virtualenv/seed/embed/base_embed.py
|
||||
@@ -6,11 +6,12 @@ from six import add_metaclass
|
||||
|
||||
from virtualenv.util.path import Path
|
||||
from virtualenv.util.six import ensure_str, ensure_text
|
||||
+from virtualenv.util.path._system_wheels import get_system_wheels_paths
|
||||
@@ -3,8 +3,9 @@ from pathlib import Path
|
||||
|
||||
from ..seeder import Seeder
|
||||
from ..wheels import Version
|
||||
+from virtualenv.util.path._system_wheels import get_system_wheels_paths
|
||||
|
||||
-PERIODIC_UPDATE_ON_BY_DEFAULT = True
|
||||
+PERIODIC_UPDATE_ON_BY_DEFAULT = False
|
||||
|
||||
|
||||
@add_metaclass(ABCMeta)
|
||||
@@ -34,6 +35,15 @@ class BaseEmbed(Seeder):
|
||||
class BaseEmbed(Seeder, metaclass=ABCMeta):
|
||||
@@ -27,6 +28,15 @@ class BaseEmbed(Seeder, metaclass=ABCMeta):
|
||||
if not self.distribution_to_versions():
|
||||
self.enabled = False
|
||||
|
||||
@ -63,19 +60,22 @@ index c794e83..43c636d 100644
|
||||
@classmethod
|
||||
def distributions(cls):
|
||||
return {
|
||||
@@ -116,3 +126,7 @@ class BaseEmbed(Seeder):
|
||||
@@ -105,6 +115,10 @@ class BaseEmbed(Seeder, metaclass=ABCMeta):
|
||||
result += f" {distribution}{ver},"
|
||||
return result[:-1] + ")"
|
||||
|
||||
def __repr__(self):
|
||||
return ensure_str(self.__unicode__())
|
||||
+
|
||||
+ def insert_system_wheels_paths(self, creator):
|
||||
+ system_wheels_paths = get_system_wheels_paths(creator.interpreter.executable)
|
||||
+ self.extra_search_dir = list(system_wheels_paths) + self.extra_search_dir
|
||||
+
|
||||
|
||||
__all__ = [
|
||||
"BaseEmbed",
|
||||
diff --git a/src/virtualenv/seed/embed/pip_invoke.py b/src/virtualenv/seed/embed/pip_invoke.py
|
||||
index c935c02..2d9d80d 100644
|
||||
index 2ca9438..339295f 100644
|
||||
--- a/src/virtualenv/seed/embed/pip_invoke.py
|
||||
+++ b/src/virtualenv/seed/embed/pip_invoke.py
|
||||
@@ -17,6 +17,7 @@ class PipInvoke(BaseEmbed):
|
||||
@@ -15,6 +15,7 @@ class PipInvoke(BaseEmbed):
|
||||
def run(self, creator):
|
||||
if not self.enabled:
|
||||
return
|
||||
@ -84,10 +84,10 @@ index c935c02..2d9d80d 100644
|
||||
with self.get_pip_install_cmd(creator.exe, for_py_version) as cmd:
|
||||
env = pip_wheel_env_run(self.extra_search_dir, self.app_data, self.env)
|
||||
diff --git a/src/virtualenv/seed/embed/via_app_data/via_app_data.py b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
|
||||
index 9a98a70..a0ecadf 100644
|
||||
index f31ecf6..d7a0f5a 100644
|
||||
--- a/src/virtualenv/seed/embed/via_app_data/via_app_data.py
|
||||
+++ b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
|
||||
@@ -39,6 +39,7 @@ class FromAppData(BaseEmbed):
|
||||
@@ -37,6 +37,7 @@ class FromAppData(BaseEmbed):
|
||||
def run(self, creator):
|
||||
if not self.enabled:
|
||||
return
|
||||
@ -96,10 +96,10 @@ index 9a98a70..a0ecadf 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/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
index ba15be9..3b488cf 100644
|
||||
index 3bd41ba..cd0c86c 100644
|
||||
--- a/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
+++ b/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
@@ -48,8 +48,11 @@ BUNDLE_SUPPORT = {
|
||||
@@ -47,8 +47,11 @@ BUNDLE_SUPPORT = {
|
||||
}
|
||||
MAX = "3.11"
|
||||
|
||||
@ -113,14 +113,13 @@ index ba15be9..3b488cf 100644
|
||||
|
||||
diff --git a/src/virtualenv/util/path/_system_wheels.py b/src/virtualenv/util/path/_system_wheels.py
|
||||
new file mode 100644
|
||||
index 0000000..a968dee
|
||||
index 0000000..19cf2ca
|
||||
--- /dev/null
|
||||
+++ b/src/virtualenv/util/path/_system_wheels.py
|
||||
@@ -0,0 +1,22 @@
|
||||
@@ -0,0 +1,21 @@
|
||||
+from pathlib import Path
|
||||
+from subprocess import check_output, CalledProcessError
|
||||
+
|
||||
+from virtualenv.util.path import Path
|
||||
+
|
||||
+
|
||||
+def get_system_wheels_paths(executable):
|
||||
+ # ensurepip wheels
|
||||
@ -140,5 +139,5 @@ index 0000000..a968dee
|
||||
+ if wheels_dir.exists():
|
||||
+ yield wheels_dir
|
||||
--
|
||||
2.35.1
|
||||
2.37.3
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (virtualenv-20.15.1.tar.gz) = 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a
|
||||
SHA512 (virtualenv-20.16.6.tar.gz) = 24ca5038cc4e9cd72cf99a8bd4b96bda10cdc8deae2e6e7a0bef5000fd8fbeda87c4fda21aeb3b109a3763e47e0a7c7a5f383914a1bb1edcd8ed6791117d91cb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user