1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00

Merge pull request #397 from chrismeyersfsu/fix-python_paths

fixes executing processes with correct PYTHONPATH will pickup .pth files
This commit is contained in:
Chris Meyers 2015-09-02 09:20:23 -04:00
commit ee3de2b209
4 changed files with 12 additions and 6 deletions

View File

@ -167,15 +167,15 @@ requirements requirements_dev requirements_jenkins: %: real-%
# * --target is only supported on newer versions of pip
# * https://github.com/pypa/pip/issues/3056 - the workaround is to override the `install-platlib`
# * --user (in conjunction with PYTHONUSERBASE="awx" may be a better option
# * --target implies --ignore-installed
real-requirements:
pip install -r requirements/requirements.txt --target awx/lib/site-packages/ --ignore-installed --install-option="--install-platlib=\$$base/lib/python"
pip install -r requirements/requirements.txt --target awx/lib/site-packages/ --install-option="--install-platlib=\$$base/lib/python"
real-requirements_dev: real-requirements
# (cat requirements/requirements.txt requirements/requirements_dev.txt > /tmp/req_dev.txt);
pip install -r requirements/requirements_dev.txt --target awx/lib/site-packages/ --ignore-installed
real-requirements_dev:
pip install -r requirements/requirements_dev.txt --target awx/lib/site-packages/ --install-option="--install-platlib=\$$base/lib/python"
# Install third-party requirements needed for running unittests in jenkins
real-requirements_jenkins: real-requirements
real-requirements_jenkins:
pip install -r requirements/requirements_jenkins.txt
npm install csslint jshint

View File

@ -35,6 +35,7 @@ git+https://github.com/chrismeyersfsu/gevent-socketio.git@tower_0.3.6#egg=socket
git+https://github.com/chrismeyersfsu/python-ipy.git@master#egg=ipy
git+https://github.com/chrismeyersfsu/python-keystoneclient.git@1.3.0#egg=keystoneclient-1.3.0
git+https://github.com/chrismeyersfsu/shade.git@tower_0.5.0#egg=shade-tower_0.5.0
git+https://github.com/chrismeyersfsu/sitecustomize.git#egg=sitecustomize
greenlet==0.4.7
httplib2==0.9
idna==2.0

View File

@ -1,2 +1,6 @@
-r requirements.txt
django-devserver
django-debug-toolbar
unittest2
pep8
flake8

View File

@ -1,3 +1,4 @@
-r requirements.txt
ansible
django-jenkins
coverage