From 57c0e1d9092f0ada854ec52c9136f851a7d7ba60 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Mon, 13 Feb 2023 14:53:19 +0100
Subject: [PATCH] Update to 20.19.0 (rhbz#2167499)

---
 python-virtualenv.spec | 50 +++++++++++++++++++-----------------------
 rpm-wheels.patch       |  8 +++----
 sources                |  2 +-
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 9e0f5ca..4d9e0eb 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,6 +1,6 @@
 Name:           python-virtualenv
-Version:        20.17.1
-Release:        2%{?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}
@@ -81,7 +75,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-*
@@ -92,24 +85,28 @@ test ! -f src/virtualenv/seed/embed/wheels/*.whl
 
 # Relax the upper bounds of some dependencies to their known available versions in EL 9
 # We run tests and CI to verify nothing broke
-sed -i -e 's/distlib>=0.3.6/distlib>=0.3.2/' \
-       -e 's/filelock>=3.4.1/filelock>=3.3.1/' \
-       -e 's/platformdirs>=2.4/platformdirs>=2.3/' \
-    setup.cfg
+sed -i -e 's/distlib<1,>=0.3.6/distlib<1,>=0.3.2/' \
+       -e 's/filelock<4,>=3.4.1/filelock<4,>=3.3.1/' \
+       -e 's/platformdirs<4,>=2.4/platformdirs<4,>=2.3/' \
+    pyproject.toml
+
+%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:
@@ -133,19 +130,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)
+
 * Mon Jan 30 2023 Miro Hrončok <mhroncok@redhat.com> - 20.17.1-2
 - Use wheels from /usr/share/python3.11-wheels when creating Python 3.11 virtual environments
 - Require Python 3.11 wheels when Python 3.11 is installed
diff --git a/rpm-wheels.patch b/rpm-wheels.patch
index bffbc4b..61e6a88 100644
--- a/rpm-wheels.patch
+++ b/rpm-wheels.patch
@@ -1,4 +1,4 @@
-From 9c2b528d300f4b8e4ccc7b81d68fdfd054214f80 Mon Sep 17 00:00:00 2001
+From 19ebd526eacab84dfb3e432e968125ec95f95e89 Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
 Date: Thu, 27 Oct 2022 11:50:54 +0200
 Subject: [PATCH] RPM wheels
@@ -96,12 +96,12 @@ 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 4d3108e..e6e2730 100644
+index f779e07..806fff3 100644
 --- a/src/virtualenv/seed/wheels/embed/__init__.py
 +++ b/src/virtualenv/seed/wheels/embed/__init__.py
-@@ -47,8 +47,11 @@ BUNDLE_SUPPORT = {
+@@ -52,8 +52,11 @@ BUNDLE_SUPPORT = {
  }
- MAX = "3.11"
+ MAX = "3.12"
  
 +# Redefined here because bundled wheels are removed in RPM build
 +BUNDLE_SUPPORT = None
diff --git a/sources b/sources
index 1c52b41..092691c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualenv-20.17.1.tar.gz) = 6b32145f431f6b1f4c2a2ed888e8b9e5cb941e04ea1e68830053dceac80ee8bbf2286c1f353951d50d4b8417b8d81ee4b30dae597c94f2a3baf50f174f7ef4d4
+SHA512 (virtualenv-20.19.0.tar.gz) = 75c63fea11ad070985cb2ba17adfcb7e1739e8798b80919cc17a527d7180f68a04197436b44146cd07423d8d2e4982d1716b0e18159add5ce6a748b31f6b2776