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

@@ -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
+real-requirements_dev:
-	# (cat requirements/requirements.txt requirements/requirements_dev.txt > /tmp/req_dev.txt);
+	pip install -r requirements/requirements_dev.txt --target awx/lib/site-packages/ --install-option="--install-platlib=\$$base/lib/python"
-	pip install -r requirements/requirements_dev.txt --target awx/lib/site-packages/ --ignore-installed
 
 # 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
 

requirements/requirements_dev.txt

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

requirements/requirements_jenkins.txt

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