From acb80f1b48a4d8aba25fde2bb249db70a30afd69 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Tue, 12 Jan 2021 08:19:57 +0100
Subject: [PATCH] Update to 20.3.0 (#1914641)

---
 python-virtualenv.spec        | 20 +++++++++---------
 remove-pip_cert-fixture.patch | 38 +++++++++++++++++++++++++++++++++++
 sources                       |  2 +-
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 remove-pip_cert-fixture.patch

diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 7d19ae1..9812ea4 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,5 +1,5 @@
 Name:           python-virtualenv
-Version:        20.2.1
+Version:        20.3.0
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -9,6 +9,11 @@ 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
 
@@ -36,12 +41,10 @@ BuildRequires:  gcc
 BuildRequires:  python3-flaky
 BuildRequires:  python3-packaging
 BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-xdist
 BuildRequires:  python3-pytest-mock
 BuildRequires:  python3-pytest-randomly
 BuildRequires:  python3-pytest-timeout
-# FTBFS with Py 3.9: https://bugzilla.redhat.com/show_bug.cgi?id=1817770
-# BuildRequires:  xonsh
+BuildRequires:  xonsh
 %endif
 
 # RPM installed wheels
@@ -132,11 +135,7 @@ unset SOURCE_DATE_EPOCH
 # - test_acquire_find_wheel.py (whole file)
 # Uses disabled functionalities around automatic updates:
 # - test_periodic_update.py (whole file)
-# Workaround xonsh tests not being skipped when xonsh is missing:
-# - test_xonsh
-# - https://github.com/pypa/virtualenv/issues/2014
-# - https://github.com/pypa/virtualenv/pull/2013
-%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 and not xonsh"
+%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
 %endif
@@ -155,6 +154,9 @@ rm -r tmp_path
 
 
 %changelog
+* Tue Jan 12 2021 Lumír Balhar <lbalhar@redhat.com> - 20.3.0-1
+- Update to 20.3.0 (#1914641)
+
 * Mon Nov 23 2020 Lumír Balhar <lbalhar@redhat.com> - 20.2.1-1
 - Update to 20.2.1 (#1900253)
 
diff --git a/remove-pip_cert-fixture.patch b/remove-pip_cert-fixture.patch
new file mode 100644
index 0000000..3c3c903
--- /dev/null
+++ b/remove-pip_cert-fixture.patch
@@ -0,0 +1,38 @@
+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 8b489e2..13b9630 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualenv-20.2.1.tar.gz) = e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
+SHA512 (virtualenv-20.3.0.tar.gz) = 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b