Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit cb3f026

Browse filesBrowse files
Zac-HDZac-HD
committed
Update install instructions
Link py2 docs to py3 docs. Fix invisible subheading. Note that pip is part of the Python install now; closes realpython#347. Suggest avoiding eol 2.6 unless paid specifically.
1 parent ce7530b commit cb3f026
Copy full SHA for cb3f026

File tree

5 files changed

+29
-33
lines changed
Filter options

5 files changed

+29
-33
lines changed

‎docs/starting/install/linux.rst

Copy file name to clipboardExpand all lines: docs/starting/install/linux.rst
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Installing Python 2 on Linux
55

66
.. image:: https://farm5.staticflickr.com/4268/34435688560_4cc2a7bcbb_k_d.jpg
77

8+
.. note::
9+
Check out our :ref:`guide for installing Python 3 on Linux<install3-linux>`.
10+
811
The latest versions of CentOS, Red Hat Enterprise Linux (RHEL) and Ubuntu
912
**come with Python 2.7 out of the box**.
1013

‎docs/starting/install/win.rst

Copy file name to clipboardExpand all lines: docs/starting/install/win.rst
+15-14Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Installing Python 2 on Windows
55

66
.. image:: https://farm5.staticflickr.com/4268/34435688560_4cc2a7bcbb_k_d.jpg
77

8+
.. note::
9+
Check out our :ref:`guide for installing Python 3 on Windows<install3-windows>`.
10+
811
First, download the `latest version <https://www.python.org/ftp/python/2.7.14/python-2.7.14.msi>`_
912
of Python 2.7 from the official website. If you want to be sure you are installing a fully
1013
up-to-date version, click the Downloads > Windows link from the home page of the
@@ -50,24 +53,22 @@ makes it much easier for you to use other third-party Python libraries.
5053
Setuptools + Pip
5154
----------------
5255

53-
The most crucial third-party Python software of all is Setuptools, which
54-
extends the packaging and installation facilities provided by the distutils in
55-
the standard library. Once you add Setuptools to your Python system you can
56-
download and install any compliant Python software product with a single
57-
command. It also enables you to add this network installation capability to
58-
your own Python software with very little work.
56+
The two most crucial third-party Python packages are `setuptools <https://pypi.python.org/pypi/setuptools>`_ and `pip <https://pip.pypa.io/en/stable/>`_.
57+
58+
Once installed, you can download, install and uninstall any compliant Python software
59+
product with a single command. It also enables you to add this network installation
60+
capability to your own Python software with very little work.
5961

60-
To obtain the latest version of Setuptools for Windows, run the Python script
61-
available here: `ez_setup.py <https://bootstrap.pypa.io/ez_setup.py>`_
62+
Python 2.7.9 and later (on the python2 series), and Python 3.4 and later include
63+
pip by default.
6264

65+
To see if pip is installed, open a command prompt and run
66+
67+
.. code-block:: console
6368
64-
You'll now have a new command available to you: **easy_install**. It is
65-
considered by many to be deprecated, so we will install its replacement:
66-
**pip**. Pip allows for uninstallation of packages, and is actively maintained,
67-
unlike easy_install.
69+
$ command -v pip
6870
69-
To install pip, run the Python script available here:
70-
`get-pip.py <https://raw.github.com/pypa/pip/master/contrib/get-pip.py>`_
71+
To install pip, `follow the official pip installation guide <https://pip.pypa.io/en/latest/installing/>`_ - this will automatically install the latest version of setuptools.
7172

7273

7374
Virtual Environments

‎docs/starting/install3/win.rst

Copy file name to clipboardExpand all lines: docs/starting/install3/win.rst
+6-16Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,14 @@ This will launch the Python 3 interpreter.
6464
Setuptools + Pip
6565
----------------
6666

67-
The most crucial third-party Python software of all is Setuptools, which
68-
extends the packaging and installation facilities provided by the distutils in
69-
the standard library. Once you add Setuptools to your Python system you can
70-
download and install any compliant Python software product with a single
71-
command. It also enables you to add this network installation capability to
72-
your own Python software with very little work.
67+
The two most crucial third-party Python packages are `setuptools <https://pypi.python.org/pypi/setuptools>`_ and `pip <https://pip.pypa.io/en/stable/>`_,
68+
which let you download, install and uninstall any compliant Python software
69+
product with a single command. It also enables you to add this network installation
70+
capability to your own Python software with very little work.
7371

74-
To obtain the latest version of Setuptools for Windows, run the Python script
75-
available here: `ez_setup.py <https://bootstrap.pypa.io/ez_setup.py>`_
72+
All supported versions of Python 3 include pip, so just make sure it's up to date::
7673

77-
78-
You'll now have a new command available to you: **easy_install**. It is
79-
considered by many to be deprecated, so we will install its replacement:
80-
**pip**. Pip allows for uninstallation of packages, and is actively maintained,
81-
unlike easy_install.
82-
83-
To install pip, run the Python script available here:
84-
`get-pip.py <https://raw.github.com/pypa/pip/master/contrib/get-pip.py>`_
74+
python -m pip install -U pip
8575

8676

8777
Pipenv & Virtual Environments

‎docs/starting/installation.rst

Copy file name to clipboardExpand all lines: docs/starting/installation.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Installation Guides
2424
These guides go over the proper installation of :ref:`Python <which-python>`
2525
for development purposes, as well as setuptools, pip and virtualenv.
2626

27-
Python 3 Installation Guides
28-
////////////////////////////
27+
Python 3 Installation Guides
28+
////////////////////////////
2929

3030
- :ref:`Python 3 on MacOS <install3-osx>`.
3131
- :ref:`Python 3 on Windows <install3-windows>`.

‎docs/starting/which-python.rst

Copy file name to clipboardExpand all lines: docs/starting/which-python.rst
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ It is possible to `write code that works on Python 2.6, 2.7, and Python 3
5858
<https://docs.python.org/3/howto/pyporting.html>`_. This
5959
ranges from trivial to hard depending upon the kind of software
6060
you are writing; if you're a beginner there are far more important things to
61-
worry about.
61+
worry about. Note that Python 2.6 is end-of-life upstream, so you shouldn't
62+
try to write 2.6-compatible code unless you're being paid specifically to
63+
do that.
6264

6365
Implementations
6466
~~~~~~~~~~~~~~~

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.