Merge pull request #1841 from mitmproxy/fix-docs-tests

pin docutils version to fix docs tests
This commit is contained in:
Maximilian Hils 2016-12-11 18:15:00 +01:00 committed by GitHub
commit f16aab963e
2 changed files with 5 additions and 0 deletions

View File

@ -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.

View File

@ -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': [