Remove requirements_setup_requires and related handling.

Adjust requirements to keep docutils in awx requirements; these
are downstream packaging adjustments. Override azure wheel
dependency to a version that can install bcrypt properly.

6 files changed, 10 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index caca0ec67a..40510c5e6f 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,7 @@ virtualenv_awx:
 		fi; \
 		if [ ! -d "$(VENV_BASE)/awx" ]; then \
 			virtualenv -p $(PYTHON) $(VENV_BASE)/awx; \
-			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) $(VENV_BOOTSTRAP) && \
-			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) flit; \
+			$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) $(VENV_BOOTSTRAP); \
 		fi; \
 	fi
 
diff --git a/requirements/README.md b/requirements/README.md
index 3485ed0593..68827acdd1 100644
--- a/requirements/README.md
+++ b/requirements/README.md
@@ -38,8 +38,6 @@ This script will:
   - Update `requirements.txt` based on `requirements.in`
   - Update/generate `requirements_ansible.txt` based on `requirements_ansible.in`
     - including an automated patch that adds `python_version < "3"` for Python 2 backward compatibility
-  - Removes the `docutils` dependency line from `requirements.txt` and `requirements_ansible.txt`
-
 
 ## Licenses and Source Files
 
@@ -129,6 +127,11 @@ This breaks a very large amount of AWX code that assumes these fields
 are returned as dicts. Upgrading this library will require a refactor
 to accomidate this change.
 
+### wheel
+
+azure-cli-core requires a version of wheel that is incompatible with
+certain packages building with later versions of pip, so we override it.
+
 ### pip and setuptools
 
 The offline installer needs to have functionality confirmed before upgrading these.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 4e0d5b6c39..2e951e853b 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -37,7 +37,7 @@ django-taggit==1.2.0
 django==2.2.8
 djangorestframework-yaml==1.0.3
 djangorestframework==3.11.0
-
+docutils==0.15.2          # via python-daemon
 future==0.16.0            # via django-radius
 gitdb2==2.0.6             # via gitpython
 gitpython==3.0.5
diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt
index f7b722c647..d5d90a8113 100644
--- a/requirements/requirements_ansible.txt
+++ b/requirements/requirements_ansible.txt
@@ -111,7 +111,7 @@ stevedore==1.31.0         # via keystoneauth1
 tabulate==0.8.2           # via azure-cli-core, knack
 typing==3.7.4.1; python_version < "3" # via msrest
 urllib3==1.25.7           # via botocore, requests
-wheel==0.30.0             # via azure-cli-core
+wheel==0.33.6  # via azure-cli-core (overriden, see upgrade blockers)
 xmltodict==0.12.0         # via pywinrm
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/requirements_setup_requires.txt b/requirements/requirements_setup_requires.txt
deleted file mode 100644
index 3499f53fb1..0000000000
--- a/requirements/requirements_setup_requires.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-pbr>=1.8
-setuptools_scm>=3.1.0
-setuptools==41.6.0
-vcversioner>=2.16.0.0
-pytest-runner
-isort
-m2r
-cffi>=1.1
-wheel>=0.33.6,<42.0.0
-backports.functools_lru_cache
-more-itertools==5.0.0
-poetry==0.12.17
-functools32<4.0.0,>=3.2.3; python_version >= "2.7" and python_version < "2.8"
-flit==2.2.0; python_version >= "3.5"
-zipp==0.6.0  # indirect dependency, higher versions will require setuptools>=42
-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"
-shellingham==1.3.1
diff --git a/requirements/updater.sh b/requirements/updater.sh
index 1d3e032403..e5eebbc066 100755
--- a/requirements/updater.sh
+++ b/requirements/updater.sh
@@ -77,7 +77,8 @@ main() {
   generate_requirements_v3
   generate_requirements_v2
 
-  sed -i 's/^docutils.*//g' requirements.txt
+  sed -i 's/^wheel==0.30.0.*/wheel==0.33.6  # via azure-cli-core (overriden, see upgrade blockers)/g' requirements_ansible.txt
+  sed -i 's/^wheel==0.30.0.*/wheel==0.33.6  # via azure-cli-core (overriden, see upgrade blockers)/g' requirements_ansible_py3.txt
   generate_patch | patch -p4 requirements_ansible_py3.txt
 
   cp -vf requirements_ansible_py3.txt "${requirements_ansible}"