Updated to use new includes and reqs structure.

oubiwann · oubiwann · commit a5aeae794c7b · 2015-05-08T10:42:09.000-05:00
diff --git a/Makefile b/Makefile
@@ -18,13 +18,11 @@ setup-submodule:
 #
 # Note that this repo overrides the standard project deps to make
 # installation in Docker easier.
-deps:
+deps: base-deps
 	. $(VENV)/bin/activate && \
 	pip3.4 install -r requirements/part1.txt
 	. $(VENV)/bin/activate && \
 	pip3.4 install -r requirements/part2.txt
-	. $(VENV)/bin/activate && \
-	pip3.4 install -r requirements/part3.txt
 
 setup:
 	@git submodule init
diff --git a/include b/include
@@ -1 +1 @@
-Subproject commit 93f95e5ad0dc7374d3d3aac8dd400d46c9459656
+Subproject commit cc316ed10fc7095b283d69b6bd2dbf1709af666e
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -0,0 +1,10 @@
+six
+python-dateutil
+pyparsing
+pytz
+numpy==1.9.2
+ipython[notebook]==3.1.0
+matplotlib==1.4.3
+scipy==0.15.1
+pandas==0.16.0
+seaborn==0.5.1
diff --git a/requirements/part1.txt b/requirements/part1.txt
@@ -1,12 +1,8 @@
 setuptools
 flake8
-six
-python-dateutil
-pyparsing
-pytz
-numpy
-matplotlib
-scipy
-pandas
-ipython[notebook]
-seaborn
+typecheck-decorator == 0.3b
+Image
+networkx
+FileChunkIO
+boto
+awscli
diff --git a/requirements/part2.txt b/requirements/part2.txt
@@ -1,6 +1 @@
-typecheck-decorator == 0.3b
-Image
-networkx
-FileChunkIO
-boto
-awscli
+scikit-image
diff --git a/requirements/part3.txt b/requirements/part3.txt
