From 3dc8c789fbb6e2f8309fafff0946623fadb37b50 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 12 Dec 2019 14:56:01 -0500
Subject: [PATCH] Avoid system site packages and add more setup things

---
 Makefile                                     | 19 ++++++++-----------
 requirements/requirements_setup_requires.txt | 11 +++++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 4d4a870635..128ad63939 100644
--- a/Makefile
+++ b/Makefile
@@ -136,12 +136,10 @@ virtualenv_ansible:
 			mkdir $(VENV_BASE); \
 		fi; \
 		if [ ! -d "$(VENV_BASE)/ansible" ]; then \
-			virtualenv -p python --system-site-packages $(VENV_BASE)/ansible && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) six packaging appdirs && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) setuptools==42.0.1 && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) wheel==0.33.6; \
-		fi; \
+			virtualenv -p python $(VENV_BASE)/ansible && \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \  # undeclared setup_requires
+		fi; \  # TODO: re-enable system site packages
 	fi
 
 virtualenv_ansible_py3:
@@ -150,11 +148,10 @@ virtualenv_ansible_py3:
 			mkdir $(VENV_BASE); \
 		fi; \
 		if [ ! -d "$(VENV_BASE)/ansible" ]; then \
-			$(PYTHON) -m venv --system-site-packages $(VENV_BASE)/ansible && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) setuptools==42.0.1 && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) wheel==0.33.6; \
-		fi; \
+			$(PYTHON) -m venv $(VENV_BASE)/ansible && \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \  # undeclared setup_requires
+		fi; \  # TODO: re-enable system site packages
 	fi
 
 virtualenv_awx:
diff --git a/requirements/requirements_setup_requires.txt b/requirements/requirements_setup_requires.txt
index 5d2db8fbfb..89cfac9e1d 100644
--- a/requirements/requirements_setup_requires.txt
+++ b/requirements/requirements_setup_requires.txt
@@ -7,3 +7,14 @@ virtualenv
 m2r
 twine  # from python-daemon
 wheel==0.33.6
+cffi>=1.1
+wheel>=0.33.6
+backports.functools_lru_cache
+more-itertools==5.0.0
+poetry
+functools32<4.0.0,>=3.2.3; python_version >= "2.7" and python_version < "2.8"
+flit; python_version >= "3.5"
+twine; python_version >= "3.6"
+incremental>=16.10.1; python_version >= "3.6"
+lxml>=3.0; python_version >= "3.6"
+pkgconfig; python_version >= "3.6"
\ No newline at end of file