External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-10 15:32:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Get rid of hacks to simplify process

Browse Source 
Remove poetry and wheel from bootstrap installs

Cleanup some docs around them
This commit is contained in:
AlanCoding 2019-12-18 13:22:20 -05:00
parent 271b3f00b7
commit 0b9b8832a8
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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

2
requirements/README.md
View File

@ -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

3
requirements/requirements.in
View File

@ -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
setuptools==41.6.0 # see UPGRADE BLOCKERs

3
requirements/requirements.txt
View File

@ -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

3
requirements/requirements_ansible.in
View File

@ -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
setuptools==41.6.0 # see upgrade blockers

2
requirements/requirements_ansible.txt
View File

@ -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: