From e650db547c092bf96468335b4b2ecc6852453f21 Mon Sep 17 00:00:00 2001
From: Stanislav Levin <slev@altlinux.org>
Date: Tue, 19 Oct 2021 13:32:57 +0300
Subject: [PATCH] azure: Don't customize pip's builddir

As of 21.3 pip:

> Remove the --build-dir option and aliases, one last time. (pypa/pip#10485)

https://pip.pypa.io/en/stable/news/#v21-3

Previous versions warn about deprecation.

The builddir is provided to pip via env variable PIP_BUILD in Tox task.
The purpose of changing of default builddir was noexec mount option for
/tmp in Travis (see 17d571c961). Since Travis is no longer used and
Azure lacks this issue the PIP_BUILD can be safely removed.

Note: pip 21.3 just ignores this env variable, which is more than can be
said for the command line option. It's better to clean it up, since the
behaviour may be changed in future.

This is effectively the revert of 17d571c961.

Fixes: https://pagure.io/freeipa/issue/9011
Signed-off-by: Stanislav Levin <slev@altlinux.org>
---
 .tox-install.sh | 16 ++--------------
 tox.ini         |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.tox-install.sh b/.tox-install.sh
index ff22b4d79fe..94c1dc6270a 100755
--- a/.tox-install.sh
+++ b/.tox-install.sh
@@ -4,9 +4,8 @@ set -ex
 FLAVOR="$1"
 ENVPYTHON="$(realpath -s "$2")"
 ENVSITEPACKAGESDIR="$(realpath -s "$3")"
-ENVDIR="$4"
-# 4...end are package requirements
-shift 4
+# 3...end are package requirements
+shift 3
 
 TOXINIDIR="$(cd "$(dirname "$0")" && pwd)"
 
@@ -26,21 +25,10 @@ if [ ! -f "${TOXINIDIR}/tox.ini" ]; then
     exit 3
 fi
 
-if [ ! -d "${ENVDIR}" ]; then
-    echo "${ENVDIR}: no such directory"
-    exit 4
-fi
-
 # https://pip.pypa.io/en/stable/user_guide/#environment-variables
 export PIP_CACHE_DIR="${TOXINIDIR}/.tox/cache"
 mkdir -p "${PIP_CACHE_DIR}"
 
-# /tmp could be mounted with noexec option.
-# pip checks if path is executable and if not then doesn't set such
-# permission bits
-export PIP_BUILD="${ENVDIR}/pip_build"
-rm -rf "${PIP_BUILD}"
-
 DISTBUNDLE="${TOXINIDIR}/dist/bundle"
 mkdir -p "${DISTBUNDLE}"
 
diff --git a/tox.ini b/tox.ini
index 38d1b5a38df..7f2835d0655 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ skipsdist=true
 # always re-create virtual env. A special install helper is used to configure,
 # build and install packages.
 recreate=True
-install_command={toxinidir}/.tox-install.sh wheel_bundle {envpython} {envsitepackagesdir} {envdir} {packages}
+install_command={toxinidir}/.tox-install.sh wheel_bundle {envpython} {envsitepackagesdir} {packages}
 changedir={envdir}
 setenv=
     HOME={envtmpdir}
@@ -34,7 +34,7 @@ commands=
 
 [testenv:pypi]
 recreate=True
-install_command={toxinidir}/.tox-install.sh pypi_packages {envpython} {envsitepackagesdir} {envdir} {packages}
+install_command={toxinidir}/.tox-install.sh pypi_packages {envpython} {envsitepackagesdir} {packages}
 changedir={envdir}
 setenv=
     HOME={envtmpdir}