Update to 20.19.0 (rhbz#2167499)
This commit is contained in:
Lumir Balhar
parent
10222f5ae2
commit
693ab6fbe9
@ -1,6 +1,6 @@
|
||||
Name: python-virtualenv
|
||||
Version: 20.17.1
|
||||
Release: 3%{?dist}
|
||||
Version: 20.19.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Tool to create isolated Python environments
|
||||
|
||||
License: MIT
|
||||
@ -13,12 +13,6 @@ Patch1: rpm-wheels.patch
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-distlib
|
||||
BuildRequires: python3-filelock
|
||||
BuildRequires: python3-platformdirs
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-setuptools_scm
|
||||
BuildRequires: python3-six
|
||||
|
||||
%bcond_without tests
|
||||
%if %{with tests}
|
||||
@ -80,7 +74,6 @@ licensed under an MIT-style permissive license
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n virtualenv-%{version}
|
||||
sed -i -e "1s|#!/usr/bin/env python||" tasks/update_embedded.py
|
||||
|
||||
# Remove the wheels provided by RPM packages
|
||||
rm src/virtualenv/seed/wheels/embed/pip-*
|
||||
@ -93,19 +86,23 @@ test ! -f src/virtualenv/seed/embed/wheels/*.whl
|
||||
# On Fedora, this should change nothing, but when building for RHEL9+, it will
|
||||
sed -i "s|/usr/share/python-wheels|%{python_wheel_dir}|" src/virtualenv/util/path/_system_wheels.py
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
%build
|
||||
# Build code
|
||||
%{py3_build}
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%{py3_install}
|
||||
%pyproject_install
|
||||
%pyproject_save_files virtualenv
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
mkdir tmp_path
|
||||
ln -s $(realpath %{__python3}) tmp_path/python
|
||||
export PATH="$(pwd)/tmp_path:$PATH"
|
||||
unset SOURCE_DATE_EPOCH
|
||||
# Existing dist-info folder confuses
|
||||
# importlib.metadata entry points and
|
||||
# that leads to failed tests where
|
||||
# virtualenv is run via subprocess.
|
||||
rm -rv *.dist-info
|
||||
|
||||
# Skip tests which requires internet or some extra dependencies
|
||||
# Requires internet:
|
||||
@ -129,19 +126,16 @@ PIP_CERT=/etc/pki/tls/certs/ca-bundle.crt \
|
||||
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
|
||||
|
||||
%files -n python3-virtualenv
|
||||
%license LICENSE
|
||||
%doc docs/*rst README.md
|
||||
%files -n python3-virtualenv -f %{pyproject_files}
|
||||
%doc README.md
|
||||
%{_bindir}/virtualenv
|
||||
%{python3_sitelib}/virtualenv/
|
||||
%{python3_sitelib}/virtualenv-*.egg-info/
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 09 2023 Lumír Balhar <lbalhar@redhat.com> - 20.19.0-1
|
||||
- Update to 20.19.0 (rhbz#2167499)
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20.17.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
From 5ba67ace2437432ee78d21c68dfbb785ad0e9723 Mon Sep 17 00:00:00 2001
|
||||
From bc989ca9c586db2600a9e7349e54db0945876043 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
Date: Thu, 27 Oct 2022 11:50:54 +0200
|
||||
Date: Thu, 9 Feb 2023 15:13:36 +0100
|
||||
Subject: [PATCH] RPM wheels
|
||||
|
||||
---
|
||||
@ -8,9 +8,9 @@ Subject: [PATCH] RPM wheels
|
||||
src/virtualenv/seed/embed/base_embed.py | 16 +++++++++++++-
|
||||
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/seed/wheels/embed/__init__.py | 4 ++++
|
||||
src/virtualenv/util/path/_system_wheels.py | 21 +++++++++++++++++++
|
||||
6 files changed, 44 insertions(+), 3 deletions(-)
|
||||
6 files changed, 45 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
|
||||
@ -96,16 +96,16 @@ 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/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
index 3bd41ba..cd0c86c 100644
|
||||
index f779e07..db141ae 100644
|
||||
--- a/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
+++ b/src/virtualenv/seed/wheels/embed/__init__.py
|
||||
@@ -47,8 +47,11 @@ BUNDLE_SUPPORT = {
|
||||
}
|
||||
MAX = "3.11"
|
||||
@@ -53,7 +53,11 @@ BUNDLE_SUPPORT = {
|
||||
MAX = "3.12"
|
||||
|
||||
|
||||
+# Redefined here because bundled wheels are removed in RPM build
|
||||
+BUNDLE_SUPPORT = None
|
||||
|
||||
+
|
||||
def get_embed_wheel(distribution, for_py_version):
|
||||
+ return None # BUNDLE_SUPPORT == None anyway
|
||||
path = BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution)
|
||||
@ -139,5 +139,5 @@ index 0000000..19cf2ca
|
||||
+ if wheels_dir.exists():
|
||||
+ yield wheels_dir
|
||||
--
|
||||
2.37.3
|
||||
2.39.1
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (virtualenv-20.17.1.tar.gz) = 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
|
||||
SHA512 (virtualenv-20.19.0.tar.gz) = 75c63fea11ad070985cb2ba17adfcb7e1739e8798b80919cc17a527d7180f68a04197436b44146cd07423d8d2e4982d1716b0e18159add5ce6a748b31f6b2776
|
||||
|
||||
Loading…
Reference in New Issue
Block a user