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

Merge pull request #4106 from shanemcd/fix-offline-builds

Browse Source 
Downgrade pip

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-06-18 23:17:48 +00:00 committed by GitHub
commit 9c06dc7106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -123,9 +123,8 @@ 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==19.1.1; \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==18.1; \
fi; \
fi
@ -146,7 +145,8 @@ 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 docutils==0.14; \
$(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; \
fi; \
fi

4
requirements/requirements.txt
View File

@ -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.5.1 # via xmlsec
pkgconfig==1.4.0 # 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==19.1.1
pip==18.1
setuptools==41.0.1

2
requirements/requirements_ansible.txt
View File

@ -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==19.1.1
pip==18.1
setuptools==41.0.1

2
requirements/requirements_setup_requires.txt
View File

@ -5,3 +5,5 @@ pytest-runner
isort
virtualenv
m2r
flit
intreehooks