From 960eb45a8056593405f5d89f48c2eab21dc349a9 Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:55:14 +0100
Subject: [PATCH 1/4] Update pip==22.1.2 for EL builds

Try to fix a bug when environment markers are not properly handled
---
 rpmspec/package_venv.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpmspec/package_venv.spec b/rpmspec/package_venv.spec
index e77c1482..ce13d8c2 100644
--- a/rpmspec/package_venv.spec
+++ b/rpmspec/package_venv.spec
@@ -17,7 +17,7 @@
 
 %define venv_python %{venv_bin}/%{python_binname}
 # https://github.com/StackStorm/st2/wiki/Where-all-to-update-pip-and-or-virtualenv
-%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==20.3.3
+%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==22.1.2
 %define install_venvctrl %{python_binname} -m pip install venvctrl
 %if 0%{?rhel} == 8
 %define install_crypto %{venv_python} %{venv_bin}/pip3.8 install cryptography==2.8

From 28ac7f79677accc4e2209702fc44a2da1cff7364 Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:09:10 +0100
Subject: [PATCH 2/4] Pin pip for EL builds to latest py3.6-compatible: 21.3.1

---
 rpmspec/package_venv.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpmspec/package_venv.spec b/rpmspec/package_venv.spec
index ce13d8c2..4da02875 100644
--- a/rpmspec/package_venv.spec
+++ b/rpmspec/package_venv.spec
@@ -17,7 +17,7 @@
 
 %define venv_python %{venv_bin}/%{python_binname}
 # https://github.com/StackStorm/st2/wiki/Where-all-to-update-pip-and-or-virtualenv
-%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==22.1.2
+%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==21.3.1
 %define install_venvctrl %{python_binname} -m pip install venvctrl
 %if 0%{?rhel} == 8
 %define install_crypto %{venv_python} %{venv_bin}/pip3.8 install cryptography==2.8

From 0832f2f6d134186ad2403003a3a7a092148ce22d Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:03:54 +0100
Subject: [PATCH 3/4] Use deprecatred dependency resolver

---
 rpmspec/package_venv.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpmspec/package_venv.spec b/rpmspec/package_venv.spec
index 4da02875..6566db17 100644
--- a/rpmspec/package_venv.spec
+++ b/rpmspec/package_venv.spec
@@ -37,7 +37,7 @@
     %{pin_pip} \
     %{install_crypto} \
     %{venv_pip} --use-deprecated=legacy-resolver -r requirements.txt \
-    %{venv_pip} . \
+    %{venv_pip} --use-deprecated=legacy-resolver . \
     %{install_venvctrl} \
     venvctrl-relocate --source=%{venv_dir} --destination=/%{venv_install_dir} \
 %{nil}

From c4d39c666025ee176db4bd4133e19d11b609e81b Mon Sep 17 00:00:00 2001
From: Eugen C <1533818+armab@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:18:40 +0100
Subject: [PATCH 4/4] Revert pip version

---
 rpmspec/package_venv.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpmspec/package_venv.spec b/rpmspec/package_venv.spec
index 6566db17..bd1270bb 100644
--- a/rpmspec/package_venv.spec
+++ b/rpmspec/package_venv.spec
@@ -17,7 +17,7 @@
 
 %define venv_python %{venv_bin}/%{python_binname}
 # https://github.com/StackStorm/st2/wiki/Where-all-to-update-pip-and-or-virtualenv
-%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==21.3.1
+%define pin_pip %{venv_python} %{venv_bin}/%{pip_binname} install pip==20.3.3
 %define install_venvctrl %{python_binname} -m pip install venvctrl
 %if 0%{?rhel} == 8
 %define install_crypto %{venv_python} %{venv_bin}/pip3.8 install cryptography==2.8