From 740c6e2e0cf2eb7b6aba638ec972eb0926c2d42f Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Wed, 21 Apr 2021 11:02:07 +0200
Subject: [PATCH] Update to 20.4.4

---
 python-virtualenv.spec        | 12 +++++------
 remove-pip_cert-fixture.patch | 38 -----------------------------------
 sources                       |  2 +-
 3 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 remove-pip_cert-fixture.patch

diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index c49474e..1c1b11a 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,5 +1,5 @@
 Name:           python-virtualenv
-Version:        20.4.3
+Version:        20.4.4
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -9,11 +9,6 @@ Source0:        %{pypi_source virtualenv}
 
 # Add /usr/share/python-wheels to extra_search_dir
 Patch1: rpm-wheels.patch
-# A pytest autouse fixture introduced to workaround a pip issue breaks when PIP_CERT is set.
-# We don't need the workaround, so we remove the fixture entirely until this is fixed.
-# https://github.com/pypa/virtualenv/issues/2048
-# https://github.com/pypa/pip/issues/8984
-Patch2: remove-pip_cert-fixture.patch
 
 BuildArch:      noarch
 
@@ -135,6 +130,7 @@ unset SOURCE_DATE_EPOCH
 # - test_acquire_find_wheel.py (whole file)
 # Uses disabled functionalities around automatic updates:
 # - test_periodic_update.py (whole file)
+PIP_CERT=/etc/pki/tls/certs/ca-bundle.crt \
 %pytest -vv -k "not test_acquire_find_wheel 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"
 
 rm -r tmp_path
@@ -154,6 +150,10 @@ rm -r tmp_path
 
 
 %changelog
+* Wed Apr 21 2021 Lumír Balhar <lbalhar@redhat.com> - 20.4.4-1
+- Update to 20.4.4
+  Resolves: rhbz#1951515
+
 * Wed Mar 17 2021 Lumír Balhar <lbalhar@redhat.com> - 20.4.3-1
 - Update to 20.4.3
 Resolves: rhbz#1939428
diff --git a/remove-pip_cert-fixture.patch b/remove-pip_cert-fixture.patch
deleted file mode 100644
index 3c3c903..0000000
--- a/remove-pip_cert-fixture.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bd1bf597199a209b70bddec3cdaa64a9e4902cfa Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Tue, 12 Jan 2021 08:09:38 +0100
-Subject: [PATCH] Remove pip_cert fixture
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 4b91773..7b9628c 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -148,21 +148,6 @@ def ignore_global_config(tmp_path_factory):
-         yield
- 
- 
--@pytest.fixture(autouse=True, scope="session")
--def pip_cert(tmp_path_factory):
--    # workaround for https://github.com/pypa/pip/issues/8984 - if the certificate is explicitly set no error can happen
--    key = ensure_str("PIP_CERT")
--    if key in os.environ:
--        return
--    cert = tmp_path_factory.mktemp("folder") / "cert"
--    import pkgutil
--
--    cert_data = pkgutil.get_data("pip._vendor.certifi", "cacert.pem")
--    cert.write_bytes(cert_data)
--    with change_os_environ(key, str(cert)):
--        yield
--
--
- @pytest.fixture(autouse=True)
- def check_os_environ_stable():
-     old = os.environ.copy()
--- 
-2.29.2
-
diff --git a/sources b/sources
index 152c571..ca7fccf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualenv-20.4.3.tar.gz) = d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
+SHA512 (virtualenv-20.4.4.tar.gz) = acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd