From 0b9b8832a802db6cc89999bca5df9a14fa81a45a Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 18 Dec 2019 13:22:20 -0500 Subject: [PATCH] Get rid of hacks to simplify process Remove poetry and wheel from bootstrap installs Cleanup some docs around them --- Makefile | 8 ++++---- requirements/README.md | 2 +- requirements/requirements.in | 3 +-- requirements/requirements.txt | 3 +-- requirements/requirements_ansible.in | 3 +-- requirements/requirements_ansible.txt | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9b7378fc12..4a3e73beb4 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ DEV_DOCKER_TAG_BASE ?= gcr.io/ansible-tower-engineering SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,twilio # These should be upgraded in the AWX and Ansible venv before attempting # to install the actual requirements -VENV_BOOTSTRAP ?= pip==19.3.1 setuptools==41.6.0 wheel==0.33.6 +VENV_BOOTSTRAP ?= pip==19.3.1 setuptools==41.6.0 # Determine appropriate shasum command UNAME_S := $(shell uname -s) @@ -157,8 +157,8 @@ virtualenv_ansible_py3: fi; \ fi -# poetry and flit are needed for offline install of certain packages -# but are not declared in setup_requires due to complex reasons +# flit is needed for offline install of certain packages, specifically ptyprocess +# it is needed for setup, but not always recognized as a setup dependency # similar to pip, setuptools, and wheel, these are all needed here as a bootstrapping issues virtualenv_awx: if [ "$(VENV_BASE)" ]; then \ @@ -168,7 +168,7 @@ virtualenv_awx: 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) poetry==0.12.17 flit; \ + $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) flit; \ fi; \ fi diff --git a/requirements/README.md b/requirements/README.md index 83b15d2774..40b68f0172 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -129,7 +129,7 @@ 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. -### pip and setuptools and wheel +### pip and setuptools The offline installer needs to have functionality confirmed before upgrading these. Versions need to match the versions used in the pip bootstrapping step diff --git a/requirements/requirements.in b/requirements/requirements.in index 1fd9d01bc6..4bc1157ea1 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -45,5 +45,4 @@ twilio uWSGI uwsgitop pip==19.3.1 # see UPGRADE BLOCKERs -setuptools==41.6.0 # see UPGRADE BLOCKERs -wheel==0.33.6 # see UPGRADE BLOCKERs \ No newline at end of file +setuptools==41.6.0 # see UPGRADE BLOCKERs \ No newline at end of file diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 41c532f232..b41c75ab81 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -114,7 +114,7 @@ social-auth-core==3.2.0 sqlparse==0.3.0 # via django tacacs_plus==1.0 tempora==1.14.1 # via irc, jaraco.logging -twilio==6.35.0 +twilio==6.35.1 twisted==19.10.0 # via daphne txaio==18.8.1 # via autobahn urllib3==1.25.7 # via kubernetes, requests @@ -122,7 +122,6 @@ uwsgi==2.0.18 uwsgitop==0.11 vine==1.3.0 # via amqp, celery websocket-client==0.56.0 # via kubernetes, slackclient -wheel==0.33.6 xmlsec==1.3.3 # via python3-saml zipp==0.6.0 # via importlib-metadata zope.interface==4.7.1 # via twisted diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index f85ac9c75b..7c9d53abd7 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -63,5 +63,4 @@ requests-credssp==1.0.2 # For windows authentication awx/issues/1144 # OpenStack openstacksdk==0.31.1 pip==19.3.1 # see upgrade blockers -setuptools==41.6.0 # see upgrade blockers -wheel==0.33.6 # see UPGRADE BLOCKERs \ No newline at end of file +setuptools==41.6.0 # see upgrade blockers \ No newline at end of file diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 1ea66c0d3d..feb44dcc29 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.33.6 +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: