From 3401f4de51870c0dd7fc03746e3b6793a847e9d9 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Fri, 6 Jul 2018 14:34:12 +1000 Subject: [PATCH 1/2] Added User Guide section on proxy configuration. Fixed #512. Signed-off-by: Brett Randall --- docs/user_guide.rst | 15 +++++++++++++++ news/512.doc | 1 + news/5574.doc | 1 + 3 files changed, 17 insertions(+) create mode 100644 news/512.doc create mode 100644 news/5574.doc diff --git a/docs/user_guide.rst b/docs/user_guide.rst index ee6c31e50..142bc87a2 100644 --- a/docs/user_guide.rst +++ b/docs/user_guide.rst @@ -51,6 +51,21 @@ For more information and examples, see the :ref:`pip install` reference. .. _`Requirements Files`: +Using a Proxy Server +******************** + +When installing packages from `PyPI`_, pip requires internet access, which +in many corporate environments requires an outbound HTTP proxy server. + + +pip can be configured to connect through a proxy server in various ways: + +* using the ``--proxy`` command-line option to specify a proxy in the form + ``[user:passwd@]proxy.server:port`` +* using ``proxy`` in a :ref:`config-file` +* by setting the standard environment-variables ``http_proxy``, ``https_proxy`` + and ``no_proxy``. + Requirements Files ****************** diff --git a/news/512.doc b/news/512.doc new file mode 100644 index 000000000..e0382fbe4 --- /dev/null +++ b/news/512.doc @@ -0,0 +1 @@ +Adding documentation for making pip use a proxy server diff --git a/news/5574.doc b/news/5574.doc new file mode 100644 index 000000000..e0382fbe4 --- /dev/null +++ b/news/5574.doc @@ -0,0 +1 @@ +Adding documentation for making pip use a proxy server From 549cdebf96289f97c80f66e21b3db0d1f9b9bf30 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sun, 15 Jul 2018 15:55:27 +0530 Subject: [PATCH 2/2] Remove redundant newline --- docs/user_guide.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/user_guide.rst b/docs/user_guide.rst index 142bc87a2..4520c3831 100644 --- a/docs/user_guide.rst +++ b/docs/user_guide.rst @@ -57,7 +57,6 @@ Using a Proxy Server When installing packages from `PyPI`_, pip requires internet access, which in many corporate environments requires an outbound HTTP proxy server. - pip can be configured to connect through a proxy server in various ways: * using the ``--proxy`` command-line option to specify a proxy in the form