Merge pull request #989 from edx/aj/ora2_devstack

Ora2 Changes to work with Ficus Devstack.

Makefile

@@ -9,8 +9,6 @@ install-system:
 
 # not used by travis
 install-node:
-	sudo add-apt-repository -y ppa:chris-lea/node.js
-	sudo apt-get update -qq
 	sudo apt-get install -qq nodejs
 
 install-wheels:
@@ -37,7 +35,7 @@ javascript: update-npm-requirements
 sass:
 	python scripts/compile_sass.py
 
-verify-generated-files: javascript sass
+verify-generated-files:
 	@git diff --quiet || (echo 'Modifications exist locally! Run `make javascript` or `make sass` to update bundled files.'; exit 1)
 
 install-test:
@@ -52,7 +50,7 @@ install-dev:
 install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript sass
 
 quality:
-	jshint $(STATIC_JS)/src -c .jshintrc --verbose
+	./node_modules/.bin/jshint $(STATIC_JS)/src -c .jshintrc --verbose
 	./node_modules/jscs/bin/jscs $(STATIC_JS)/src --verbose
 	./scripts/run-pep8.sh
 	./scripts/run-pylint.sh
@@ -82,4 +80,4 @@ test-a11y:
 update-npm-requirements:
 	npm update --silent
 	cp ./node_modules/backgrid/lib/backgrid*.js $(STATIC_JS)/lib/backgrid/
-	cp ./node_modules/backgrid/lib/backgrid*.css $(STATIC_CSS)/lib/backgrid/
+	cp ./node_modules/backgrid/lib/backgrid*.css $(STATIC_CSS)/lib/backgrid/
\ No newline at end of file

apt-packages.txt

@@ -3,9 +3,7 @@ g++
 gcc
 git
 gfortran
-libblas3gf
 libblas-dev
-liblapack3gf
 liblapack-dev
 libatlas-base-dev
 libfontconfig1
@@ -13,9 +11,10 @@ libmysqlclient-dev
 libxml2-dev
 libxslt1-dev
 nodejs
+npm
 python2.7
 python2.7-dev
 python-mysqldb
 python-pip
 python-software-properties
-rubygems
+rubygems
\ No newline at end of file

package.json

@@ -21,7 +21,7 @@
     "karma-jasmine": "^0.3.6",
     "karma-jasmine-html-reporter": "~0.1",
     "karma-jasmine-jquery": "^0.1.1",
-    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "^1.0.4",
     "karma-sinon": "^1.0.3",
     "karma-spec-reporter": "^0.0.20",
     "phantomjs": "^1.9.11",

scripts/install-wheels.sh

@@ -9,10 +9,8 @@ cd `dirname $BASH_SOURCE` && cd ..
 pip install --upgrade pip
 pip install wheel
 
-WHEELHOUSE="scripts/data/wheelhouse"
-
 # Ensure that numpy is installed first; otherwise scipy won't be able to install
-pip install --use-wheel --no-index --upgrade --find-links=$WHEELHOUSE numpy
+pip install --use-wheel numpy==1.6.2
 
 # Then install everything else
-pip install --use-wheel --no-index --upgrade --find-links=$WHEELHOUSE -r requirements/wheels.txt
+pip install --use-wheel -r requirements/wheels.txt

scripts/make-wheels.sh

-#!/usr/bin/env bash
-
-# Create "wheel" archives of the requirements for running the test suite.
-# http://pip.readthedocs.org/en/latest/reference/pip_wheel.html
-# Run this whenever you update requirements to speed up test jobs in Travis.
-# Since the archives contain binary distributions, however,
-# you MUST run the script within an Ubuntu 12.04 box.
-
-cd `dirname $BASH_SOURCE` && cd ..
-
-pip install --upgrade pip
-pip install wheel
-
-WHEELHOUSE="scripts/data/wheelhouse"
-pip wheel --wheel-dir=$WHEELHOUSE -r requirements/wheels.txt