tweaks

Makefile

@@ -11,10 +11,6 @@ install-system:
 install-node:
 	sudo apt-get install -qq nodejs
 
-install-wheels:
-	./scripts/install-wheels.sh
-
-
 install-python:
 	./scripts/install-python.sh
 
@@ -47,7 +43,7 @@ install-sys-requirements: install-system install-node
 install-dev:
 	pip install -q -r requirements/dev.txt
 
-install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript sass
+install: install-python install-js install-nltk-data install-test install-dev javascript sass
 
 quality:
 	jshint $(STATIC_JS)/src -c .jshintrc --verbose

requirements/base.txt

-# Include the requirements we're caching as "wheel" archives
-# to speed up the test builds.
--r wheels.txt
-
 # edX Internal Requirements
 git+https://github.com/edx/XBlock.git@xblock-0.4.12#egg=XBlock==0.4.12
 
@@ -22,10 +18,14 @@ jsonfield==1.0.3
 lazy==1.1
 libsass==0.10.0
 loremipsum==1.0.5
+lxml==3.7.3
+numpy==1.12.1
 path.py==8.2.1
 python-dateutil==2.1
 python-memcached==1.48
 pytz
+scikit-learn==0.18.1
+scipy==0.19.0
 voluptuous==0.8.5
 
 # AI grading

requirements/wheels.txt

-# These packages require compilation, so they take a long time to install.
-# To speed up the test builds, we create binary "wheel" archives.
-# http://pip.readthedocs.org/en/latest/reference/pip_wheel.html
-
-lxml==3.4.4
-numpy==1.6.2
-scikit-learn==0.12.1
-scipy==0.14.0

scripts/install-wheels.sh

-#!/usr/bin/env bash
-
-cd `dirname $BASH_SOURCE` && cd ..
-
-# Install "wheel" archives of the requirements for running the test suite.
-# http://pip.readthedocs.org/en/latest/reference/pip_wheel.html
-# This runs in Travis to install pre-built binary packages, which
-# means the builds are faster and more reliable.
-pip install --upgrade pip
-pip install wheel
-
-# Ensure that numpy is installed first; otherwise scipy won't be able to install
-pip install --use-wheel --no-index --upgrade numpy
-
-# Then install everything else
-pip install --use-wheel --no-index --upgrade -r requirements/wheels.txt

setup.py

@@ -47,7 +47,7 @@ setup(
     ],
     packages=find_packages(exclude=['*.test', '*.tests']),
     include_package_data=True,
-    install_requires=load_requirements('requirements/base.txt', 'requirements/wheels.txt'),
+    install_requires=load_requirements('requirements/base.txt'),
     tests_require=load_requirements('requirements/test.txt'),
     entry_points={
         'xblock.v1': [