Merge pull request #705 from edx/benp/pr-701-update

Use docker

.travis.yml

+addons:
+  apt:
+    packages:
+    - aspell
+    - aspell-en
+    - g++
+    - gcc
+    - git
+    - gfortran
+    - libblas3gf
+    - libblas-dev
+    - liblapack3gf
+    - liblapack-dev
+    - libatlas-base-dev
+    - libfontconfig1
+    - libmysqlclient-dev
+    - libxml2-dev
+    - libxslt1-dev
+    - nodejs
+    - python2.7
+    - python2.7-dev
+    - python-pip
+    - python-software-properties
 language: python
+sudo: false
 python:
   - "2.7"
 install:

Makefile

@@ -2,17 +2,17 @@ all: install test
 
 .PHONY: install test
 
+# not used by travis
 install-system:
 	sudo apt-get update -qq
 	sudo xargs -a apt-packages.txt apt-get install -qq --fix-missing
 
-
+# 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:
 	./scripts/install-wheels.sh
 
@@ -20,9 +20,8 @@ install-wheels:
 install-python:
 	./scripts/install-python.sh
 
-
 install-js:
-	sudo npm config set loglevel warn
+	npm config set loglevel warn
 	npm install
 
 install-nltk-data:
@@ -39,11 +38,13 @@ javascript:
 install-test:
 	pip install -q -r requirements/test.txt
 
+install-sys-requirements: install-system install-node
+
 install-dev:
-	sudo gem install sass
+	gem install sass
 	pip install -q -r requirements/dev.txt
 
-install: install-system install-node install-wheels install-python install-js install-nltk-data install-test install-dev javascript
+install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript
 
 test:
 	./scripts/test.sh

README.rst

@@ -47,6 +47,7 @@ To install all dependencies:
 
 .. code:: bash
 
+    make install-sys-requirements
     make install
     make install-dev
 

scripts/download-nltk-data.sh

 #!/usr/bin/env bash
 
 PYTHON=`which python`
-sudo $PYTHON -m nltk.downloader stopwords maxent_treebank_pos_tagger wordnet -d /usr/local/share/nltk_data --quiet
+$PYTHON -m nltk.downloader stopwords maxent_treebank_pos_tagger wordnet --quiet