From d2bed8fd4d63da9e60c93e047f5e9bf93036755a Mon Sep 17 00:00:00 2001 From: Ed Summers Date: Sat, 24 May 2014 09:54:29 +0000 Subject: [PATCH 1/2] turned hard tabs into 4 spaces --- documentation/SETUP.md | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/documentation/SETUP.md b/documentation/SETUP.md index 2ca297e..055fdfa 100644 --- a/documentation/SETUP.md +++ b/documentation/SETUP.md @@ -4,18 +4,18 @@ 1. To set up on clean Ubuntu installation, run the following commands to intall the necessary requirements: - ``` - apt-get update - apt-get install git -y - apt-get install unzip -y - sudo apt-get install python-setuptools python-dev build-essential -y - apt-get install libxml2-dev -y - apt-get install libxslt1-dev -y - easy_install -U setuptools - apt-get install python-pip - pip install lxml - pip install requests - ``` + ``` + apt-get update + apt-get install git -y + apt-get install unzip -y + sudo apt-get install python-setuptools python-dev build-essential -y + apt-get install libxml2-dev -y + apt-get install libxslt1-dev -y + easy_install -U setuptools + apt-get install python-pip + pip install lxml + pip install requests + ``` 2. Clone this repo locally using the `git clone` command. This requires a Github account. ``` @@ -29,21 +29,21 @@ Latest versions of OSX come with Python 2.7 installed. To run the Pillbox process, additional packages need to be installed. This assumes [Xcode](https://developer.apple.com/xcode/downloads/) & command line tools are installed. If not, install Xcode first. 1. Install pip - ``` - sudo easy_install pip - ``` + ``` + sudo easy_install pip + ``` 2. Clone this repo locally using `git clone`. This requires a Github account. - ``` - git clone git@github.com:HHS/pillbox-data-process.git - ``` + ``` + git clone git@github.com:HHS/pillbox-data-process.git + ``` 3. Install Python requirements for Pillbox - ``` - cd pillbox-data-process - cd scripts - sudo pip install -r requirements.txt - ``` + ``` + cd pillbox-data-process + cd scripts + sudo pip install -r requirements.txt + ``` 4. Follow [steps for data process](https://github.com/HHS/pillbox-data-process/tree/master/scripts#pillbox-data-process). From 2ea8059242a83d9dcd26613d4f4122c07518e933 Mon Sep 17 00:00:00 2001 From: Ed Summers Date: Sat, 24 May 2014 10:09:02 +0000 Subject: [PATCH 2/2] added libz-dev to ubuntu dependencies ; also use requirements.txt for ubuntu install --- documentation/SETUP.md | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/documentation/SETUP.md b/documentation/SETUP.md index 055fdfa..1bbfa5b 100644 --- a/documentation/SETUP.md +++ b/documentation/SETUP.md @@ -6,29 +6,31 @@ ``` apt-get update - apt-get install git -y - apt-get install unzip -y - sudo apt-get install python-setuptools python-dev build-essential -y - apt-get install libxml2-dev -y - apt-get install libxslt1-dev -y - easy_install -U setuptools - apt-get install python-pip - pip install lxml - pip install requests + apt-get install git unzip python-setuptools python-dev build-essential libxml2-dev libxslt1-dev libz-dev setuptools python-pip -y ``` 2. Clone this repo locally using the `git clone` command. This requires a Github account. - ``` - git clone git@github.com:HHS/pillbox-data-process.git - ``` -3. Follow [steps for data process](https://github.com/HHS/pillbox-data-process/tree/master/scripts#pillbox-data-process). + ``` + git clone git@github.com:HHS/pillbox-data-process.git + ``` + +3. Install Python requirements for Pillbox + + ``` + cd pillbox-data-process + cd scripts + sudo pip install -r requirements.txt + ``` + +4. Follow [steps for data process](https://github.com/HHS/pillbox-data-process/tree/master/scripts#pillbox-data-process). #### Setting up on Mac OSX Latest versions of OSX come with Python 2.7 installed. To run the Pillbox process, additional packages need to be installed. This assumes [Xcode](https://developer.apple.com/xcode/downloads/) & command line tools are installed. If not, install Xcode first. 1. Install pip + ``` sudo easy_install pip ``` @@ -40,6 +42,7 @@ Latest versions of OSX come with Python 2.7 installed. To run the Pillbox proces ``` 3. Install Python requirements for Pillbox + ``` cd pillbox-data-process cd scripts