From c62445de22d4593ca0f8ae1c1c6d1cb4f88cf250 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 29 Nov 2022 11:43:01 +0100
Subject: [PATCH 1/2] python-setup: rely on new `virtualenv` for venv creation
 in Ubuntu 22.04

Removes the hotfix from https://github.com/github/codeql-action/pull/1257
---
 python-setup/install_tools.ps1 |  4 ++--
 python-setup/install_tools.sh  | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/python-setup/install_tools.ps1 b/python-setup/install_tools.ps1
index 353edfe4fd..9998333768 100644
--- a/python-setup/install_tools.ps1
+++ b/python-setup/install_tools.ps1
@@ -4,8 +4,8 @@
 # version of `setuptools` to ensure that binaries are always put under
 # `<venv-path>/bin`, which wouldn't always happen with the GitHub actions version of
 # Ubuntu 22.04. See https://github.com/github/codeql-action/issues/1249
-py -2 -m pip install --user --upgrade pip 'setuptools<60' wheel
-py -3 -m pip install --user --upgrade pip 'setuptools<60' wheel
+py -2 -m pip install --user --upgrade pip setuptools wheel
+py -3 -m pip install --user --upgrade pip setuptools wheel
 
 # virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
 # pip/setuptools/wheel which basic `python3 -m venv venv` won't
diff --git a/python-setup/install_tools.sh b/python-setup/install_tools.sh
index a247da4ead..d5ff2990fd 100755
--- a/python-setup/install_tools.sh
+++ b/python-setup/install_tools.sh
@@ -12,16 +12,15 @@ export PATH="$HOME/.local/bin:$PATH"
 
 # Setup Python 3 dependency installation tools.
 
-# we install an older version of `setuptools` to ensure that binaries are always put
-# under `<venv-path>/bin`, which wouldn't always happen with the GitHub actions version
-# of Ubuntu 22.04. See https://github.com/github/codeql-action/issues/1249. The the next
-# release of `virtualenv` after v20.16.5 will include a fix for this, so we can remove
-# this bit of the logic again.
-python3 -m pip install --user --upgrade pip 'setuptools<60' wheel
+python3 -m pip install --user --upgrade pip setuptools wheel
 
-# virtualenv is a bit nicer for setting up virtual environment, since it will provide up-to-date versions of
-# pip/setuptools/wheel which basic `python3 -m venv venv` won't
-python3 -m pip install --user virtualenv
+# virtualenv is a bit nicer for setting up virtual environment, since it will provide
+# up-to-date versions of pip/setuptools/wheel which basic `python3 -m venv venv` won't.
+#
+# version 20.16.5 (Python 3 only) had some problems when used together with newer
+# versions of setuptools (60+) and would not always put binaries under `<venv-path>/bin`
+# -- see https://github.com/github/codeql-action/issues/1249 for more details.
+python3 -m pip install --user --upgrade 'virtualenv>20.16.5'
 
 # We install poetry with pip instead of the recommended way, since the recommended way
 # caused some problem since `poetry run` gives output like:
@@ -45,7 +44,7 @@ if command -v python2 >/dev/null 2>&1; then
 		curl --location --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2
 	fi
 
-	python2 -m pip install --user --upgrade pip 'setuptools<60' wheel
+	python2 -m pip install --user --upgrade pip setuptools wheel
 
 	python2 -m pip install --user 'virtualenv!=20.12.0'
 fi

From caf1c5057b627542f1ddab85460b685193428121 Mon Sep 17 00:00:00 2001
From: Rasmus Wriedt Larsen <rasmuswl@github.com>
Date: Tue, 29 Nov 2022 13:24:10 +0100
Subject: [PATCH 2/2] python-setup: Remove outdated comment

---
 python-setup/install_tools.ps1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/python-setup/install_tools.ps1 b/python-setup/install_tools.ps1
index 9998333768..ad50fb3b75 100644
--- a/python-setup/install_tools.ps1
+++ b/python-setup/install_tools.ps1
@@ -1,9 +1,5 @@
 #! /usr/bin/pwsh
 
-# while waiting for the next release of `virtualenv` after v20.16.5, we install an older
-# version of `setuptools` to ensure that binaries are always put under
-# `<venv-path>/bin`, which wouldn't always happen with the GitHub actions version of
-# Ubuntu 22.04. See https://github.com/github/codeql-action/issues/1249
 py -2 -m pip install --user --upgrade pip setuptools wheel
 py -3 -m pip install --user --upgrade pip setuptools wheel
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/github/codeql-action/pull/1402.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/github/codeql-action/pull/1402.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/github/codeql-action/pull/1402.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/github/codeql-action/pull/1402.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>