summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-07 15:11:36 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-07 15:11:36 +0100
commitd23bc77e2c0720e8e79dfa1a8c7289838c9b9794 (patch)
treeb34392b4af082553f84584dda022d57f3c35aa9f
parentMerge branch 'master' into develop (diff)
parentMerge pull request #269 from matrix-org/markjh/upgrading_setuptools (diff)
downloadsynapse-d23bc77e2c0720e8e79dfa1a8c7289838c9b9794.tar.xz
Merge branch 'master' into develop
Diffstat (limited to '')
-rw-r--r--README.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index 5b30ee3563..6c8431aa86 100644
--- a/README.rst
+++ b/README.rst
@@ -121,6 +121,7 @@ To install the synapse homeserver run::
 
     virtualenv -p python2.7 ~/.synapse
     source ~/.synapse/bin/activate
+    pip install --upgrade setuptools
     pip install --process-dependency-links https://github.com/matrix-org/synapse/tarball/master
 
 This installs synapse, along with the libraries it uses, into a virtual
@@ -285,6 +286,11 @@ may need to manually upgrade it::
 
     sudo pip install --upgrade pip
 
+Installing may fail with ``mock requires setuptools>=17.1. Aborting installation``.
+You can fix this by upgrading setuptools::
+
+    pip install --upgrade setuptools
+
 If pip crashes mid-installation for reason (e.g. lost terminal), pip may
 refuse to run until you remove the temporary installation directory it
 created. To reset the installation::