Merge pull request #27 from edx/fix_xblock_dependency

Add XBlock and xblock-sdk dependencies separately

.travis.yml

@@ -2,8 +2,8 @@ language: python
 python:
   - "2.7"
 install:
-  - "pip install -r requirements/base.txt --use-mirrors"
   - "pip install -r requirements/test.txt --use-mirrors"
+  - "pip install -e ."
 script:
   - "python manage.py test"
   - "python manage.py harvest"

requirements/base.txt

 # edX Internal Requirements
-git+https://github.com/edx/XBlock.git@1d228943#egg=XBlock
+git+https://github.com/edx/XBlock.git@d38ea051#egg=XBlock
+git+https://github.com/ormsbee/xblock-sdk.git@3c092c27#egg=xblock-sdk
 
 # Third Party Requirements
 django==1.4.8

settings/base.py

@@ -133,7 +133,7 @@ INSTALLED_APPS = (
 
     # XBlock
     'workbench',
-    'demo_xblocks',
+    'sample_xblocks.basic',  # Needs to be an app for template lookup
 
     # edx-tim apps
     'submissions',