Merge pull request #795 from opdemand/requirements-diet

chore(controller): remove provider libraries from requirements.txt
deis · Apr 22, 2014 · 29df34f · 29df34f
2 parents c2a53b3 + 2731b3a
commit 29df34f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -12,23 +12,20 @@ RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python
 RUN apt-get install -yq git
 
 # install requirements before ADD to cache layer and speed build
-RUN pip install boto==2.23.0 \
-                celery==3.1.8 \
+RUN pip install celery==3.1.8 \
                 Django==1.6.2 \
                 django-allauth==0.15.0 \
                 git+https://github.com/deis/django-fsm@add-exception-handling \
                 django-guardian==1.1.1 \
                 django-json-field==0.5.5 \
                 django-yamlfield==0.5 \
                 djangorestframework==2.3.12 \
-                dop==0.1.6 \
                 gevent==1.0 \
                 gunicorn==18.0 \
                 paramiko==1.12.1 \
                 psycopg2==2.5.2 \
                 pycrypto==2.6.1 \
                 python-etcd==0.3.0 \
-                pyrax==1.6.2 \
                 PyYAML==3.10 \
                 redis==2.8.0 \
                 static==1.0.2 \

diff --git a/controller/requirements.txt b/controller/requirements.txt
@@ -3,7 +3,6 @@
 # NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [pycrypto]
 #
-boto==2.23.0
 celery==3.1.8
 Django==1.6.2
 django-allauth==0.15.0
@@ -14,14 +13,12 @@ django-guardian==1.1.1
 django-json-field==0.5.5
 django-yamlfield==0.5
 djangorestframework==2.3.12
-dop==0.1.6
 gevent==1.0
 gunicorn==18.0
 paramiko==1.12.1
 psycopg2==2.5.2
 pycrypto==2.6.1
 python-etcd==0.3.0
-pyrax==1.6.2
 PyYAML==3.10
 redis==2.8.0
 static==1.0.2

diff --git a/docs/README.md b/docs/README.md
@@ -16,9 +16,9 @@ Please add any issues you find with this documentation to the
     ```console
     $ virtualenv venv -q --prompt='(docs)' && . venv/bin/activate
     (docs)$ pip install -r docs_requirements.txt
-    Downloading/unpacking boto==2.23.0
+    Downloading/unpacking celery==3.1.8
     ...
-    Successfully installed psycopg2 pyrax python-etcd PyYAML ...
+    Successfully installed psycopg2 python-etcd PyYAML ...
     Cleaning up...
     (docs)$
     ```

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -7,7 +7,6 @@
 # NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [pycrypto]
 #
-boto==2.23.0
 celery==3.1.8
 Django==1.6.2
 django-allauth==0.15.0
@@ -17,11 +16,9 @@ git+https://github.com/bacongobbler/django-fsm@add-exception-handling
 django-guardian==1.1.1
 django-json-field==0.5.5
 djangorestframework==2.3.12
-dop==0.1.6
 gunicorn==18.0
 paramiko==1.12.1
 psycopg2==2.5.2
-pyrax==1.6.2
 python-etcd==0.3.0
 PyYAML==3.10
 South==0.8.4