Travis/test cleanup

.gitignore

@@ -44,8 +44,10 @@ coverage.xml
 *.mo
 *.pot
 
-# Django stuff:
-*.log
+# Integration test output:
+/*.log
+/tests.*.png
+var/*
 
 # Sphinx documentation
 docs/_build/
@@ -53,8 +55,6 @@ docs/_build/
 # PyBuilder
 target/
 
-workbench.db
-
 # IDEs
 .idea
 .idea/*

.travis.yml

@@ -9,7 +9,9 @@ install:
     - "pip uninstall -y xblock-drag-and-drop-v2"
     - "python setup.py sdist"
     - "pip install dist/xblock-drag-and-drop-v2-0.1.tar.gz"
-script: pep8 drag_and_drop_v2 --max-line-length=120 && python run_tests.py
+script:
+    - pep8 drag_and_drop_v2 --max-line-length=120
+    - python run_tests.py
 notifications:
   email: false
 addons:

install_test_deps.sh

 # Installs xblock-sdk and dependencies needed to run the tests suite.
 # Run this script inside a fresh virtual environment.
-pip install -e git://github.com/edx/xblock-sdk.git#egg=xblock-sdk
+pip install -e git://github.com/edx/xblock-sdk.git@4e8e713e7dd886b8d2eb66b5001216b66b9af81a#egg=xblock-sdk
 cd $VIRTUAL_ENV/src/xblock-sdk/ && pip install -r requirements/base.txt \
                                 && pip install -r requirements/test.txt && cd -
 python setup.py develop