Merge pull request #943 from deis/python-updates

chore(controller): update celery, djangorestframework, redis

Author: mboersma

controller/Dockerfile

@@ -12,21 +12,19 @@ RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.p
 RUN apt-get install -yq git
 
 # install requirements before ADD to cache layer and speed build
-RUN pip install celery==3.1.8 \
+RUN pip install celery==3.1.11 \
                 Django==1.6.4 \
                 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 \
+                djangorestframework==2.3.13 \
                 gunicorn==18.0 \
-                paramiko==1.12.1 \
                 psycopg2==2.5.2 \
-                pycrypto==2.6.1 \
                 python-etcd==0.3.0 \
                 PyYAML==3.10 \
-                redis==2.8.0 \
+                redis==2.9.1 \
                 static==1.0.2 \
                 South==0.8.4
 

controller/api/ssh.py

@@ -1,9 +1,9 @@
 # Deis controller requirements
 #
 # 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]
+# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
-celery==3.1.8
+celery==3.1.11
 Django==1.6.4
 django-allauth==0.15.0
 # HACK: use bacongobbler's feature branch until
@@ -12,13 +12,11 @@ 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
+djangorestframework==2.3.13
 gunicorn==18.0
-paramiko==1.12.1
 psycopg2==2.5.2
-pycrypto==2.6.1
 python-etcd==0.3.0
 PyYAML==3.10
-redis==2.8.0
+redis==2.9.1
 static==1.0.2
 South==0.8.4

controller/requirements.txt

@@ -5,19 +5,18 @@
 # requirements.txt and dev_requirements.txt files.
 #
 # 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]
+# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
-celery==3.1.8
+celery==3.1.11
 Django==1.6.4
 django-allauth==0.15.0
 # HACK: use bacongobbler's feature branch until
 # https://github.com/kmmbvnr/django-fsm/pull/31 is merged
 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
+djangorestframework==2.3.13
 gunicorn==18.0
-paramiko==1.12.1
 psycopg2==2.5.2
 python-etcd==0.3.0
 PyYAML==3.10

docs/docs_requirements.txt

@@ -17,7 +17,6 @@ Server Reference
     api.models
     api.routers
     api.serializers
-    api.ssh
     api.tasks
     api.urls
     api.utils