Merge pull request #438 from berkeley-cocosci/conda_install

Conda install

docs/Developing-Wallace-(setup-guide).md

@@ -93,6 +93,8 @@ This will create a directory called `Wallace` in your current directory.
 
 Change into your the new directory and make sure you are still in your virtual environment before installing the dependencies. If you want to be extra carfeul, run the command `workon wallace`, which will ensure that you are in the right virtual environment.
 
+**Note**: if you are using Anaconda – as of August 10, 2016 – you will need to follow special [Anaconda installation instructions](Wallace-with-Anaconda.md). This should be fixed in future versions.
+
 ```
 cd Wallace
 ```

docs/Installing-Wallace-(for-users).md

@@ -43,4 +43,12 @@ Test that your installation works by running:
 wallace --version
 ```
 
+If you use Anaconda, installing Wallace probably failed. The problem is that you need to install bindings for the `psycopg2` package (it helps Python play nicely with Postgres) and you must use conda for conda to know where to look for the links. You do this with:
+
+```
+conda install psycopg2
+```
+
+Then, try the above installation commands. They should work now, meaning you can move on. 
+
 Next, you'll need [access keys for AWS, Heroku, etc.](AWS-etc-keys.md)

docs/Wallace-with-Anaconda.md

@@ -1,8 +1,16 @@
-If you are interested in developing Wallace but already use [Anaconda](https://www.continuum.io/downloads), you'll need to slightly adapt the standard instructions for Wallace.
+If you are interested in Wallace and use [Anaconda](https://www.continuum.io/downloads), you'll need to adapt the standard instructions slightly.
+
+## Install psycopg2
+
+In order to get the correct bindings, you need to install `psycopg2` before you use `requirements.txt`; otherwise, everything will fail and you will be endlessly frustrated.
+
+```
+conda install psycopg2
+```
 
 ## Install Wallace
 
-You'll follow all of the [Wallace development installation instructions](Developing-Wallace-(setup-guide).md), **with the exception of the virtual environment step**.
+You'll follow all of the [Wallace development installation instructions](Developing-Wallace-(setup-guide).md), **with the exception of the virtual environment step**. Then return here.
 
 ## Confirm Wallace works
 

requirements.txt

@@ -8,6 +8,6 @@ mkdocs==0.15.3
 mkdocs-alabaster
 nose==1.3.4
 pexpect==3.3
-psycopg2==2.5.4
+psycopg2>=2.5.4
 redis==2.10.3
 rq==0.5.5