New upstream version 18.0

AUTHORS.txt

 Adam Chainz <adam@adamj.eu>
 Adam Wentz <awentz@theonion.com>
+Adrien Morison <adrien.morison@gmail.com>
+Alan Yee <alyee@ucsd.edu>
 Aleks Bunin <github@compuix.com>
 Alex Gaynor <alex.gaynor@gmail.com>
 Alex Grönholm <alex.gronholm@nextday.fi>
 Alex Morega <alex@grep.ro>
 Alex Stachowiak <alexander@computer.org>
+Alexander Shtyrov <rawzausho@gmail.com>
 Alexandre Conrad <alexandre.conrad@gmail.com>
 Alli <alzeih@users.noreply.github.com>
 Anatoly Techtonik <techtonik@gmail.com>
 Andrei Geacar <andrei.geacar@gmail.com>
 Andrey Bulgakov <mail@andreiko.ru>
+Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
+Andrés Delfino <adelfino@gmail.com>
 Andy Freeland <andy.freeland@redjack.com>
 Andy Kluger <AndydeCleyre@users.noreply.github.com>
+Anish Tambe <anish.tambe@yahoo.in>
 Anrs Hu <anrs@douban.com>
+Anthony Sottile <asottile@umich.edu>
 Antoine Musso <hashar@free.fr>
 Anton Ovchinnikov <revolver112@gmail.com>
 Anton Patrushev <apatrushev@gmail.com>
 Antonio Alvarado Hernandez <tnotstar@gmail.com>
+Antony Lee <anntzer.lee@gmail.com>
 Antti Kaihola <akaihol+github@ambitone.com>
+Anubhav Patel <anubhavp28@gmail.com>
+Anuj Godase <godaseanuj@gmail.com>
 AQNOUCH Mohammed <aqnouch.mohammed@gmail.com>
+AraHaan <seandhunt_7@yahoo.com>
 Arindam Choudhury <arindam@live.com>
 Armin Ronacher <armin.ronacher@active-4.com>
 Ashley Manton <ajd.manton@googlemail.com>
+Atsushi Odagiri <aodagx@gmail.com>
+Avner Cohen <israbirding@gmail.com>
 Baptiste Mispelon <bmispelon@gmail.com>
+Bartek Ogryczak <b.ogryczak@gmail.com>
+Bastian Venthur <mail@venthur.de>
 Ben Darnell <ben@bendarnell.com>
+Ben Hoyt <benhoyt@gmail.com>
 Ben Rosser <rosser.bjr@gmail.com>
 Bence Nagy <bence@underyx.me>
 Benjamin VanEvery <ben@simondata.com>
+Benoit Pierre <benoit.pierre@gmail.com>
 Berker Peksag <berker.peksag@gmail.com>
 Bernardo B. Marques <bernardo.fire@gmail.com>
 Bogdan Opanchuk <bogdan@opanchuk.net>
 Brad Erickson <eosrei@gmail.com>
 Bradley Ayers <bradley.ayers@gmail.com>
+Brandon L. Reiss <brandon@damyata.co>
+Brett Randall <javabrett@gmail.com>
 Brian Rosner <brosner@gmail.com>
+BrownTruck <BrownTruck@users.noreply.github.com>
 Bruno Oliveira <nicoddemus@gmail.com>
 Bruno Renié <brutasse@gmail.com>
 Buck Golemon <buck@yelp.com>
@@ -50,6 +70,7 @@ Chris Brinker <chris.brinker@gmail.com>
 Chris Jerdonek <chris.jerdonek@gmail.com>
 Chris McDonough <chrism@plope.com>
 Chris Wolfe <chriswwolfe@gmail.com>
+Christian Heimes <christian@python.org>
 Christian Oudard <christian.oudard@gmail.com>
 Christopher Snyder <cnsnyder@users.noreply.github.com>
 Clark Boylan <clark.boylan@gmail.com>
@@ -58,10 +79,15 @@ Cody <Purring@users.noreply.github.com>
 Cody Soyland <codysoyland@gmail.com>
 Colin Watson <cjwatson@debian.org>
 Connor Osborn <cdosborn@email.arizona.edu>
+Cooper Lees <me@cooperlees.com>
+Cooper Ry Lees <me@cooperlees.com>
 Cory Benfield <lukasaoz@gmail.com>
 Cory Wright <corywright@gmail.com>
 Craig Kerstiens <craig.kerstiens@gmail.com>
 Cristian Sorinel <cristian.sorinel@gmail.com>
+Curtis Doty <Curtis@GreenKey.net>
+Damian Quiroga <qdamian@gmail.com>
+Dan Black <dyspop@gmail.com>
 Dan Savilonis <djs@n-cube.org>
 Dan Sully <daniel-github@electricrain.com>
 daniel <mcdonaldd@unimelb.edu.au>
@@ -69,7 +95,9 @@ Daniel Collins <accounts@dac.io>
 Daniel Hahler <git@thequod.de>
 Daniel Holth <dholth@fastmail.fm>
 Daniel Jost <torpedojost@gmail.com>
+Daniel Shaulov <daniel.shaulov@gmail.com>
 Daniele Procida <daniele@vurt.org>
+Danny Hermes <daniel.j.hermes@gmail.com>
 Dav Clark <davclark@gmail.com>
 Dave Abrahams <dave@boostpro.com>
 David Aguilar <davvid@gmail.com>
@@ -78,6 +106,7 @@ David Caro <david@dcaro.es>
 David Evans <d@drhevans.com>
 David Linke <dr.david.linke@gmail.com>
 David Pursehouse <david.pursehouse@gmail.com>
+David Tucker <david@tucker.name>
 David Wales <daviewales@gmail.com>
 Davidovich <david.genest@gmail.com>
 derwolfe <chriswwolfe@gmail.com>
@@ -86,37 +115,56 @@ Domen Kožar <domen@dev.si>
 Donald Stufft <donald@stufft.io>
 Dongweiming <dongweiming@admaster.com.cn>
 Douglas Thor <dougthor42@users.noreply.github.com>
+DrFeathers <WilliamGeorgeBurgess@gmail.com>
+Dustin Ingram <di@di.codes>
 Dwayne Bailey <dwayne@translate.org.za>
+Ed Morley <501702+edmorley@users.noreply.github.com>
 Ed Morley <emorley@mozilla.com>
+Eli Schwartz <eschwartz93@gmail.com>
 Emil Styrke <emil.styrke@gmail.com>
 Endoh Takanao <djmchl@gmail.com>
 enoch <lanxenet@gmail.com>
 Eric Gillingham <Gillingham@bikezen.net>
 Eric Hanchrow <eric.hanchrow@gmail.com>
+Eric Hopper <hopper@omnifarious.org>
 Erik M. Bray <embray@stsci.edu>
 Erik Rose <erik@mozilla.com>
+Ernest W Durbin III <ewdurbin@gmail.com>
+Ernest W. Durbin III <ewdurbin@gmail.com>
+Erwin Janssen <erwinjanssen@outlook.com>
 Eugene Vereshchagin <evvers@gmail.com>
+fiber-space <fiber-space@users.noreply.github.com>
+Filip Kokosiński <filip.kokosinski@gmail.com>
 Florian Briand <ownerfrance+github@hotmail.com>
 Francesco <f.guerrieri@gmail.com>
 Francesco Montesano <franz.bergesund@gmail.com>
+Gabriel Curio <g.curio@gmail.com>
 Gabriel de Perthuis <g2p.code@gmail.com>
 Garry Polley <garrympolley@gmail.com>
+gdanielson <graeme.danielson@gmail.com>
 Geoffrey Lehée <geoffrey@lehee.name>
 Geoffrey Sneddon <me@gsnedders.com>
 George Song <george@55minutes.com>
 Georgi Valkov <georgi.t.valkov@gmail.com>
+Giftlin Rajaiah <giftlin.rgn@gmail.com>
 gizmoguy1 <gizmoguy1@gmail.com>
+gkdoc <40815324+gkdoc@users.noreply.github.com>
+GOTO Hayato <3532528+gh640@users.noreply.github.com>
 Guilherme Espada <porcariadagata@gmail.com>
 Guy Rozendorn <guy@rzn.co.il>
+Hari Charan <hcharan997@gmail.com>
 Herbert Pfennig <herbert@albinen.com>
 Hsiaoming Yang <lepture@me.com>
+Hugo <hugovk@users.noreply.github.com>
 Hugo Lopes Tavares <hltbra@gmail.com>
 Hynek Schlawack <hs@ox.cx>
 Ian Bicking <ianb@colorstudy.com>
 Ian Cordasco <graffatcolmingov@gmail.com>
 Ian Lee <IanLee1521@gmail.com>
+Ian Stapleton Cordasco <graffatcolmingov@gmail.com>
 Ian Wienand <ian@wienand.org>
 Ian Wienand <iwienand@redhat.com>
+Igor Kuzmitshov <kuzmiigo@gmail.com>
 Igor Sobreira <igor@igorsobreira.com>
 Ilya Baryshev <baryshev@gmail.com>
 INADA Naoki <songofacandy@gmail.com>
@@ -137,10 +185,12 @@ Jay Graves <jay@skabber.com>
 Jeff Barber <jbarber@computer.org>
 Jeff Dairiki <dairiki@dairiki.org>
 Jeremy Stanley <fungi@yuggoth.org>
+Jeremy Zafran <jzafran@users.noreply.github.com>
 Jim Garrison <jim@garrison.cc>
 Jivan Amara <Development@JivanAmara.net>
 John-Scott Atlakson <john.scott.atlakson@gmail.com>
 Jon Banafato <jon@jonafato.com>
+Jon Dufresne <jon.dufresne@gmail.com>
 Jon Parise <jon@indelible.org>
 Jon Wayne Parrott <jjramone13@gmail.com>
 Jonas Nockert <jonasnockert@gmail.com>
@@ -155,6 +205,7 @@ jwg4 <jack.grahl@yahoo.co.uk>
 Jyrki Pulliainen <jyrki@spotify.com>
 Kamal Bin Mustafa <kamal@smach.net>
 kaustav haldar <hi@kaustav.me>
+keanemind <keanemind@gmail.com>
 Kelsey Hightower <kelsey.hightower@gmail.com>
 Kenneth Belitzky <kenny@belitzky.com>
 Kenneth Reitz <me@kennethreitz.com>
@@ -162,7 +213,9 @@ Kenneth Reitz <me@kennethreitz.org>
 Kevin Burke <kev@inburke.com>
 Kevin Carter <kevin.carter@rackspace.com>
 Kevin Frommelt <kevin.frommelt@webfilings.com>
+Kexuan Sun <me@kianasun.com>
 Kit Randel <kit@nocturne.net.nz>
+kpinc <kop@meme.com>
 Kumar McMillan <kumar.mcmillan@gmail.com>
 Kyle Persohn <kyle.persohn@gmail.com>
 Laurent Bristiel <laurent@bristiel.com>
@@ -170,16 +223,22 @@ Leon Sasson <leonsassonha@gmail.com>
 Lev Givon <lev@columbia.edu>
 Lincoln de Sousa <lincoln@comum.org>
 Lipis <lipiridis@gmail.com>
+Lucas Cimon <lucas.cimon@gmail.com>
 Ludovic Gasc <gmludo@gmail.com>
 Luke Macken <lmacken@redhat.com>
+Luo Jiebin <luo.jiebin@qq.com>
+luojiebin <luojiebin@users.noreply.github.com>
+luz.paz <luzpaz@users.noreply.github.com>
 Marc Abramowitz <marc@marc-abramowitz.com>
 Marc Tamlyn <marc.tamlyn@gmail.com>
 Marcus Smith <qwcode@gmail.com>
+Mariatta <Mariatta@users.noreply.github.com>
 Mark Kohler <mark.kohler@proteinsimple.com>
 Markus Hametner <fin+github@xbhd.org>
 Masklinn <bitbucket.org@masklinn.net>
 Matej Stuchlik <mstuchli@redhat.com>
 Mathew Jennings <mjennings@foursquare.com>
+Mathieu Bridon <bochecha@daitauha.fr>
 Matt Good <matt@matt-good.net>
 Matt Maker <trip@monstro.us>
 Matt Robenolt <matt@ydekproductions.com>
@@ -188,7 +247,9 @@ Matthew Einhorn <moiein2000@gmail.com>
 Matthew Gilliard <matthew.gilliard@gmail.com>
 Matthew Iversen <teh.ivo@gmail.com>
 Matthew Trumbell <matthew@thirdstonepartners.com>
+Matthew Willson <matthew@swiftkey.com>
 Matthias Bussonnier <bussonniermatthias@gmail.com>
+mattip <matti.picus@gmail.com>
 Maxim Kurnikov <maxim.kurnikov@gmail.com>
 Maxime Rouyrre <rouyrre+git@gmail.com>
 memoselyk <memoselyk@gmail.com>
@@ -202,25 +263,32 @@ Miguel Araujo Perez <miguel.araujo.perez@gmail.com>
 Mihir Singh <git.service@mihirsingh.com>
 Min RK <benjaminrk@gmail.com>
 MinRK <benjaminrk@gmail.com>
+Miro Hrončok <miro@hroncok.cz>
 montefra <franz.bergesund@gmail.com>
 Monty Taylor <mordred@inaugust.com>
 Nate Coraor <nate@bx.psu.edu>
 Nathaniel J. Smith <njs@pobox.com>
+Nehal J Wani <nehaljw.kkd1@gmail.com>
 Nick Coghlan <ncoghlan@gmail.com>
 Nick Stenning <nick@whiteink.com>
+Nikhil Benesch <nikhil.benesch@gmail.com>
 Nowell Strite <nowell@strite.org>
 nvdv <modestdev@gmail.com>
 Ofekmeister <ofekmeister@gmail.com>
+Oliver Jeeves <oliver.jeeves@ocado.com>
 Oliver Tonnhofer <olt@bogosoft.com>
 Olivier Girardot <ssaboum@gmail.com>
 Olivier Grisel <olivier.grisel@ensta.org>
 Ollie Rutherfurd <orutherfurd@gmail.com>
+OMOTO Kenji <k-omoto@m3.com>
 Oren Held <orenhe@il.ibm.com>
 Oscar Benjamin <oscar.j.benjamin@gmail.com>
+Oz N Tiram <oz.tiram@gmail.com>
 Patrick Dubroy <pdubroy@gmail.com>
 Patrick Jenkins <patrick@socialgrowthtechnologies.com>
 Patrick Lawson <pl@foursquare.com>
 patricktokeeffe <patricktokeeffe@users.noreply.github.com>
+Paul Kehrer <paul.l.kehrer@gmail.com>
 Paul Moore <p.f.moore@gmail.com>
 Paul Nasrat <pnasrat@gmail.com>
 Paul Oswald <pauloswald@gmail.com>
@@ -231,15 +299,19 @@ Pekka Klärck <peke@iki.fi>
 Peter Waller <peter.waller@gmail.com>
 Phaneendra Chiruvella <hi@pcx.io>
 Phil Freo <phil@philfreo.com>
+Phil Pennock <phil@pennock-tech.com>
 Phil Whelan <phil123@gmail.com>
+Philip Molloy <pamolloy@users.noreply.github.com>
 Philippe Ombredanne <pombredanne@gmail.com>
+Pi Delport <pjdelport@gmail.com>
 Pierre-Yves Rofes <github@rofes.fr>
-Piet Delport <pjdelport@gmail.com>
-Pradyun <pradyunsg@users.noreply.github.com>
-Pradyun S. Gedam <pradyunsg@gmail.com>
+pip <pypa-dev@googlegroups.com>
+Pradyun Gedam <pradyunsg@gmail.com>
+Pratik Mallya <mallya@us.ibm.com>
 Preston Holmes <preston@ptone.com>
 Przemek Wrzos <hetmankp@none>
 Qiangning Hong <hongqn@gmail.com>
+R. David Murray <rdmurray@bitdance.com>
 Rafael Caricio <rafael.jacinto@gmail.com>
 Ralf Schmitt <ralf@systemexit.de>
 Razzi Abuissa <razzi53@gmail.com>
@@ -269,15 +341,17 @@ schlamar <marc.schlaich@gmail.com>
 Scott Kitterman <sklist@kitterman.com>
 seanj <seanj@xyke.com>
 Sebastian Schaetz <sschaetz@butterflynetinc.com>
+Segev Finer <segev208@gmail.com>
 Sergey Vasilyev <nolar@nolar.info>
 Seth Woodworth <seth@sethish.com>
+Shlomi Fish <shlomif@shlomifish.org>
 Simeon Visser <svisser@users.noreply.github.com>
 Simon Cross <hodgestar@gmail.com>
 Simon Pichugin <simon.pichugin@gmail.com>
 Sorin Sbarnea <sorin.sbarnea@gmail.com>
 Stavros Korokithakis <stavros@korokithakis.net>
 Stefan Scherfke <stefan@sofa-rockers.org>
-Stephan Erb <stephan@dev.static-void.de>
+Stephan Erb <github@stephanerb.eu>
 stepshal <nessento@openmailbox.org>
 Steve (Gadget) Barnes <gadgetsteve@hotmail.com>
 Steve Barnes <gadgetsteve@hotmail.com>
@@ -288,17 +362,19 @@ Stéphane Bidoul (ACSONE) <stephane.bidoul@acsone.eu>
 Stéphane Bidoul <stephane.bidoul@acsone.eu>
 Stéphane Klein <contact@stephane-klein.info>
 Takayuki SHIMIZUKAWA <shimizukawa@gmail.com>
+Thijs Triemstra <info@collab.nl>
 Thomas Fenzl <thomas.fenzl@gmail.com>
 Thomas Grainger <tagrain@gmail.com>
 Thomas Guettler <tguettler@tbz-pariv.de>
 Thomas Johansson <devnull@localhost>
-Thomas Kluyver <takowl@gmail.com>
+Thomas Kluyver <thomas@kluyver.me.uk>
 Thomas Smith <smithtg@ncbi.nlm.nih.gov>
 Tim D. Smith <github@tim-smith.us>
 Tim Harder <radhermit@gmail.com>
 Tim Heap <tim@timheap.me>
 tim smith <github@tim-smith.us>
 tinruufu <tinruufu@gmail.com>
+Tom Freudenheim <tom.freudenheim@onepeloton.com>
 Tom V <tom@viner.tv>
 Tomer Chachamu <tomer.chachamu@gmail.com>
 Tony Zhaocheng Tan <tony@tonytan.io>
@@ -306,10 +382,10 @@ Toshio Kuratomi <toshio@fedoraproject.org>
 Travis Swicegood <development@domain51.com>
 Valentin Haenel <valentin.haenel@gmx.de>
 Victor Stinner <victor.stinner@gmail.com>
-Victor Stinner <vstinner@redhat.com>
 Viktor Szépe <viktor@szepe.net>
 Ville Skyttä <ville.skytta@iki.fi>
 Vinay Sajip <vinay_sajip@yahoo.co.uk>
+Vincent Philippon <sindaewoh@gmail.com>
 Vitaly Babiy <vbabiy86@gmail.com>
 Vladimir Rutsky <rutsky@users.noreply.github.com>
 W. Trevor King <wking@drexel.edu>
@@ -319,6 +395,7 @@ William ML Leslie <william.leslie.ttg@gmail.com>
 Wolfgang Maier <wolfgang.maier@biologie.uni-freiburg.de>
 Xavier Fernandez <xav.fernandez@gmail.com>
 Xavier Fernandez <xavier.fernandez@polyconseil.fr>
+xoviat <xoviat@users.noreply.github.com>
 YAMAMOTO Takashi <yamamoto@midokura.com>
 Yen Chi Hsuan <yan12125@gmail.com>
 Yoval P <yoval@gmx.com>
@@ -327,3 +404,5 @@ Zearin <zearin@gonk.net>
 Zearin <Zearin@users.noreply.github.com>
 Zhiping Deng <kofreestyler@gmail.com>
 Zvezdan Petkovic <zpetkovic@acm.org>
+Łukasz Langa <lukasz@langa.pl>
+Семён Марьясин <simeon@maryasin.name>

LICENSE.txt

-Copyright (c) 2008-2016 The pip developers (see AUTHORS.txt file)
+Copyright (c) 2008-2018 The pip developers (see AUTHORS.txt file)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

MANIFEST.in

 include AUTHORS.txt
 include LICENSE.txt
-include CHANGES.txt
+include NEWS.rst
 include README.rst
-include pip/_vendor/README.rst
-include pip/_vendor/vendor.txt
+include pyproject.toml
+
+include src/pip/_vendor/README.rst
+include src/pip/_vendor/vendor.txt
+
+include docs/docutils.conf
 
 exclude .coveragerc
 exclude .mailmap
 exclude .travis.yml
-exclude .landscape.yml
-exclude pip/_vendor/Makefile
 exclude tox.ini
-exclude dev-requirements.txt
 exclude appveyor.yml
 
-recursive-include pip/_vendor *.pem
+recursive-include src/pip/_vendor *.pem
 recursive-include docs Makefile *.rst *.py *.bat
 
+exclude src/pip/_vendor/six
+exclude src/pip/_vendor/six/moves
+recursive-exclude src/pip/_vendor *.pyi
+
 prune .github
-prune .travis
-prune docs/_build
-prune contrib
+prune docs/build
+prune news
 prune tasks
 prune tests
+prune tools

PKG-INFO

 Metadata-Version: 1.2
 Name: pip
-Version: 9.0.1
+Version: 18.0
 Summary: The PyPA recommended tool for installing Python packages.
 Home-page: https://pip.pypa.io/
 Author: The pip developers
-Author-email: python-virtualenv@groups.google.com
+Author-email: pypa-dev@groups.google.com
 License: MIT
 Description: pip
         ===
         
-        The `PyPA recommended
-        <https://packaging.python.org/en/latest/current/>`_
-        tool for installing Python packages.
-        
-        * `Installation <https://pip.pypa.io/en/stable/installing.html>`_
-        * `Documentation <https://pip.pypa.io/>`_
-        * `Changelog <https://pip.pypa.io/en/stable/news.html>`_
-        * `Github Page <https://github.com/pypa/pip>`_
-        * `Issue Tracking <https://github.com/pypa/pip/issues>`_
-        * `User mailing list <http://groups.google.com/group/python-virtualenv>`_
-        * `Dev mailing list <http://groups.google.com/group/pypa-dev>`_
-        * User IRC: #pypa on Freenode.
-        * Dev IRC: #pypa-dev on Freenode.
-        
+        The `PyPA recommended`_ tool for installing Python packages.
         
         .. image:: https://img.shields.io/pypi/v/pip.svg
-           :target: https://pypi.python.org/pypi/pip
+           :target: https://pypi.org/project/pip/
         
-        .. image:: https://img.shields.io/travis/pypa/pip/master.svg
-           :target: http://travis-ci.org/pypa/pip
+        .. image:: https://img.shields.io/travis/pypa/pip/master.svg?label=travis-ci
+           :target: https://travis-ci.org/pypa/pip
         
-        .. image:: https://img.shields.io/appveyor/ci/pypa/pip.svg
+        .. image:: https://img.shields.io/appveyor/ci/pypa/pip.svg?label=appveyor-ci
            :target: https://ci.appveyor.com/project/pypa/pip/history
         
-        .. image:: https://readthedocs.org/projects/pip/badge/?version=stable
-           :target: https://pip.pypa.io/en/stable
+        .. image:: https://readthedocs.org/projects/pip/badge/?version=latest
+           :target: https://pip.pypa.io/en/latest
+        
+        * `Installation`_
+        * `Documentation`_
+        * `Changelog`_
+        * `GitHub Page`_
+        * `Issue Tracking`_
+        * `User mailing list`_
+        * `Dev mailing list`_
+        * User IRC: #pypa on Freenode.
+        * Dev IRC: #pypa-dev on Freenode.
         
         Code of Conduct
         ---------------
         
         Everyone interacting in the pip project's codebases, issue trackers, chat
-        rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_.
+        rooms and mailing lists is expected to follow the `PyPA Code of Conduct`_.
         
+        .. _PyPA recommended: https://packaging.python.org/en/latest/current/
+        .. _Installation: https://pip.pypa.io/en/stable/installing.html
+        .. _Documentation: https://pip.pypa.io/en/stable/
+        .. _Changelog: https://pip.pypa.io/en/stable/news.html
+        .. _GitHub Page: https://github.com/pypa/pip
+        .. _Issue Tracking: https://github.com/pypa/pip/issues
+        .. _User mailing list: https://groups.google.com/forum/#!forum/python-virtualenv
+        .. _Dev mailing list: https://groups.google.com/forum/#!forum/pypa-dev
         .. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/
         
-Keywords: easy_install distutils setuptools egg virtualenv
+Keywords: distutils easy_install egg setuptools wheel virtualenv
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Software Development :: Build Tools
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=2.6,!=3.0.*,!=3.1.*,!=3.2.*
+Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*

README.rst

 pip
 ===
 
-The `PyPA recommended
-<https://packaging.python.org/en/latest/current/>`_
-tool for installing Python packages.
-
-* `Installation <https://pip.pypa.io/en/stable/installing.html>`_
-* `Documentation <https://pip.pypa.io/>`_
-* `Changelog <https://pip.pypa.io/en/stable/news.html>`_
-* `Github Page <https://github.com/pypa/pip>`_
-* `Issue Tracking <https://github.com/pypa/pip/issues>`_
-* `User mailing list <http://groups.google.com/group/python-virtualenv>`_
-* `Dev mailing list <http://groups.google.com/group/pypa-dev>`_
-* User IRC: #pypa on Freenode.
-* Dev IRC: #pypa-dev on Freenode.
-
+The `PyPA recommended`_ tool for installing Python packages.
 
 .. image:: https://img.shields.io/pypi/v/pip.svg
-   :target: https://pypi.python.org/pypi/pip
+   :target: https://pypi.org/project/pip/
 
-.. image:: https://img.shields.io/travis/pypa/pip/master.svg
-   :target: http://travis-ci.org/pypa/pip
+.. image:: https://img.shields.io/travis/pypa/pip/master.svg?label=travis-ci
+   :target: https://travis-ci.org/pypa/pip
 
-.. image:: https://img.shields.io/appveyor/ci/pypa/pip.svg
+.. image:: https://img.shields.io/appveyor/ci/pypa/pip.svg?label=appveyor-ci
    :target: https://ci.appveyor.com/project/pypa/pip/history
 
-.. image:: https://readthedocs.org/projects/pip/badge/?version=stable
-   :target: https://pip.pypa.io/en/stable
+.. image:: https://readthedocs.org/projects/pip/badge/?version=latest
+   :target: https://pip.pypa.io/en/latest
+
+* `Installation`_
+* `Documentation`_
+* `Changelog`_
+* `GitHub Page`_
+* `Issue Tracking`_
+* `User mailing list`_
+* `Dev mailing list`_
+* User IRC: #pypa on Freenode.
+* Dev IRC: #pypa-dev on Freenode.
 
 Code of Conduct
 ---------------
 
 Everyone interacting in the pip project's codebases, issue trackers, chat
-rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_.
-
+rooms and mailing lists is expected to follow the `PyPA Code of Conduct`_.
+
+.. _PyPA recommended: https://packaging.python.org/en/latest/current/
+.. _Installation: https://pip.pypa.io/en/stable/installing.html
+.. _Documentation: https://pip.pypa.io/en/stable/
+.. _Changelog: https://pip.pypa.io/en/stable/news.html
+.. _GitHub Page: https://github.com/pypa/pip
+.. _Issue Tracking: https://github.com/pypa/pip/issues
+.. _User mailing list: https://groups.google.com/forum/#!forum/python-virtualenv
+.. _Dev mailing list: https://groups.google.com/forum/#!forum/pypa-dev
 .. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/

docs/Makefile

@@ -5,7 +5,7 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = _build
+BUILDDIR      = build
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)

docs/conf.py

@@ -11,7 +11,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+import glob
 import os
+import re
 import sys
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
@@ -32,7 +34,7 @@ extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
 # intersphinx
 intersphinx_cache_limit = 0
 intersphinx_mapping = {
-    'pypug': ('https://packaging.python.org/en/latest/', None),
+    'pypug': ('https://packaging.python.org/', None),
     'pypa': ('https://www.pypa.io/en/latest/', None),
 }
 
@@ -51,21 +53,39 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'pip'
-copyright = '2008-2016, PyPA'
+copyright = '2008-2017, PyPA'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-try:
-    from pip import __version__
-    # The short X.Y version.
-    version = '.'.join(__version__.split('.')[:2])
-    # The full version, including alpha/beta/rc tags.
-    release = __version__
-except ImportError:
-    version = release = 'dev'
+
+version = release = 'dev'
+
+# Readthedocs seems to install pip as an egg (via setup.py install) which
+# is somehow resulting in "import pip" picking up an older copy of pip.
+# Rather than trying to force RTD to install pip properly, we'll simply
+# read the version direct from the __init__.py file. (Yes, this is
+# fragile, but it works...)
+root = os.path.dirname(os.path.dirname(__file__))
+pip_init = os.path.join(root, 'src', 'pip', '__init__.py')
+
+with open(pip_init) as f:
+    for line in f:
+        m = re.match(r'__version__ = "(.*)"', line)
+        if m:
+            __version__ = m.group(1)
+            # The short X.Y version.
+            version = '.'.join(__version__.split('.')[:2])
+            # The full version, including alpha/beta/rc tags.
+            release = __version__
+            break
+
+# We have this here because readthedocs plays tricks sometimes and there seems
+# to be a hiesenbug, related to the version of pip discovered. This is here to
+# help debug that if someone decides to do that in the future.
+print(version)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -82,7 +102,7 @@ today_fmt = '%B %d, %Y'
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['build']
+exclude_patterns = ['build/', 'man/']
 
 # The reST default role (used for this markup: `text`) to use for all documents
 # default_role = None
@@ -113,19 +133,17 @@ extlinks = {
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-if not on_rtd:
-    try:
-        import sphinx_rtd_theme
-        html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    except ImportError:
-        pass
+html_theme = "pypa_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+html_theme_options = {
+    'collapsiblesidebar': True,
+    'externalrefs': True,
+    'navigation_depth': 3,
+    'issues_url': 'https://github.com/pypa/pip/issues'
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 
@@ -156,10 +174,13 @@ html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-html_use_smartypants = False
+smart_quotes = False
 
 # Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
+html_sidebars = {
+    '**': ['localtoc.html', 'relations.html'],
+    'index': ['localtoc.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -204,7 +225,7 @@ latex_documents = [
         'index',
         'pip.tex',
         u'pip Documentation',
-        u'The pip developers',
+        u'pip developers',
         'manual',
     ),
 ]
@@ -225,3 +246,27 @@ latex_documents = [
 
 # If false, no module index is generated.
 # latex_use_modindex = True
+
+# -- Options for Manual Pages -------------------------------------------------
+
+# List of manual pages generated
+man_pages = [
+    (
+        'man/pip',
+        'pip',
+        u'package manager for Python packages',
+        u'pip developers',
+        1
+    )
+]
+
+# Here, we crawl the entire man/commands/ directory and list every file with
+# appropriate name and details
+for fname in glob.glob('man/commands/*.rst'):
+    fname_base = fname[:-4]
+    outname = 'pip-' + fname_base[13:]
+    description = u'description of {} command'.format(
+        outname.replace('-', ' ')
+    )
+
+    man_pages.append((fname_base, outname, description, u'pip developers', 1))

docs/configuration.rst

@@ -3,4 +3,4 @@
 Configuration
 =============
 
-This content is now covered in the :doc:`User Guide <user_guide>`
+This content is now covered in the :ref:`Configuration` section of the :doc:`User Guide <user_guide>`.

docs/development.rst

@@ -31,46 +31,63 @@ push the changes to your fork::
   $ git push git@github.com:yourname/pip.git
 
 Open Pull Requests page at https://github.com/yourname/pip/pulls and
-click "New pull request". That's it.
+click "New pull request" and select your fork. That's it.
+
+Pull requests should be self-contained, and limited in scope. Before being
+merged, a pull request must be reviewed, and keeping individual PRs limited
+in scope makes this far easier. In particular, pull requests must not be
+treated as "feature branches", with ongoing development work happening
+within the PR. Instead, the feature should be broken up into smaller,
+independent parts which can be reviewed and merged individually.
+
+When creating a pull request, avoid including "cosmetic" changes to
+code that is unrelated to your change, as these make reviewing the PR
+more difficult. Examples include re-flowing text in comments or
+documentation, or addition or removal of blank lines or whitespace
+within lines. Such changes can be made separately, as a "formatting
+cleanup" PR, if needed.
 
 
 Automated Testing
 =================
 
-All pull requests and merges to 'master' branch are tested in `Travis <https://travis-ci.org/>`_
-based on our `.travis.yml file <https://github.com/pypa/pip/blob/master/.travis.yml>`_.
-
-Usually, a link to your specific travis build appears in pull requests, but if not,
-you can find it on our `travis pull requests page <https://travis-ci.org/pypa/pip/pull_requests>`_
+All pull requests and merges to 'master' branch are tested using `Travis CI`_
+and `Appveyor CI`_ based on our `.travis.yml`_ and `appveyor.yml`_ files.
 
-The only way to trigger Travis to run again for a pull request, is to submit another change to the pull branch.
+You can find the status and results to the CI runs for your PR on GitHub's Web
+UI for the pull request. You can also find links to the CI services' pages for
+the specific builds in the form of "Details" links, in case the CI run fails
+and you wish to view the output.
 
-We also have Jenkins CI that runs regularly for certain python versions on windows and centos.
+To trigger CI to run again for a pull request, you can close and open the pull
+request or submit another change to the pull request. If needed, project
+maintainers can manually trigger a restart of a job/build.
 
 Running tests
 =============
 
 OS Requirements: subversion, bazaar, git, and mercurial.
 
-Python Requirements: tox or pytest, virtualenv, scripttest, and mock
+Python Requirements: tox or install all packages listed in
+`tools/tests-requirements.txt`_
 
-Ways to run the tests locally:
+Ways to run the tests locally::
 
-::
-
- $ tox -e py33           # The preferred way to run the tests, can use pyNN to
+ $ tox -e py36           # The preferred way to run the tests, can use pyNN to
                          # run for a particular version or leave off the -e to
                          # run for all versions.
  $ python setup.py test  # Using the setuptools test plugin
  $ py.test               # Using py.test directly
  $ tox                   # Using tox against pip's tox.ini
 
-If you are missing one of the VCS tools, you can tell ``py.test`` to skip it:
-
-::
+If you are missing one of the VCS tools, you can tell ``py.test`` to skip it::
 
- $ py.test -k 'not bzr'
+ # When using tox
+ $ tox -e py36 -- -k 'not svn'
+ $ tox -e py36 -- -k 'not (svn or git)'
+ # Directly with py.test
  $ py.test -k 'not svn'
+ $ py.test -k 'not (svn or git)'
 
 
 Getting Involved
@@ -80,7 +97,7 @@ The pip project welcomes help in the following ways:
 
 - Making Pull Requests for code, tests, or docs.
 - Commenting on open issues and pull requests.
-- Helping to answer questions on the mailing list.
+- Helping to answer questions on the `mailing list`_.
 
 If you want to become an official maintainer, start by helping out.
 
@@ -88,6 +105,119 @@ Later, when you think you're ready, get in touch with one of the maintainers,
 and they will initiate a vote.
 
 
+Adding a NEWS Entry
+===================
+
+The ``NEWS.rst`` file is managed using `towncrier`_ and all non trivial changes
+must be accompanied by a news entry.
+
+To add an entry to the news file, first you need to have created an issue
+describing the change you want to make. A Pull Request itself *may* function as
+such, but it is preferred to have a dedicated issue (for example, in case the
+PR ends up rejected due to code quality reasons).
+
+Once you have an issue or pull request, you take the number and you create a
+file inside of the ``news/`` directory named after that issue number with an
+extension of ``removal``, ``feature``, ``bugfix``, or ``doc``. Thus if your
+issue or PR number is ``1234`` and this change is fixing a bug, then you would
+create a file ``news/1234.bugfix``. PRs can span multiple categories by creating
+multiple files (for instance, if you added a feature and deprecated/removed the
+old feature at the same time, you would create ``news/NNNN.feature`` and
+``news/NNNN.removal``). Likewise if a PR touches multiple issues/PRs you may
+create a file for each of them with the exact same contents and Towncrier will
+deduplicate them.
+
+The contents of this file are reStructuredText formatted text that will be used
+as the content of the news file entry. You do not need to reference the issue
+or PR numbers here as towncrier will automatically add a reference to all of
+the affected issues when rendering the news file.
+
+In order to maintain a consistent style in the ``NEWS.rst`` file, it is
+preferred to keep the news entry to the point, in sentence case, shorter than
+80 characters and in an imperative tone -- an entry should complete the sentence
+"This change will ...". In rare cases, where one line is not enough, use a
+summary line in an imperative tone followed by a blank line separating it
+from a description of the feature/change in one or more paragraphs, each wrapped
+at 80 characters. Remember that a news entry is meant for end users and should
+only contain details relevant to an end user.
+
+A trivial change is anything that does not warrant an entry in the news file.
+Some examples are: Code refactors that don't change anything as far as the
+public is concerned, typo fixes, white space modification, etc. To mark a PR
+as trivial a contributor simply needs to add a randomly named, empty file to
+the ``news/`` directory with the extension of ``.trivial``. If you are on a
+POSIX like operating system, one can be added by running
+``touch news/$(uuidgen).trivial``. On Windows, the same result can be achieved
+in Powershell using ``New-Item "news/$([guid]::NewGuid()).trivial"``. Core
+committers may also add a "trivial" label to the PR which will accomplish the
+same thing.
+
+Upgrading, removing, or adding a new vendored library gets a special mention
+using a ``news/<library>.vendor`` file. This is in addition to any features,
+bugfixes, or other kinds of news that pulling in this library may have. This
+uses the library name as the key so that updating the same library twice doesn't
+produce two news file entries.
+
+Changes to the processes, policies, or other non code related changed that are
+otherwise notable can be done using a ``news/<name>.process`` file. This is not
+typically used, but can be used for things like changing version schemes,
+updating deprecation policy, etc.
+
+
+Release Cadence
+===============
+
+The pip project has a release cadence of releasing whatever is on ``master``
+every 3 months. This gives users a predictable pattern for when releases
+are going to happen and prevents locking up improvements for fixes for long
+periods of time, while still preventing massively fracturing the user base
+with version numbers.
+
+Our release months are January, April, July, October. The release date within
+that month will be up to the release manager for that release. If there are
+no changes, then that release month is skipped and the next release will be
+3 month later.
+
+The release manager may, at their discretion, choose whether or not there
+will be a pre-release period for a release, and if there is may extend that
+period into the next month if needed.
+
+Because releases are made direct from the ``master`` branch, it is essential
+that ``master`` is always in a releasable state. It is acceptable to merge
+PRs that partially implement a new feature, but only if the partially
+implemented version is usable in that state (for example, with reduced
+functionality or disabled by default). In the case where a merged PR is found
+to need extra work before being released, the release manager always has the
+option to back out the partial change prior to a release. The PR can then be
+reworked and resubmitted for the next release.
+
+
+Deprecation Policy
+==================
+
+Any change to pip that removes or significantly alters user-visible behavior
+that is described in the pip documentation will be deprecated for a minimum of
+6 months before the change occurs. Deprecation will take the form of a warning
+being issued by pip when the feature is used. Longer deprecation periods, or
+deprecation warnings for behavior changes that would not normally be covered by
+this policy, are also possible depending on circumstances, but this is at the
+discretion of the pip developers.
+
+Note that the documentation is the sole reference for what counts as agreed
+behavior. If something isn't explicitly mentioned in the documentation, it can
+be changed without warning, or any deprecation period, in a pip release.
+However, we are aware that the documentation isn't always complete - PRs that
+document existing behavior with the intention of covering that behavior with
+the above deprecation process are always acceptable, and will be considered on
+their merits.
+
+.. note::
+
+  pip has a helper function for making deprecation easier for pip maintainers.
+  The supporting documentation can be found in the source code of
+  ``pip._internal.utils.deprecation.deprecated``. The function is not a part of
+  pip's public API.
+
 Release Process
 ===============
 
@@ -95,7 +225,11 @@ Release Process
    running ``invoke generate.authors`` and commit the results.
 #. On the current pip ``master`` branch, make a new commit which bumps the
    version in ``pip/__init__.py`` to the release version and adjust the
-   ``CHANGES.txt`` file to reflect the current date.
+   ``CHANGES.txt`` file to reflect the current date. The release version should
+   follow a YY.N scheme, where YY is the two digit year, and N is the Nth
+   release within that year.
+#. On the current pip ``master`` branch, generate a new ``NEWS.rst`` by running
+   ``invoke generate.news`` and commit the results.
 #. Create a signed tag of the ``master`` branch of the form ``X.Y.Z`` using the
    command ``git tag -s X.Y.Z``.
 #. Checkout the tag using ``git checkout X.Y.Z`` and create the distribution
@@ -116,12 +250,22 @@ Sometimes we need to release a bugfix release of the form ``X.Y.Z+1``. In order
 to create one of these the changes should already be merged into the
 ``master`` branch.
 
-#. Create a new ``release/X.Y.Z+1`` branch off of the ``X.Y.Z`` tag using the
-   command ``git checkout -b release/X.Y.Z+1 X.Y.Z``.
+#. Create a new ``release/YY.N.Z+1`` branch off of the ``YY.N`` tag using the
+   command ``git checkout -b release/YY.N.Z+1 YY.N``.
 #. Cherry pick the fixed commits off of the ``master`` branch, fixing any
    conflicts and moving any changelog entries from the development version's
-   changelog section to the ``X.Y.Z+1`` section.
-#. Push the ``release/X.Y.Z+1`` branch to github and submit a PR for it against
+   changelog section to the ``YY.N.Z+1`` section.
+#. Push the ``release/YY.N.Z+1`` branch to github and submit a PR for it against
    the ``master`` branch and wait for the tests to run.
-#. Once tests run, merge the ``release/X.Y.Z+1`` branch into master, and follow
+#. Once tests run, merge the ``release/YY.N.Z+1`` branch into master, and follow
    the above release process starting with step 4.
+
+
+.. _`mailing list`: https://mail.python.org/mailman/listinfo/distutils-sig
+.. _`towncrier`: https://pypi.org/project/towncrier/
+.. _`Travis CI`: https://travis-ci.org/
+.. _`Appveyor CI`: https://www.appveyor.com/
+.. _`.travis.yml`: https://github.com/pypa/pip/blob/master/.travis.yml
+.. _`appveyor.yml`: https://github.com/pypa/pip/blob/master/appveyor.yml
+.. _`Travis CI Pull Requests`: https://travis-ci.org/pypa/pip/pull_requests
+.. _`tools/tests-requirements.txt`: https://github.com/pypa/pip/blob/master/tools/tests-requirements.txt

docs/docutils.conf

+[restructuredtext parser]
+smart_quotes = no

docs/index.rst

 pip
 ===
 
-`User list <http://groups.google.com/group/python-virtualenv>`_ |
-`Dev list <http://groups.google.com/group/pypa-dev>`_ |
-`Github <https://github.com/pypa/pip>`_ |
-`PyPI <https://pypi.python.org/pypi/pip/>`_ |
+`User list <https://groups.google.com/forum/#!forum/python-virtualenv>`_ |
+`Dev list <https://groups.google.com/forum/#!forum/pypa-dev>`_ |
+`GitHub <https://github.com/pypa/pip>`_ |
+`PyPI <https://pypi.org/project/pip/>`_ |
 User IRC: #pypa |
 Dev IRC: #pypa-dev
 
@@ -12,7 +12,7 @@ The `PyPA recommended <https://packaging.python.org/en/latest/current/>`_ tool
 for installing Python packages.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    quickstart
    installing

docs/installing.rst

@@ -6,13 +6,11 @@ Installation
 Do I need to install pip?
 -------------------------
 
-pip is already installed if you're using Python 2 >=2.7.9 or Python 3 >=3.4
-binaries downloaded from `python.org <https://www.python.org>`_, but you'll
-need to :ref:`upgrade pip <Upgrading pip>`.
-
-Additionally, pip will already be installed if you're working in a :ref:`Virtual
-Environment <pypug:Creating and using Virtual Environments>` created by
-:ref:`pypug:virtualenv` or :ref:`pyvenv <pypug:venv>`.
+pip is already installed if you are using Python 2 >=2.7.9 or Python 3 >=3.4 
+downloaded from `python.org <https://www.python.org>`_ or if you are working 
+in a :ref:`Virtual Environment <pypug:Creating and using Virtual Environments>` 
+created by :ref:`pypug:virtualenv` or :ref:`pyvenv <pypug:venv>`. 
+Just make sure to :ref:`upgrade pip <Upgrading pip>`.
 
 
 .. _`get-pip`:
@@ -21,33 +19,35 @@ Installing with get-pip.py
 --------------------------
 
 To install pip, securely download `get-pip.py
-<https://bootstrap.pypa.io/get-pip.py>`_. [2]_
+<https://bootstrap.pypa.io/get-pip.py>`_. [1]_::
 
-Then run the following:
+ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 
-::
+As when running any script downloaded from the web, ensure that you have
+reviewed the code and are happy that it works as you expect.
+Then run the following::
 
  python get-pip.py
 
 
 .. warning::
 
-   Be cautious if you're using a Python install that's managed by your operating
-   system or another package manager. get-pip.py does not coordinate with
+   Be cautious if you are using a Python install that is managed by your operating
+   system or another package manager. ``get-pip.py`` does not coordinate with
    those tools, and may leave your system in an inconsistent state.
 
-get-pip.py will also install :ref:`pypug:setuptools` [3]_ and :ref:`pypug:wheel`,
-if they're not already. :ref:`pypug:setuptools` is required to install
+``get-pip.py`` also installs :ref:`pypug:setuptools` [2]_ and :ref:`pypug:wheel` 
+if they are not already. :ref:`pypug:setuptools` is required to install
 :term:`source distributions <pypug:Source Distribution (or "sdist")>`.  Both are
-required to be able to build a :ref:`Wheel cache` (which improves installation
+required in order to build a :ref:`Wheel cache` (which improves installation
 speed), although neither are required to install pre-built :term:`wheels
 <pypug:Wheel>`.
 
 .. note::
 
    The get-pip.py script is supported on the same python version as pip.
-   For the now unsupported Python 3.2, an alternate script is available
-   `here <https://bootstrap.pypa.io/3.2/get-pip.py>`_.
+   For the now unsupported Python 2.6, alternate script is available
+   `here <https://bootstrap.pypa.io/2.6/get-pip.py>`__.
 
 
 get-pip.py options
@@ -55,14 +55,14 @@ get-pip.py options
 
 .. option:: --no-setuptools
 
-    If set, don't attempt to install :ref:`pypug:setuptools`
+    If set, do not attempt to install :ref:`pypug:setuptools`
 
 .. option:: --no-wheel
 
-    If set, don't attempt to install :ref:`pypug:wheel`
+    If set, do not attempt to install :ref:`pypug:wheel`
 
 
-Additionally, ``get-pip.py`` supports using the :ref:`pip install options <pip
+``get-pip.py`` allows :ref:`pip install options <pip
 install Options>` and the :ref:`general options <General Options>`. Below are
 some examples:
 
@@ -70,13 +70,18 @@ Install from local copies of pip and setuptools::
 
   python get-pip.py --no-index --find-links=/local/copies
 
-Install to the user site [4]_::
+Install to the user site [3]_::
 
   python get-pip.py --user
 
 Install behind a proxy::
 
-  python get-pip.py --proxy="[user:passwd@]proxy.server:port"
+  python get-pip.py --proxy="http://[user:passwd@]proxy.server:port"
+
+``get-pip.py`` can also be used to install a specified combination of ``pip``,
+``setuptools``, and ``wheel`` using the same requirements syntax as ``pip``::
+
+  python get-pip.py pip==9.0.2 wheel==0.30.0 setuptools==28.8.0
 
 
 Using Linux Package Managers
@@ -91,16 +96,12 @@ the `Python Packaging User Guide
 Upgrading pip
 -------------
 
-On Linux or macOS:
-
-::
+On Linux or macOS::
 
  pip install -U pip
 
 
-On Windows [5]_:
-
-::
+On Windows [4]_::
 
  python -m pip install -U pip
 
@@ -108,31 +109,27 @@ On Windows [5]_:
 Python and OS Compatibility
 ---------------------------
 
-pip works with CPython versions 2.6, 2.7, 3.3, 3.4, 3.5 and also pypy.
+pip works with CPython versions 2.7, 3.4, 3.5, 3.6 and also pypy.
 
-This means pip works on the latest patch version of each of these minor versions
-(i.e. 2.6.9 for 2.6, etc).
-Previous patch versions are supported on a best effort approach.
+This means pip works on the latest patch version of each of these minor
+versions. Previous patch versions are supported on a best effort approach.
 
 pip works on Unix/Linux, macOS, and Windows.
 
 
 ----
 
-.. [1] For Python 2, see https://docs.python.org/2/installing, and for Python3,
-       see https://docs.python.org/3/installing.
-
-.. [2] "Secure" in this context means using a modern browser or a
+.. [1] "Secure" in this context means using a modern browser or a
        tool like `curl` that verifies SSL certificates when downloading from
        https URLs.
 
-.. [3] Beginning with pip v1.5.1, ``get-pip.py`` stopped requiring setuptools to
+.. [2] Beginning with pip v1.5.1, ``get-pip.py`` stopped requiring setuptools to
        be installed first.
 
-.. [4] The pip developers are considering making ``--user`` the default for all
+.. [3] The pip developers are considering making ``--user`` the default for all
        installs, including ``get-pip.py`` installs of pip, but at this time,
        ``--user`` installs for pip itself, should not be considered to be fully
        tested or endorsed. For discussion, see `Issue 1668
        <https://github.com/pypa/pip/issues/1668>`_.
 
-.. [5] https://github.com/pypa/pip/issues/1299
+.. [4] https://github.com/pypa/pip/issues/1299

docs/make.bat

@@ -5,7 +5,7 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
+set BUILDDIR=build
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
 set I18NSPHINXOPTS=%SPHINXOPTS% .
 if NOT "%PAPER%" == "" (

docs/man/commands/check.rst

+:orphan:
+
+=========
+pip-check
+=========
+
+Description
+***********
+
+.. pip-command-description:: check
+
+Usage
+*****
+
+.. pip-command-usage:: check
+
+Options
+*******
+
+.. pip-command-options:: check

docs/man/commands/config.rst

+:orphan:
+
+==========
+pip-config
+==========
+
+Description
+***********
+
+.. pip-command-description:: config
+
+Usage
+*****
+
+.. pip-command-usage:: config
+
+Options
+*******
+
+.. pip-command-options:: config

docs/man/commands/download.rst

+:orphan:
+
+============
+pip-download
+============
+
+Description
+***********
+
+.. pip-command-description:: download
+
+Usage
+*****
+
+.. pip-command-usage:: download
+
+Options
+*******
+
+.. pip-command-options:: download

docs/man/commands/freeze.rst

+:orphan:
+
+==========
+pip-freeze
+==========
+
+Description
+***********
+
+.. pip-command-description:: freeze
+
+Usage
+*****
+
+.. pip-command-usage:: freeze
+
+Options
+*******
+
+.. pip-command-options:: freeze

docs/man/commands/hash.rst

+:orphan:
+
+========
+pip-hash
+========
+
+Description
+***********
+
+.. pip-command-description:: hash
+
+Usage
+*****
+
+.. pip-command-usage:: hash
+
+Options
+*******
+
+.. pip-command-options:: hash