diff options
| author | Michael Merickel <michael@merickel.org> | 2016-01-31 16:18:02 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-01-31 16:18:02 -0600 |
| commit | 3eb1c354d320536ee470b79dcb930d20da93d97d (patch) | |
| tree | 18aa7fa0a4293919c1ed67ee7f8aae6372abcb06 /docs/narr/install.rst | |
| parent | 67f733e161f19bb2b7322edd120b9bf489154536 (diff) | |
| parent | 9c01bf58c211bf9c28f8043459a5a0e9b25a5c35 (diff) | |
| download | pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.gz pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.bz2 pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.zip | |
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/narr/install.rst')
| -rw-r--r-- | docs/narr/install.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 26d458727..767b16fc0 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -15,7 +15,7 @@ You will need `Python <http://python.org>`_ version 2.6 or better to run .. sidebar:: Python Versions As of this writing, :app:`Pyramid` has been tested under Python 2.6, Python - 2.7, Python 3.2, Python 3.3, Python 3.4, PyPy, and PyPy3. :app:`Pyramid` + 2.7, Python 3.3, Python 3.4, Python 3.5, PyPy, and PyPy3. :app:`Pyramid` does not run under any version of Python before 2.6. :app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux, @@ -46,7 +46,7 @@ Alternatively, you can use the `homebrew <http://brew.sh/>`_ package manager. # for python 2.7 $ brew install python - # for python 3.4 + # for python 3.5 $ brew install python3 If you use an installer for your Python, then you can skip to the section @@ -292,7 +292,7 @@ After you've got your virtualenv installed, you may install :app:`Pyramid` itself using the following commands: .. parsed-literal:: - + $ $VENV/bin/easy_install "pyramid==\ |release|\ " The ``easy_install`` command will take longer than the previous ones to @@ -371,7 +371,7 @@ You can use Pyramid on Windows under Python 2 or 3. installed: .. parsed-literal:: - + c:\\env> %VENV%\\Scripts\\easy_install "pyramid==\ |release|\ " What Gets Installed |