From 1f06a95c405de757ccc3d3a864e752827283317f Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 1 Sep 2015 18:30:39 -0400 Subject: [PATCH 1/2] fixes executing processes with correct PYTHONPATH will pickup .pth files --- requirements/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 02dd347786..9b1d9ee860 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -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 From 9f3312791910ec9fe40ee3c90e06d1df73ff2183 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 2 Sep 2015 08:23:11 -0400 Subject: [PATCH 2/2] fixes jenkins failures * include requirements.txt in requirements_jenkins.txt * include requirements.txt in requirements_dev.txt * alter Makefile to NOT call the requirements rule in the requirements_* rules. Again, this is now handled by the -r requirements.txt in the respective _*.txt file. * install jenkins requirements "globally" (in the virtualenv) --- Makefile | 10 +++++----- requirements/requirements_dev.txt | 6 +++++- requirements/requirements_jenkins.txt | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b59206742a..c14c44afbf 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 453e9f216d..9c0d7f83ae 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -1,2 +1,6 @@ +-r requirements.txt django-devserver -django-debug-toolbar \ No newline at end of file +django-debug-toolbar +unittest2 +pep8 +flake8 diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt index 54db9c2020..88a8ef7ade 100644 --- a/requirements/requirements_jenkins.txt +++ b/requirements/requirements_jenkins.txt @@ -1,3 +1,4 @@ +-r requirements.txt ansible django-jenkins coverage