rpms/python-virtualenv
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Explicitly require setuptools < 44 with Python 3.4

Browse Source
This commit is contained in:
Miro Hrončok 2020-02-27 15:57:02 +01:00
parent 7316fe4cb1
commit 597e27d801
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python-virtualenv.spec
View File

@ -142,6 +142,7 @@ rm -r tmp_path
%changelog %changelog
* Tue Feb 25 2020 Miro Hrončok <mhroncok@redhat.com> - 16.7.10-1 * Tue Feb 25 2020 Miro Hrončok <mhroncok@redhat.com> - 16.7.10-1
- Update to 16.7.10 - Update to 16.7.10
- Explicitly require setuptools < 44 with Python 3.4
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16.7.3-3 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 16.7.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

30
rpm-wheels.patch
View File

@ -1,8 +1,8 @@
diff --git a/virtualenv.py b/virtualenv.py diff --git a/virtualenv.py b/virtualenv.py
index 8f05739..cd10e9f 100755 index c7f71e6..3740014 100755
--- a/virtualenv.py --- a/virtualenv.py
+++ b/virtualenv.py +++ b/virtualenv.py
@@ -476,7 +476,18 @@ def virtualenv_support_dirs(): @@ -475,7 +475,18 @@ def virtualenv_support_dirs():
# normal filesystem installation # normal filesystem installation
if os.path.isdir(join(HERE, "virtualenv_support")): if os.path.isdir(join(HERE, "virtualenv_support")):
@ -22,3 +22,29 @@ index 8f05739..cd10e9f 100755
elif IS_ZIPAPP: elif IS_ZIPAPP:
tmpdir = tempfile.mkdtemp() tmpdir = tempfile.mkdtemp()
try: try:
@@ -998,6 +998,8 @@ def find_wheels(projects, search_dirs):
)
if project == "pip" and sys.version_info[0:2] == (3, 4):
wheel = next(p for v, p in versions if v <= (19, 1, 1))
+ elif project == "setuptools" and sys.version_info[0:2] == (3, 4):
+ wheel = next(p for v, p in versions if v < (44,))
else:
wheel = versions[0][1]
wheels.append(wheel)
@@ -1091,9 +1093,13 @@ def _install_wheel_with_search_dir(download, project_names, py_executable, searc
)
).encode("utf8")
- if sys.version_info[0:2] == (3, 4) and "pip" in project_names:
- at = project_names.index("pip")
- project_names[at] = "pip<19.2"
+ if sys.version_info[0:2] == (3, 4):
+ if "pip" in project_names:
+ at = project_names.index("pip")
+ project_names[at] = "pip<19.2"
+ if "setuptools" in project_names:
+ at = project_names.index("setuptools")
+ project_names[at] = "setuptools<44"
cmd = [py_executable, "-"] + project_names
logger.start_progress("Installing {}...".format(", ".join(project_names)))