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

Revert "Fix offline builds"

Browse Source 
This reverts commit fe850dff38.
This commit is contained in:
Shane McDonald
2019-06-19 16:02:43 -04:00
parent 1f3242900a
commit aaceccc426
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -123,8 +123,9 @@ virtualenv_ansible:
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv -p python --system-site-packages $(VENV_BASE)/ansible && \ 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 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; \
fi fi
@@ -145,8 +146,7 @@ virtualenv_awx:
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/awx" ]; then \ if [ ! -d "$(VENV_BASE)/awx" ]; then \
$(PYTHON) -m venv --system-site-packages $(VENV_BASE)/awx; \ $(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 docutils==0.14; \
$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==18.1; \
fi; \ fi; \
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 oauthlib==3.0.1 # via django-oauth-toolkit, requests-oauthlib, social-auth-core
ordereddict==1.1 ordereddict==1.1
pexpect==4.6.0 # via ansible-runner pexpect==4.6.0 # via ansible-runner
pkgconfig==1.4.0 # via xmlsec pkgconfig==1.5.1 # via xmlsec
prometheus_client==0.6.0 prometheus_client==0.6.0
psutil==5.4.3 psutil==5.4.3
psycopg2==2.7.3.2 psycopg2==2.7.3.2
@@ -122,5 +122,5 @@ xmlsec==1.3.3 # via python3-saml
zope.interface==4.6.0 # via twisted zope.interface==4.6.0 # via twisted
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==18.1 pip==19.1.1
setuptools==41.0.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 xmltodict==0.12.0 # via pywinrm
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==18.1 pip==19.1.1
setuptools==41.0.1 setuptools==41.0.1

2
requirements/requirements_setup_requires.txt
View File

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