Simplify requirements and fake SECRET_KEY for doc generation, re #57.

Author: mboersma

.travis.yml

@@ -18,10 +18,7 @@ before_install:
   - sudo apt-get install -qq libevent-dev libpq-dev
 
 install:
-  - pip install -r requirements.txt --use-mirrors
-  - pip install -r client/requirements.txt --use-mirrors
-  - pip install -r docs/requirements.txt --use-mirrors
-  - pip install coveralls flake8 --use-mirrors
+  - pip install -r dev_requirements.txt coveralls --use-mirrors
 
 before_script:
   - "psql -c 'create database deis_testing;' -U postgres"
@@ -37,7 +34,7 @@ before_script:
             'PORT': '',
         }
     }
-    SECRET_KEY = ')9$y9(@_r!+ai=ub)wsp2!!vsfaker7ke9!jaljgf1_@rw421='
+    SECRET_KEY = 'TotallyFake-SECRET_KEY-ForTravisCI'
     EOF
 
 script:

client/requirements.txt

@@ -0,0 +1,35 @@
+# Deis controller requirements
+azure>=0.7.0
+boto>=2.9.8
+Django>=1.5.1
+django-allauth>=0.12.0
+django-celery>=3.0.17
+django-json-field>=0.5.4
+django-yamlfield>=0.4
+djangorestframework>=2.3.6
+gevent==0.13.8
+gunicorn>=0.17.5
+paramiko>=1.10.1
+psycopg2>=2.5.1
+pyCrypto>=2.6
+PyYAML>=3.10
+South>=0.8.1
+
+# Deis client requirements
+docopt>=0.6.1
+#PyYAML>=3.10
+requests>=1.2.3
+
+# Deis documentation requirements
+Sphinx>=1.2b1
+sphinxcontrib-httpdomain>=1.1.8
+
+# Run "make coverage" for the % of code exercised during tests
+coverage>=3.6
+
+# Generates template documentation in the Django admin
+docutils>=0.11
+
+# Run "make flake8" to check python syntax and style
+flake8>=2.0
+

dev_requirements.txt

@@ -22,6 +22,9 @@
 # set up Django
 from deis import settings
 from django.core.management import setup_environ
+
+if not settings.SECRET_KEY:
+    settings.SECRET_KEY = 'TotallyFake-SECRET_KEY-ForSphinxDocs'
 setup_environ(settings)
 
 # -- General configuration -----------------------------------------------------

docs/conf.py

@@ -1,4 +1,4 @@
-# Deis' python library requirements
+# Deis controller requirements
 azure>=0.7.0
 boto>=2.9.8
 Django>=1.5.1
@@ -14,12 +14,3 @@ psycopg2>=2.5.1
 pyCrypto>=2.6
 PyYAML>=3.10
 South>=0.8.1
-
-# Run "make coverage" for the % of code exercised during tests
-# coverage>=3.6
-
-# Generates template documentation in the Django admin
-# docutils>=0.11
-
-# Run "make flake8" to check python syntax and style
-# flake8>=2.0