Merge pull request #45 from aagbsn/master

automagically resolve dependencies during installation

Author: hellais

Diff for: apaf/config.py

@@ -5,7 +5,11 @@
 from __future__ import with_statement
 
 import sys
-import yaml
+try:
+    import yaml
+except ImportError:
+    yaml = None
+
 import os
 import os.path
 from copy import deepcopy
@@ -156,8 +160,13 @@ def reset(self):
         self.vars = deepcopy(self.defaults)
         self.commit()
 
-from utils.hashing import random_bytes
-custom = Config(config_file='apaf.cfg',
+try:
+    from utils.hashing import random_bytes
+except ImportError:
+    random_bytes = None
+    # log some error?
+if yaml and random_bytes:
+    custom = Config(config_file='apaf.cfg',
                 defaults=dict(
                     base_port=4242,
                     services=['staticwebserver', 'zinniablog'],    # list of services to be started

Diff for: setup.py

@@ -86,6 +86,7 @@
     options=dict(py2app=OPTIONS_PY2APP,
                  py2exe=OPTIONS_PY2EXE,
     ),
+    install_requires=open('requirements.txt').readlines(),
     entry_points=dict(console_scripts=['apaf = apaf.main']),
     packages=find_packages(exclude=['test']),
     **PLATFORM_OPTIONS[config.platform]