merge master

This commit is contained in:
Ben Norquist
2018-11-20 12:10:31 -06:00
111 changed files with 751 additions and 381 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
Installing Python 2 on Linux
=============================
.. image:: https://farm5.staticflickr.com/4268/34435688560_4cc2a7bcbb_k_d.jpg
.. image:: /_static/photos/34435688560_4cc2a7bcbb_k_d.jpg
.. note::
Check out our :ref:`guide for installing Python 3 on Linux<install3-linux>`.
+1 -1
View File
@@ -3,7 +3,7 @@
Installing Python 2 on Mac OS X
===============================
.. image:: https://farm5.staticflickr.com/4268/34435688560_4cc2a7bcbb_k_d.jpg
.. image:: /_static/photos/34435688560_4cc2a7bcbb_k_d.jpg
.. note::
Check out our :ref:`guide for installing Python 3 on OS X<install3-osx>`.
+2 -2
View File
@@ -3,12 +3,12 @@
Installing Python 2 on Windows
==============================
.. image:: https://farm5.staticflickr.com/4268/34435688560_4cc2a7bcbb_k_d.jpg
.. image:: /_static/photos/34435688560_4cc2a7bcbb_k_d.jpg
.. note::
Check out our :ref:`guide for installing Python 3 on Windows<install3-windows>`.
First, download the `latest version <https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi>`_
First, download the `latest version <https://www.python.org/ftp/python/2.7.15/python-2.7.15.msi>`_
of Python 2.7 from the official website. If you want to be sure you are installing a fully
up-to-date version, click the Downloads > Windows link from the home page of the
`Python.org web site <http://python.org>`_ .
+2 -2
View File
@@ -3,7 +3,7 @@
Installing Python 3 on Linux
============================
.. image:: https://farm5.staticflickr.com/4276/34435689480_2e6f358510_k_d.jpg
.. image:: /_static/photos/34435689480_2e6f358510_k_d.jpg
This document describes how to install Python 3.6 on Ubuntu Linux machines.
@@ -93,7 +93,7 @@ care about that.
Pipenv & Virtual Environments
-----------------------------
The next step is to install Pipenv, so you can install dependencies and manage virtual environments.
The next step is to install Pipenv, so you can install dependencies and manage virtual environments.
A Virtual Environment is a tool to keep the dependencies required by different projects
in separate places, by creating virtual Python environments for them. It solves the
+4 -4
View File
@@ -5,7 +5,7 @@
Installing Python 3 on Mac OS X
===============================
.. image:: https://farm5.staticflickr.com/4276/34435689480_2e6f358510_k_d.jpg
.. image:: /_static/photos/34435689480_2e6f358510_k_d.jpg
The latest version of Mac OS X, High Sierra, **comes with Python 2.7 out of the box**.
@@ -112,13 +112,13 @@ The rest of the guide will assume that ``python`` references Python 3.
# Do I have a Python 3 installed?
$ python --version
Python 3.6.4 # Success!
# If you still see 2.7 ensure in PATH /usr/local/bin/ takes precedence over /usr/bin/
Python 3.7.1 # Success!
Pipenv & Virtual Environments
-----------------------------
The next step is to install Pipenv, so you can install dependencies and manage virtual environments.
The next step is to install Pipenv, so you can install dependencies and manage virtual environments.
A Virtual Environment is a tool to keep the dependencies required by different projects
in separate places, by creating virtual Python environments for them. It solves the
+1 -1
View File
@@ -3,7 +3,7 @@
Installing Python 3 on Windows
==============================
.. image:: https://farm5.staticflickr.com/4276/34435689480_2e6f358510_k_d.jpg
.. image:: /_static/photos/34435689480_2e6f358510_k_d.jpg
First, follow the installation instructions for `Chocolatey <https://chocolatey.org/install>`_.
It's a community system packager manager for Windows 7+. (It's very much like Homebrew on OSX.)
+3 -3
View File
@@ -3,7 +3,7 @@
Properly Installing Python
==========================
.. image:: https://farm5.staticflickr.com/4303/36137232412_fdcb0f84eb_k_d.jpg
.. image:: /_static/photos/36137232412_fdcb0f84eb_k_d.jpg
There's a good chance that you already have Python on your operating system.
@@ -16,8 +16,8 @@ other third-party Python libraries.
.. note:: The use of **Python 3** is *highly* preferred over Python 2. Consider upgrading your applications and infrastructure if you find yourself *still* using Python 2 in production today. If you are using Python 3, congratulations — you are indeed a person of excellent taste.
*Kenneth Reitz*
Installation Guides
-------------------
+3 -3
View File
@@ -1,7 +1,7 @@
Picking an Python Interpreter (3 vs. 2)
=======================================
Picking a Python Interpreter (3 vs 2)
=====================================
.. image:: https://farm5.staticflickr.com/4265/34484834733_5b80f65ab1_k_d.jpg
.. image:: /_static/photos/34484834733_5b80f65ab1_k_d.jpg
.. _which-python: