From 21eeaebc6b60a0d5e8be87217d619753cabd05e7 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 11 Dec 2016 14:54:12 +0100 Subject: [PATCH 1/2] pin docutils version to fix docs tests --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index f02132d07..0b0423ecc 100644 --- a/setup.py +++ b/setup.py @@ -106,6 +106,7 @@ setup( "sphinx>=1.3.5, <1.6", "sphinx-autobuild>=0.5.2, <0.7", "sphinxcontrib-documentedlist>=0.4.0, <0.5", + "docutils==0.12", # temporary pin, https://github.com/chintal/sphinxcontrib-documentedlist/pull/3 "sphinx_rtd_theme>=0.1.9, <0.2", ], 'contentviews': [ From 8f042254506900aa97c66eb960d6699297981b8a Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 11 Dec 2016 17:49:07 +0100 Subject: [PATCH 2/2] fix install.rst --- docs/install.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/install.rst b/docs/install.rst index b6160a9c1..1fe09aca0 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -61,6 +61,7 @@ Installation On macOS You can use Homebrew to install everything: .. code:: bash + brew install mitmproxy Or you can download the pre-built binary packages from `mitmproxy.org`_. @@ -86,17 +87,20 @@ If you already have an older version of Python 3.5 installed, make sure to insta (pip is included in Python by default). If pip aborts with an error, make sure you are using the current version of pip. .. code:: powershell + python -m pip install --upgrade pip Next, add Python and the Python Scripts directory to your **PATH** variable. You can do this easily by running the following in powershell: .. code:: powershell + [Environment]::SetEnvironmentVariable("Path", "$env:Path;C:\Python27;C:\Python27\Scripts", "User") Now, you can install mitmproxy by running .. code:: powershell + pip install mitmproxy Once the installation is complete, you can run :ref:`mitmdump` from a command prompt.