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

Merge pull request #4114 from shanemcd/revert-pip-and-setuptools

Browse Source 
Revert pip and setuptools

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-06-20 02:42:04 +00:00 committed by GitHub
commit 4daf574899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

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

2
requirements/README.md
View File

@ -1,8 +1,6 @@
The requirements.txt and requirements_ansible.txt files are generated from requirements.in and requirements_ansible.in, respectively, using `pip-tools` `pip-compile`. The following commands should do this if ran inside the tools_awx container.
Run these commands from the root of the awx repo. This will produce python 3 requirements files.
If you do not wish to upgrade dependencies generally (such as adding a specific dependency
needed for a feature) then do not use the `-U` flag.
```
python3 -m venv /buildit

4
requirements/requirements.in
View File

@ -45,5 +45,5 @@ tacacs_plus==1.0
twilio==6.10.4
uWSGI==2.0.17
uwsgitop==0.10.0
pip==19.1.1
setuptools==41.0.1
pip==9.0.1
setuptools==36.0.1

6
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.4.0 # via xmlsec
pkgconfig==1.5.1 # 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==18.1
setuptools==41.0.1
pip==9.0.1
setuptools==36.0.1

4
requirements/requirements_ansible.in
View File

@ -53,8 +53,8 @@ pycurl==7.43.0.1 # higher versions will not install without SSL backend speci
pexpect==4.6.0 # same as AWX requirement
psutil==5.4.3 # same as AWX requirement
ptyprocess==0.5.2 # via pexpect, but needs to be pinned. Read the blame.
pip==19.1.1
setuptools==41.0.1
setuptools==36.0.1
pip==9.0.1
# VMware
pyvmomi==6.5
# WinRM

4
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==18.1
setuptools==41.0.1
pip==9.0.1
setuptools==36.0.1

2
requirements/requirements_setup_requires.txt
View File

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