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

Avoid system site packages and add more setup things

Browse Source
This commit is contained in:
AlanCoding
2019-12-12 14:56:01 -05:00
parent 7873d08311
commit 3dc8c789fb
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -136,12 +136,10 @@ virtualenv_ansible:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
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 $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) six packaging appdirs && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) setuptools==42.0.1 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 && \ fi; \ # TODO: re-enable system site packages
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) wheel==0.33.6; \
fi; \
fi fi
virtualenv_ansible_py3: virtualenv_ansible_py3:
@@ -150,11 +148,10 @@ virtualenv_ansible_py3:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
$(PYTHON) -m venv --system-site-packages $(VENV_BASE)/ansible && \ $(PYTHON) -m venv $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) setuptools==42.0.1 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) wheel==0.33.6; \ fi; \ # TODO: re-enable system site packages
fi; \
fi fi
virtualenv_awx: virtualenv_awx:

11
requirements/requirements_setup_requires.txt
View File

@@ -7,3 +7,14 @@ virtualenv
m2r m2r
twine # from python-daemon twine # from python-daemon
wheel==0.33.6 wheel==0.33.6
cffi>=1.1
wheel>=0.33.6
backports.functools_lru_cache
more-itertools==5.0.0
poetry
functools32<4.0.0,>=3.2.3; python_version >= "2.7" and python_version < "2.8"
flit; python_version >= "3.5"
twine; python_version >= "3.6"
incremental>=16.10.1; python_version >= "3.6"
lxml>=3.0; python_version >= "3.6"
pkgconfig; python_version >= "3.6"