Merge e95f6de into bb2e0a1

meejah · Apr 6, 2016 · 1ce05af · 1ce05af
2 parents bb2e0a1 + e95f6de
commit 1ce05af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/INSTALL b/INSTALL
@@ -5,9 +5,14 @@ To just install this as quickly as possible, using a Debian or Ubuntu
 system, run the following as root:
 
    apt-get install python-setuptools python-twisted python-ipaddress python-geoip python-psutil graphviz
-
    python setup.py install
 
+It's recommended to use a virtualenv (see below), but on OSX (and
+assuming homebrew is installed):
+
+brew install geoip
+pip install -r requirements.txt
+
 Or, instead of installing locally, simply:
 
    export PYTHONPATH=.

diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,12 @@ Twisted>=11.1.0
 ipaddress>=1.0.16
 zope.interface>=3.6.1
 txsocksx>=1.13.0
+## The following requirements were added by pip freeze:
+funcsigs==1.0.0
+GeoIP==1.3.2
+mock==2.0.0
+ordereddict==1.1
+Parsley==1.3
+pbr==1.8.1
+six==1.10.0
+wheel==0.24.0