Merge pull request #3 from jmchilton/pr229

Merge dev and add tighter env abstraction.

.gitignore

@@ -81,6 +81,7 @@ tool-data/shared/ucsc/publicbuilds.txt
 tool-data/shared/ucsc/ucsc_build_sites.txt
 tool-data/*.loc
 tool-data/genome/*
+tool-data/*.sample
 
 # Test output
 test-data-cache
@@ -91,6 +92,7 @@ test/tool_shed/tmp/*
 htmlcov
 run_unit_tests.html
 test/unit/**.log
+.tox
 
 # Project files
 *.kpf

.travis.yml

@@ -1,9 +1,15 @@
 language: python
-python:
-  - "2.7"
-  - "2.6"
+python: 2.7
+env:
+  - TOX_ENV=py27-lint
+  - TOX_ENV=py26-lint
+  - TOX_ENV=py27-unit
+  - TOX_ENV=py26-unit
+  - TOX_ENV=qunit
+
 install:
-  - virtualenv .venv
-  - . .venv/bin/activate
-  - pip install flake8
-script: ./.ci/flake8_wrapper.sh && ./run_tests.sh -u
+  - pip install tox
+  - if [ "$TOX_ENV" == "qunit" ]; then bash -c 'cd test/qunit && npm install'; fi
+
+script: tox -e $TOX_ENV
+

client/bower.json

@@ -11,7 +11,6 @@
     "jquery": "~1.11.1",
     "traceKit": "*",
     "ravenjs": "~1.1.16",
-    "require": "*",
     "underscore": "~1.7.0",
     "backbone": "~1.1.2",
     "bootstrap": "~3.3.2",
@@ -32,9 +31,11 @@
     "jquery-ui": "git://github.com/jquery/jquery-ui.git#~1.11.2",
     "threedubmedia.jquery.event": "*",
     "handlebars": "~2.0.0",
-    "jquery-migrate": "~1.2.1"
+    "jquery-migrate": "~1.2.1",
+    "requirejs": "~2.1.17"
   },
   "resolutions": {
     "jquery": "~1.11.1"
-  }
+  },
+  "devDependencies": {}
 }