Include local versions of third-party dependencies, particularly those unavailable or outdated as OS packages.

5 files changed, 73 insertions, 90 deletions

diff --git a/requirements/dev.txt b/requirements/dev.txt
index a8d5cabc72..5d750fcfa3 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -3,18 +3,20 @@
 
 -U distribute
 
-# Packages used for development and production:
-Django>=1.5
-django-celery
-django-extensions
-django-jsonfield
-django-taggit
-djangorestframework>=2.3.0,<2.4.0
-Markdown
-pexpect
-python-dateutil
-requests
-South>=0.8,<2.0
+# Packages used for both development and production:
+Django>=1.4
+
+# The following packages are now bundled with AWX (awx/lib/site-packages):
+  #django-celery
+  #django-extensions
+  #django-jsonfield
+  #django-taggit
+  #djangorestframework>=2.3.0,<2.4.0
+  #Markdown
+  #pexpect
+  #python-dateutil
+  #requests
+  #South>=0.8,<2.0
 
 # Development-only packages:
 django-debug-toolbar
diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt
index 3d95706073..bed4830e9c 100644
--- a/requirements/dev_local.txt
+++ b/requirements/dev_local.txt
@@ -5,32 +5,29 @@ distribute-0.6.45.tar.gz
 
 Django-1.5.1.tar.gz
 
-# Needed by python-dateutil, django-extensions:
-six-1.3.0.tar.gz
-
-# Needed by kombu:
-amqp-1.0.11.tar.gz
-anyjson-0.3.3.tar.gz
-
-# Needed by celery:
-billiard-2.7.3.28.tar.gz
-kombu-2.5.10.tar.gz
-python-dateutil-2.1.tar.gz
-
-# Needed by django-celery:
-celery-3.0.19.tar.gz
-pytz-2013b.tar.gz
-
-# Remaining dev/prod packages:
-django-celery-3.0.17.tar.gz
-django-extensions-1.1.1.tar.gz
-django-jsonfield-0.9.10.tar.gz
-django-taggit-0.10a1.tar.gz
-djangorestframework-2.3.5.tar.gz
-Markdown-2.3.1.tar.gz
-pexpect-2.4.tar.gz
-requests-1.2.3.tar.gz
-South-0.8.1.tar.gz
+# The following packages are now bundled with AWX (awx/lib/site-packages):
+  # Needed by python-dateutil, django-extensions:
+  #six-1.3.0.tar.gz
+  # Needed by kombu:
+  #amqp-1.0.11.tar.gz
+  #anyjson-0.3.3.tar.gz
+  # Needed by celery:
+  #billiard-2.7.3.28.tar.gz
+  #kombu-2.5.10.tar.gz
+  #python-dateutil-2.1.tar.gz
+  # Needed by django-celery:
+  #celery-3.0.19.tar.gz
+  #pytz-2013b.tar.gz
+  # Remaining dev/prod packages:
+  #django-celery-3.0.17.tar.gz
+  #django-extensions-1.1.1.tar.gz
+  #django-jsonfield-0.9.10.tar.gz
+  #django-taggit-0.10a1.tar.gz
+  #djangorestframework-2.3.5.tar.gz
+  #Markdown-2.3.1.tar.gz
+  #pexpect-2.4.tar.gz
+  #requests-1.2.3.tar.gz
+  #South-0.8.1.tar.gz
 
 # Remaining dev-only packages:
 django-debug-toolbar-0.9.4.tar.gz
diff --git a/requirements/prod.txt b/requirements/prod.txt
index 2c2a346f78..73b7f95b2e 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -1,17 +1,19 @@
 # PIP requirements for AWX production environment (downloaded from PyPI).
 # Install using "pip -r prod.txt".
 
-Django>=1.5
-django-celery
-django-extensions
-django-jsonfield
-django-taggit
-djangorestframework>=2.3.0,<2.4.0
-Markdown
-pexpect
-python-dateutil
-requests
-South>=0.8,<2.0
+Django>=1.4
+
+# The following packages are now bundled with AWX (awx/lib/site-packages):
+  #django-celery
+  #django-extensions
+  #django-jsonfield
+  #django-taggit
+  #djangorestframework>=2.3.0,<2.4.0
+  #Markdown
+  #pexpect
+  #python-dateutil
+  #requests
+  #South>=0.8,<2.0
 
 # You may also need to install the following extra packages using the OS
 # package manager, or pip if you're running inside a virtualenv.
diff --git a/requirements/prod_local.txt b/requirements/prod_local.txt
index 807b53a290..5ed3de0989 100644
--- a/requirements/prod_local.txt
+++ b/requirements/prod_local.txt
@@ -3,32 +3,29 @@
 
 Django-1.5.1.tar.gz
 
-# Needed by python-dateutil, django-extensions:
-six-1.3.0.tar.gz
-
-# Needed by kombu:
-amqp-1.0.11.tar.gz
-anyjson-0.3.3.tar.gz
-
-# Needed by celery:
-billiard-2.7.3.28.tar.gz
-kombu-2.5.10.tar.gz
-python-dateutil-2.1.tar.gz
-
-# Needed by django-celery:
-celery-3.0.19.tar.gz
-pytz-2013b.tar.gz
-
-# Remaining packages:
-django-celery-3.0.17.tar.gz
-django-extensions-1.1.1.tar.gz
-django-jsonfield-0.9.10.tar.gz
-django-taggit-0.10a1.tar.gz
-djangorestframework-2.3.5.tar.gz
-Markdown-2.3.1.tar.gz
-pexpect-2.4.tar.gz
-requests-1.2.3.tar.gz
-South-0.8.1.tar.gz
+# The following packages are now bundled with AWX (awx/lib/site-packages):
+  # Needed by python-dateutil, django-extensions:
+  #six-1.3.0.tar.gz
+  # Needed by kombu:
+  #amqp-1.0.11.tar.gz
+  #anyjson-0.3.3.tar.gz
+  # Needed by celery:
+  #billiard-2.7.3.28.tar.gz
+  #kombu-2.5.10.tar.gz
+  #python-dateutil-2.1.tar.gz
+  # Needed by django-celery:
+  #celery-3.0.19.tar.gz
+  #pytz-2013b.tar.gz
+  # Remaining dev/prod packages:
+  #django-celery-3.0.17.tar.gz
+  #django-extensions-1.1.1.tar.gz
+  #django-jsonfield-0.9.10.tar.gz
+  #django-taggit-0.10a1.tar.gz
+  #djangorestframework-2.3.5.tar.gz
+  #Markdown-2.3.1.tar.gz
+  #pexpect-2.4.tar.gz
+  #requests-1.2.3.tar.gz
+  #South-0.8.1.tar.gz
 
 # You may also need to install the following extra packages using the OS
 # package manager, or pip if you're running inside a virtualenv.
diff --git a/requirements/test.txt b/requirements/test.txt
deleted file mode 100644
index 9afc4355e3..0000000000
--- a/requirements/test.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# PIP requirements for AWX testing using Tox (downloaded from PyPI). Install
-# using "pip -r test.txt".
-
-ansible==1.2
-django-celery
-django-extensions
-django-jsonfield
-django-taggit
-djangorestframework>=2.3.0,<2.4.0
-Markdown
-pexpect
-PyYAML
-python-dateutil
-requests
-South>=0.8,<2.0