From aaceccc42665379a49edcc2ddf75a5d4c315658f Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 19 Jun 2019 16:02:43 -0400
Subject: [PATCH] Revert "Fix offline builds"

This reverts commit fe850dff3886be66bc7ad504800e86f179217620.
---
 Makefile                                     | 6 +++---
 requirements/requirements.txt                | 4 ++--
 requirements/requirements_ansible.txt        | 2 +-
 requirements/requirements_setup_requires.txt | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c97ed02214..5f3b00e9f1 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,9 @@ virtualenv_ansible:
 		fi; \
 		if [ ! -d "$(VENV_BASE)/ansible" ]; then \
 			virtualenv -p python --system-site-packages $(VENV_BASE)/ansible && \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
 			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==41.0.1 && \
-			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==18.1; \
+			$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==19.1.1; \
 		fi; \
 	fi
 
@@ -145,8 +146,7 @@ virtualenv_awx:
 		fi; \
 		if [ ! -d "$(VENV_BASE)/awx" ]; then \
 			$(PYTHON) -m venv --system-site-packages $(VENV_BASE)/awx; \
-			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==41.0.1; \
-			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==18.1; \
+			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed docutils==0.14; \
 		fi; \
 	fi
 
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index f1f9fb8f16..54e3988c98 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -74,7 +74,7 @@ netaddr==0.7.19           # via pyrad
 oauthlib==3.0.1           # via django-oauth-toolkit, requests-oauthlib, social-auth-core
 ordereddict==1.1
 pexpect==4.6.0            # via ansible-runner
-pkgconfig==1.4.0          # via xmlsec
+pkgconfig==1.5.1          # via xmlsec
 prometheus_client==0.6.0
 psutil==5.4.3
 psycopg2==2.7.3.2
@@ -122,5 +122,5 @@ xmlsec==1.3.3             # via python3-saml
 zope.interface==4.6.0     # via twisted
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==18.1
+pip==19.1.1
 setuptools==41.0.1
diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt
index 32441fa347..7631d616e0 100644
--- a/requirements/requirements_ansible.txt
+++ b/requirements/requirements_ansible.txt
@@ -122,5 +122,5 @@ wheel==0.30.0             # via azure-cli-core
 xmltodict==0.12.0         # via pywinrm
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==18.1
+pip==19.1.1
 setuptools==41.0.1
diff --git a/requirements/requirements_setup_requires.txt b/requirements/requirements_setup_requires.txt
index ff9f251368..b6a1d0aea9 100644
--- a/requirements/requirements_setup_requires.txt
+++ b/requirements/requirements_setup_requires.txt
@@ -5,5 +5,3 @@ pytest-runner
 isort
 virtualenv
 m2r
-flit
-intreehooks