Updated README. Minor modifications to setup

code/README

@@ -63,6 +63,9 @@ This is a tested list of commands that will get a clean install of OSX 10.10.5 t
 
 # Install xcode command line tools
 xcode-select --install
+# Download project
+./get_project.sh
+cd FYP_Max_prototype
 # Install Homebrew package manager
 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 # Install gcc for fortran compilation
@@ -71,12 +74,8 @@ brew install gcc
 brew install libsndfile
 # Install python via homebrew
 brew install python
-# Download project
-git clone https://github.com/Pezz89/FYP_Max_prototype.git
-cd FYP_Max_prototype
-git submodule update --init --recursive
-cd code/pysource/pysound/
-git checkout dev
+# Install freetype package required for matplotlib section of python installation
+brew install freetype
 # set up python component of project
 ./setup_python.sh
 

code/setup.py

@@ -23,7 +23,7 @@ setup(
     keywords="concatenative synthesis audio",
     url="https://github.com/Pezz89/FYP_Max_prototype",
     packages=find_packages(),
-    setup_requires=['numpy']
-    install_requires=read('requirements.txt'),
+    setup_requires=read('requirements.txt'),
+    install_requires=['numpy'],
     long_description=read('README'),
 )

code/setup_python.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
+pip install --upgrade pip
+pip install --upgrade setuptools
 pip install virtualenv
 virtualenv ./
 source ./bin/activate
-pip install --upgrade pip
-pip install --upgrade setuptools
-pip install ./
+pip install numpy
+pip install -e ./