Merge with master to fix failing tests

.gitignore

@@ -8,7 +8,6 @@ distribute.egg-info
 setuptools.egg-info
 .coverage
 .tox
-CHANGES (links).txt
 *.egg
 *.py[cod]
 *.swp

.hgignore

@@ -8,7 +8,6 @@ distribute.egg-info
 setuptools.egg-info
 .coverage
 .tox
-CHANGES (links).txt
 *.egg
 *.py[cod]
 *.swp

.hgtags

-1010d08fd8dfd2f1496843b557b5369a0beba82a 0.6
-4d114c5f2a3ecb4a0fa552075dbbb221b19e291b 0.6.1
-41415244ee90664042d277d0b1f0f59c04ddd0e4 0.6.2
-e033bf2d3d05f4a7130f5f8f5de152c4db9ff32e 0.6.3
-e06c416e911c61771708f5afbf3f35db0e12ba71 0.6.4
-2df182df8a0224d429402de3cddccdb97af6ea21 0.6.5
-f1fb564d6d67a6340ff33df2f5a74b89753f159d 0.6.6
-71f08668d050589b92ecd164a4f5a91f3484313b 0.6.7
-445547a5729ed5517cf1a9baad595420a8831ef8 0.6.8
-669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
-669ed9388b17ec461380cc41760a9a7384fb5284 0.6.9
-ac7d9b14ac43fecb8b65de548b25773553facaee 0.6.9
-0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
-0fd5c506037880409308f2b79c6e901d21e7fe92 0.6.10
-f18396c6e1875476279d8bbffd8e6dadcc695136 0.6.10
-e00987890c0b386f09d0f6b73d8558b72f6367f1 0.6.11
-48a97bc89e2f65fc9b78b358d7dc89ba9ec9524a 0.6.12
-dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
-2b9d9977ea75b8eb3766bab808ef31f192d2b1bc 0.6.14
-51a9d1a1f31a4be3107d06cf088aff8e182dc633 0.6.15
-3f1ff138e947bfc1c9bcfe0037030b7bfb4ab3a5 0.6.16
-9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
-9c40f23d0bda3f3f169686e27a422f853fa4d0fa 0.6.17
-4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
-4bbc01e4709ea7425cf0c186bbaf1d928cfa2a65 0.6.17
-0502d5117d8304ab21084912758ed28812a5a8f1 0.6.17
-74108d7f07343556a8db94e8122221a43243f586 0.6.18
-611910892a0421633d72677979f94a25ef590d54 0.6.19
-a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
-c4a375336d552129aef174486018ed09c212d684 0.6.20
-de44acab3cfce1f5bc811d6c0fa1a88ca0e9533f 0.6.21
-1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
-1a1ab844f03e10528ae693ad3cb45064e08f49e5 0.6.23
-9406c5dac8429216f1a264e6f692fdc534476acd 0.6.23
-7fd7b6e30a0effa082baed1c4103a0efa56be98c 0.6.24
-6124053afb5c98f11e146ae62049b4c232d50dc5 0.6.25
-b69f072c000237435e17b8bbb304ba6f957283eb 0.6.26
-469c3b948e41ef28752b3cdf3c7fb9618355ebf5 0.6.27
-fc379e63586ad3c6838e1bda216548ba8270b8f0 0.6.28
-4f82563d0f5d1af1fb215c0ac87f38b16bb5c42d 0.6.29
-7464fc916fa4d8308e34e45a1198512fe04c97b4 0.6.30
-17bc972d67edd96c7748061910172e1200a73efe 0.6.31
-b1a7f86b315a1f8c20036d718d6dc641bb84cac6 0.6.32
-6acac3919ae9a7dba2cbecbe3d4b31ece25d5f09 0.6.33
-23c310bf4ae8e4616e37027f08891702f5a33bc9 0.6.34
-2abe1117543be0edbafb10c7c159d1bcb1cb1b87 0.6.35
-c813a29e831f266d427d4a4bce3da97f475a8eee 0.6.36
-be6f65eea9c10ce78b6698d8c220b6e5de577292 0.6.37
-2b26ec8909bff210f47c5f8fc620bc505e1610b5 0.6.37
-f0d502a83f6c83ba38ad21c15a849c2daf389ec7 0.6.38
-d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39
+7e9441311eb21dd1fbc32cfbad58168e46c5450e 0.6
+26f429772565f69d1f6d21adf57c3d8c40197129 0.6.1
+6f46749a7454be6e044a54cd73c51318b74bdee8 0.6.2
+34b80fb58862d18f8f957f98a883ed4a72d06f8e 0.6.3
+fb04abddb50d82a9005c9082c94d5eb983be1d79 0.6.4
+8ae0bd250b4a0d58cbaf16b4354ad60f73f24a01 0.6.5
+88847883dfed39829d3a5ed292ad540723ad31cc 0.6.6
+fcbef325349ada38f6c674eb92db82664cf6437c 0.6.7
+3af7f2b8270b9bb34fb65f08ee567bfe8e2a6a5a 0.6.8
+669725d03fd1e345ea47590e9b14cb19742b96a2 0.6.9
+eff3ca9c2d8d39e24c221816c52a37f964535336 0.6.10
+88710e34b91c98c9348749722cce3acd574d177d 0.6.11
+5ce754773a43ac21f7bd13872f45c75e27b593f8 0.6.12
+de36566d35e51bee7cfc86ffa694795e52f4147c 0.6.13
+e5f3f0ffe9e1a243d49a06f26c79dd160f521483 0.6.14
+dc03a300ec7a89ad773047172d43e52b34e7cd1e 0.6.15
+e620fb4ee8ba17debadb614fb583c6dfac229dea 0.6.16
+21df276275b5a47c6a994927d69ad3d90cf62b5d 0.6.17
+e9264ca4ba8c24239c36a8426a0394f7c7d5dd83 0.6.18
+aed31b1fa47ed1f39e55c75b76bbbdb80775b7f1 0.6.19
+c6e6273587816c3e486ef7739e53c864a0145251 0.6.20
+7afdf4c84a713fe151e6163ab25d45e8727ce653 0.6.21
+105066342777cd1319a95d7ae0271a2ea1ac33fe 0.6.23
+7b5ef4e6c80e82541dffb5a9a130d81550d5a835 0.6.24
+9c014a80f32e532371826ed1dc3236975f37f371 0.6.25
+ff8c4d6c8e5d2093750a58a3d43b76556570007c 0.6.26
+2a5c42ed097a195e398b97261c40cd66c8da8913 0.6.27
+4ed34b38851f90278cfe2bff75784f7e32883725 0.6.28
+acecfa2cfb6fca207dd2f4e025c695def3bb6b40 0.6.29
+e950f50addff150859f5990b9df2a33c691b6354 0.6.30
+06dae3faee2de50ff17b90719df410b2ebc5b71e 0.6.31
+1f4f79258ed5b418f680a55d3006f41aa6a56d2b 0.6.32
+89f57bf1406a5e745470af35446902c21ac9b6f6 0.6.33
+3c8f9fc13862124cf20ef2ff2140254fb272bb94 0.6.34
+7c3f8b9eb7cfa17481c835d5caaa918d337c7a83 0.6.35
+192094c0d1e2e5d2cb5c718f84a36c9de04b314b 0.6.36
+66d4e3b8899166e4c04189ee1831c649b7ff38bf 0.6.37
+398d58aa8bba33778c30ce72055a27d4b425809c 0.6.38
+f457fc2a3ebe609d8ca7a869eb65b7506ecf49ef 0.6.39
 9b2e2aa06e058c63e06c5e42a7f279ddae2dfb7d 0.7b1
-0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
+9089a40343981baa593b9bb5953f9088e9507099 0.6.40
 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
 8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2
@@ -246,3 +234,29 @@ c6e619ce910d1650cc2433f94e5594964085f973 19.7
 2a60daeff0cdb039b20b2058aaad7dae7bcd2c1c 20.0
 06c9d3ffae80d7f5786c0a454d040d253d47fc03 20.1
 919a40f1843131249f98104c73f3aee3fc835e67 20.1.1
+74c4ffbe1f399345eb4f6a64785cfff54f7e6e7e 20.2
+1aacb05fbdfe06cee904e7a138a4aa6df7b88a63 20.2.1
+48aa5271ef1cd5379cf91a1c958e490692b978e7 20.2.2
+9c55a3a1268a33b4a57b96b2b9fa2cd0701780ee 20.3
+3e87e975a95c780eec497ef9e5a742f7adfb77ec 20.3.1
+06692c64fb9b5843331a918ab7093f151412ec8e 20.4
+f8174392e9e9c6a21ea5df0f22cb4ca885c799ca 20.5
+114f3dbc8a73dacbce2ebe08bb70ca76ab18390e v20.6.0
+a3d4006688fe5e754d0e709a52a00b8191819979 v20.6.1
+2831509712601a78fddf46e51d6f41ae0f92bd0e v20.6.2
+8b46dc41cb234c435b950a879214a6dee54c9dd2 v20.6.3
+7258be20fe93bbf936dc1a81ce71c04c5880663e v20.6.4
+7e0ab283db4e6f780777f7f06af475f044631fa1 v20.6.5
+57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
+57d63b38e85515d06e06d3cea62e35e6c54b5093 v20.6.6
+b04dbdd161d7f68903a53e1dbd1fa5b5fde73f94 v20.6.6
+0804d30b6ead64e0e324aefd67439b84df2d1c01 v20.6.7
+a00910db03ec15865e4c8506820d4ad1df3e26f3 v20.6.8
+0262ab29fc2417b502a55f49b7fd43528fbd3df4 v20.7.0
+7f56b6f40de39456c78507a14c288709712881cb v20.8.0
+8cf9340669ae26e2b31f68b9c3f885ab7bdd65ce v20.8.1
+8bf8aaa139bb6a36fcd243214d6730a214ae08f5 v20.9.0
+c72faa468919fd2f226c97e94d4e64a6506860e5 v20.10.0
+3b5fdd077c7d83d02c4979ad69cc0bf199b47587 v20.10.1
+ddd3f81eb9e0860bf95c380c50a72c52a215231f v21.0.0
+018e4a727cf691d6404cd24ffb25e8eebea2fad4 v20.6.8

.travis.yml

@@ -7,9 +7,6 @@ python:
   - 3.5
   - pypy
   - pypy3
-matrix:
-  allow_failures:
-    - python: pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C
@@ -25,5 +22,16 @@ script:
 
  - python setup.py test --addopts='-rs'
 
- # test the bootstrap script
- - python ez_setup.py
+before_deploy:
+  - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
+deploy:
+  provider: pypi
+  on:
+    tags: true
+    all_branches: true
+    python: 3.5
+    condition: $LC_ALL != "C"
+  user: jaraco
+  password:
+    secure: tfWrsQMH2bHrWjqnP+08IX1WlkbW94Q30f4d7lCyhWS1FIf/jBDx4jrEILNfMxQ1NCwuBRje5sihj1Ow0BFf0vVrkaeff2IdvnNDEGFduMejaEQJL3s3QrLfpiAvUbtqwyWaHfAdGfk48PovDKTx0ZTvXZKYGXZhxGCYSlG2CE6Y6RDvnEl6Tk8e+LqUohkcSOwxrRwUoyxSnUaavdGohXxDT8MJlfWOXgr2u+KsRrriZqp3l6Fdsnk4IGvy6pXpy42L1HYQyyVu9XyJilR2JTbC6eCp5f8p26093m1Qas49+t6vYb0VLqQe12dO+Jm3v4uztSS5pPQzS7PFyjEYd2Rdb6ijsdbsy1074S4q7G9Sz+T3RsPUwYEJ07lzez8cxP64dtj5j94RL8m35A1Fb1OE8hHN+4c1yLG1gudfXbem+fUhi2eqhJrzQo5vsvDv1xS5x5GIS5ZHgKHCsWcW1Tv+dsFkrhaup3uU6VkOuc9UN+7VPsGEY7NvquGpTm8O1CnGJRzuJg6nbYRGj8ORwDpI0KmrExx6akV92P72fMC/I5TCgbSQSZn370H3Jj40gz1SM30WAli9M+wFHFd4ddMVY65yxj0NLmrP+m1tvnWdKtNh/RHuoW92d9/UFtiA5IhMf1/3djfsjBq6S9NT1uaLkVkTttqrPYJ7hOql8+g=
+  distributions: release

MANIFEST.in

@@ -2,11 +2,10 @@ recursive-include setuptools *.py *.exe *.xml
 recursive-include tests *.py
 recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
-recursive-include _markerlib *.py
 recursive-include setuptools/_vendor *
 recursive-include pkg_resources *.py *.txt
 include *.py
-include *.txt
+include *.rst
 include MANIFEST.in
 include launcher.c
 include msvc-build-launcher.cmd

Makefile

-empty:
-	exit 1
-
-update-vendored:
-	rm -rf pkg_resources/_vendor/packaging*
-	rm -rf pkg_resources/_vendor/six*
-	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
-	rm -rf pkg_resources/_vendor/*.{egg,dist}-info

README.txt → README.rst

@@ -18,7 +18,7 @@ basic routine, so below are some examples to get you started.
 
 Setuptools requires Python 2.6 or later. To install setuptools
 on Python 2.4 or Python 2.5, use the `bootstrap script for Setuptools 1.x
-<https://bitbucket.org/pypa/setuptools/raw/bootstrap-py24/ez_setup.py>`_.
+<https://raw.githubusercontent.com/pypa/setuptools/bootstrap-py24/ez_setup.py>`_.
 
 The link provided to ez_setup.py is a bookmark to bootstrap script for the
 latest known stable release.
@@ -176,7 +176,7 @@ them there, so this reference list can be updated.  If you have working,
 *tested* patches to correct problems or add features, you may submit them to
 the `setuptools bug tracker`_.
 
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/issues
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/issues
 .. _The Internal Structure of Python Eggs: https://pythonhosted.org/setuptools/formats.html
 .. _The setuptools Developer's Guide: https://pythonhosted.org/setuptools/setuptools.html
 .. _The pkg_resources API reference: https://pythonhosted.org/setuptools/pkg_resources.html

_markerlib/__init__.py

-try:
-    import ast
-    from _markerlib.markers import default_environment, compile, interpret
-except ImportError:
-    if 'ast' in globals():
-        raise
-    def default_environment():
-        return {}
-    def compile(marker):
-        def marker_fn(environment=None, override=None):
-            # 'empty markers are True' heuristic won't install extra deps.
-            return not marker.strip()
-        marker_fn.__doc__ = marker
-        return marker_fn
-    def interpret(marker, environment=None, override=None):
-        return compile(marker)()

_markerlib/markers.py

-# -*- coding: utf-8 -*-
-"""Interpret PEP 345 environment markers.
-
-EXPR [in|==|!=|not in] EXPR [or|and] ...
-
-where EXPR belongs to any of those:
-
-    python_version = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    python_full_version = sys.version.split()[0]
-    os.name = os.name
-    sys.platform = sys.platform
-    platform.version = platform.version()
-    platform.machine = platform.machine()
-    platform.python_implementation = platform.python_implementation()
-    a free string, like '2.6', or 'win32'
-"""
-
-__all__ = ['default_environment', 'compile', 'interpret']
-
-import ast
-import os
-import platform
-import sys
-import weakref
-
-_builtin_compile = compile
-
-try:
-    from platform import python_implementation
-except ImportError:
-    if os.name == "java":
-        # Jython 2.5 has ast module, but not platform.python_implementation() function.
-        def python_implementation():
-            return "Jython"
-    else:
-        raise
-
-
-# restricted set of variables
-_VARS = {'sys.platform': sys.platform,
-         'python_version': '%s.%s' % sys.version_info[:2],
-         # FIXME parsing sys.platform is not reliable, but there is no other
-         # way to get e.g. 2.7.2+, and the PEP is defined with sys.version
-         'python_full_version': sys.version.split(' ', 1)[0],
-         'os.name': os.name,
-         'platform.version': platform.version(),
-         'platform.machine': platform.machine(),
-         'platform.python_implementation': python_implementation(),
-         'extra': None # wheel extension
-        }
-
-for var in list(_VARS.keys()):
-    if '.' in var:
-        _VARS[var.replace('.', '_')] = _VARS[var]
-
-def default_environment():
-    """Return copy of default PEP 385 globals dictionary."""
-    return dict(_VARS)
-
-class ASTWhitelist(ast.NodeTransformer):
-    def __init__(self, statement):
-        self.statement = statement # for error messages
-
-    ALLOWED = (ast.Compare, ast.BoolOp, ast.Attribute, ast.Name, ast.Load, ast.Str)
-    # Bool operations
-    ALLOWED += (ast.And, ast.Or)
-    # Comparison operations
-    ALLOWED += (ast.Eq, ast.Gt, ast.GtE, ast.In, ast.Is, ast.IsNot, ast.Lt, ast.LtE, ast.NotEq, ast.NotIn)
-
-    def visit(self, node):
-        """Ensure statement only contains allowed nodes."""
-        if not isinstance(node, self.ALLOWED):
-            raise SyntaxError('Not allowed in environment markers.\n%s\n%s' %
-                               (self.statement,
-                               (' ' * node.col_offset) + '^'))
-        return ast.NodeTransformer.visit(self, node)
-
-    def visit_Attribute(self, node):
-        """Flatten one level of attribute access."""
-        new_node = ast.Name("%s.%s" % (node.value.id, node.attr), node.ctx)
-        return ast.copy_location(new_node, node)
-
-def parse_marker(marker):
-    tree = ast.parse(marker, mode='eval')
-    new_tree = ASTWhitelist(marker).generic_visit(tree)
-    return new_tree
-
-def compile_marker(parsed_marker):
-    return _builtin_compile(parsed_marker, '<environment marker>', 'eval',
-                   dont_inherit=True)
-
-_cache = weakref.WeakValueDictionary()
-
-def compile(marker):
-    """Return compiled marker as a function accepting an environment dict."""
-    try:
-        return _cache[marker]
-    except KeyError:
-        pass
-    if not marker.strip():
-        def marker_fn(environment=None, override=None):
-            """"""
-            return True
-    else:
-        compiled_marker = compile_marker(parse_marker(marker))
-        def marker_fn(environment=None, override=None):
-            """override updates environment"""
-            if override is None:
-                override = {}
-            if environment is None:
-                environment = default_environment()
-            environment.update(override)
-            return eval(compiled_marker, environment)
-    marker_fn.__doc__ = marker
-    _cache[marker] = marker_fn
-    return _cache[marker]
-
-def interpret(marker, environment=None):
-    return compile(marker)(environment)

docs/conf.py

@@ -200,56 +200,64 @@ latex_documents = [
 #latex_use_modindex = True
 
 link_files = {
-	'CHANGES.txt': dict(
-		using=dict(
-			BB='https://bitbucket.org',
-			GH='https://github.com',
-		),
-		replace=[
-			dict(
-				pattern=r"(Issue )?#(?P<issue>\d+)",
-				url='{BB}/pypa/setuptools/issue/{issue}',
-			),
-			dict(
-				pattern=r"Pull Request ?#(?P<pull_request>\d+)",
-				url='{BB}/pypa/setuptools/pull-request/{pull_request}',
-			),
-			dict(
-				pattern=r"Distribute #(?P<distribute>\d+)",
-				url='{BB}/tarek/distribute/issue/{distribute}',
-			),
-			dict(
-				pattern=r"Buildout #(?P<buildout>\d+)",
-				url='{GH}/buildout/buildout/issues/{buildout}',
-			),
-			dict(
-				pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
-				url='http://bugs.python.org/setuptools/issue{old_setuptools}',
-			),
-			dict(
-				pattern=r"Jython #(?P<jython>\d+)",
-				url='http://bugs.jython.org/issue{jython}',
-			),
-			dict(
-				pattern=r"Python #(?P<python>\d+)",
-				url='http://bugs.python.org/issue{python}',
-			),
-			dict(
-				pattern=r"Interop #(?P<interop>\d+)",
-				url='{GH}/pypa/interoperability-peps/issues/{interop}',
-			),
-			dict(
-				pattern=r"Pip #(?P<pip>\d+)",
-				url='{GH}/pypa/pip/issues/{pip}',
-			),
-			dict(
-				pattern=r"Packaging #(?P<packaging>\d+)",
-				url='{GH}/pypa/packaging/issues/{packaging}',
-			),
-			dict(
-				pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
-				url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
-			),
-		],
-	),
+    'CHANGES.rst': dict(
+        using=dict(
+            BB='https://bitbucket.org',
+            GH='https://github.com',
+        ),
+        replace=[
+            dict(
+                pattern=r"(Issue )?#(?P<issue>\d+)",
+                url='{GH}/pypa/setuptools/issues/{issue}',
+            ),
+            dict(
+                pattern=r"BB Pull Request ?#(?P<bb_pull_request>\d+)",
+                url='{BB}/pypa/setuptools/pull-request/{bb_pull_request}',
+            ),
+            dict(
+                pattern=r"Distribute #(?P<distribute>\d+)",
+                url='{BB}/tarek/distribute/issue/{distribute}',
+            ),
+            dict(
+                pattern=r"Buildout #(?P<buildout>\d+)",
+                url='{GH}/buildout/buildout/issues/{buildout}',
+            ),
+            dict(
+                pattern=r"Old Setuptools #(?P<old_setuptools>\d+)",
+                url='http://bugs.python.org/setuptools/issue{old_setuptools}',
+            ),
+            dict(
+                pattern=r"Jython #(?P<jython>\d+)",
+                url='http://bugs.jython.org/issue{jython}',
+            ),
+            dict(
+                pattern=r"Python #(?P<python>\d+)",
+                url='http://bugs.python.org/issue{python}',
+            ),
+            dict(
+                pattern=r"Interop #(?P<interop>\d+)",
+                url='{GH}/pypa/interoperability-peps/issues/{interop}',
+            ),
+            dict(
+                pattern=r"Pip #(?P<pip>\d+)",
+                url='{GH}/pypa/pip/issues/{pip}',
+            ),
+            dict(
+                pattern=r"Packaging #(?P<packaging>\d+)",
+                url='{GH}/pypa/packaging/issues/{packaging}',
+            ),
+            dict(
+                pattern=r"[Pp]ackaging (?P<packaging_ver>\d+(\.\d+)+)",
+                url='{GH}/pypa/packaging/blob/{packaging_ver}/CHANGELOG.rst',
+            ),
+            dict(
+                pattern=r"PEP[- ](?P<pep_number>\d+)",
+                url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+            ),
+            dict(
+                pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
+                with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
+            ),
+        ],
+    ),
 }

docs/developer-guide.txt

@@ -23,10 +23,10 @@ quality of contribution.
 Project Management
 ------------------
 
-Setuptools is maintained primarily in Bitbucket at `this home
-<https://bitbucket.org/pypa/setuptools>`_. Setuptools is maintained under the
+Setuptools is maintained primarily in Github at `this home
+<https://github.com/pypa/setuptools>`_. Setuptools is maintained under the
 Python Packaging Authority (PyPA) with several core contributors. All bugs
-for Setuptools are filed and the canonical source is maintained in Bitbucket.
+for Setuptools are filed and the canonical source is maintained in Github.
 
 User support and discussions are done through the issue tracker (for specific)
 issues, through the distutils-sig mailing list, or on IRC (Freenode) at
@@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a
 ticket already exists for your issue. If not, create one. Try to think from
 the perspective of the reader. Explain what behavior you expected, what you
 got instead, and what factors might have contributed to the unexpected
-behavior. In Bitbucket, surround a block of code or traceback with the triple
+behavior. In Github, surround a block of code or traceback with the triple
 backtick "\`\`\`" so that it is formatted nicely.
 
 Filing a ticket provides a forum for justification, discussion, and
@@ -61,17 +61,17 @@ jump to the in-depth discussion about any subject referenced.
 Source Code
 -----------
 
-Grab the code at Bitbucket::
+Grab the code at Github::
 
-    $ hg clone https://bitbucket.org/pypa/setuptools
+    $ git checkout https://github.com/pypa/setuptools
 
 If you want to contribute changes, we recommend you fork the repository on
-Bitbucket, commit the changes to your repository, and then make a pull request
-on Bitbucket. If you make some changes, don't forget to:
+Github, commit the changes to your repository, and then make a pull request
+on Github. If you make some changes, don't forget to:
 
-- add a note in CHANGES.txt
+- add a note in CHANGES.rst
 
-Please commit all changes in the 'default' branch against the latest available
+Please commit all changes in the 'master' branch against the latest available
 commit or for bug-fixes, against an earlier commit or release in which the
 bug occurred.
 
@@ -79,12 +79,11 @@ If you find yourself working on more than one issue at a time, Setuptools
 generally prefers Git-style branches, so use Mercurial bookmarks or Git
 branches or multiple forks to maintain separate efforts.
 
-Setuptools also maintains an unofficial `Git mirror in Github
-<https://github.com/jaraco/setuptools>`_. Contributors are welcome to submit
-pull requests here, but because they are not integrated with the Bitbucket
-Issue tracker, linking pull requests to tickets is more difficult. The
-Continuous Integration tests that validate every release are run from this
-mirror.
+The Continuous Integration tests that validate every release are run
+from this repository.
+
+For posterity, the old `Bitbucket mirror
+<https://bitbucket.org/pypa/setuptools>`_ is available.
 
 -------
 Testing
@@ -104,10 +103,7 @@ Under continuous integration, additional tests may be run. See the
 Semantic Versioning
 -------------------
 
-Setuptools follows ``semver`` with some exceptions:
-
-- Uses two-segment version when three segment version ends in zero
-- Omits 'v' prefix for tags.
+Setuptools follows ``semver``.
 
 .. explain value of reflecting meaning in versions.
 

docs/history.txt

@@ -5,4 +5,4 @@
 History
 *******
 
-.. include:: ../CHANGES (links).txt
+.. include:: ../CHANGES (links).rst

docs/pkg_resources.txt

@@ -590,20 +590,7 @@ Requirements Parsing
     parse multiple specifiers from a string or iterable of strings, use
     ``parse_requirements()`` instead.)
 
-    The syntax of a requirement specifier can be defined in EBNF as follows::
-
-        requirement  ::= project_name extras? versionspec?
-        versionspec  ::= comparison version (',' comparison version)*
-        comparison   ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '==='
-        extras       ::= '[' extralist? ']'
-        extralist    ::= identifier (',' identifier)*
-        project_name ::= identifier
-        identifier   ::= [-A-Za-z0-9_]+
-        version      ::= [-A-Za-z0-9_.]+
-
-    Tokens can be separated by whitespace, and a requirement can be continued
-    over multiple lines using a backslash (``\\``).  Line-end comments (using
-    ``#``) are also allowed.
+    The syntax of a requirement specifier is defined in full in PEP 508.
 
     Some examples of valid requirement specifiers::
 
@@ -611,6 +598,7 @@ Requirements Parsing
         Fizzy [foo, bar]
         PickyThing<1.6,>1.9,!=1.9.6,<2.0a0,==2.4c1
         SomethingWhoseVersionIDontCareAbout
+        SomethingWithMarker[foo]>1.0;python_version<"2.7"
 
     The project name is the only required portion of a requirement string, and
     if it's the only thing supplied, the requirement will accept any version
@@ -631,6 +619,11 @@ Requirements Parsing
     ``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary
     distributions to sys.path at runtime.
 
+    The "markers" in a requirement are used to specify when a requirement
+    should be installed -- the requirement will be installed if the marker
+    evaluates as true in the current environment. For example, specifying
+    ``argparse;python_version<"2.7"`` will not install in an Python 2.7 or 3.3
+    environment, but will in a Python 2.6 environment.
 
 ``Requirement`` Methods and Attributes
 --------------------------------------
@@ -680,6 +673,12 @@ Requirements Parsing
     order.  The `op` in each tuple is a comparison operator, represented as
     a string.  The `version` is the (unparsed) version number.
 
+``marker``
+    An instance of ``packaging.markers.Marker`` that allows evaluation
+    against the current environment. May be None if no marker specified.
+
+``url``
+    The location to download the requirement from if specified.
 
 Entry Points
 ============

docs/releases.txt

@@ -3,35 +3,27 @@ Release Process
 ===============
 
 In order to allow for rapid, predictable releases, Setuptools uses a
-mechanical technique for releases. The release script, ``release.py`` in the
-repository, defines the details of the releases, and is executed by the
-`jaraco.packaging <https://bitbucket.org/jaraco/jaraco.packaging>`_ release
-module. The script does some checks (some interactive) and fully automates
-the release process.
+mechanical technique for releases, enacted by Travis following a
+successful build of a tagged release per
+`PyPI deployment <https://docs.travis-ci.com/user/deployment/pypi>`_.
 
-A Setuptools release manager must have maintainer access on PyPI to the
-project and administrative access to the Bitbucket project.
+To cut a release, install and run ``bumpversion {part}`` where ``part``
+is major, minor, or patch based on the scope of the changes in the
+release. Then, push the commits to the master branch. If tests pass,
+the release will be uploaded to PyPI (from the Python 3.5 tests).
 
-To make a release, run the following from a Mercurial checkout at the
-revision slated for release::
-
-    python -m jaraco.packaging.release
-
-Bootstrap Bookmark
-------------------
+Bootstrap Branch
+----------------
 
-Setuptools has a bootstrap script (ez_setup.py) which is hosted in the
-repository and must be updated with each release (to bump the default version).
-The "published" version of the script is the one indicated by the ``bootstrap``
-bookmark (Mercurial) or branch (Git).
+Setuptools has a bootstrap script (ez_setup.py), which is hosted in the
+repository in the ``bootstrap`` branch.
 
-Therefore, the latest bootstrap script can be retrieved by checking out the
-repository at that bookmark. It's also possible to get the bootstrap script for
-any particular release by grabbing the script from that tagged release.
+Therefore, the latest bootstrap script can be retrieved by checking out
+that branch.
 
 The officially-published location of the bootstrap script is hosted on Python
 infrastructure (#python-infra on freenode) at https://bootstrap.pypa.io and
-is updated every fifteen minutes from the bootstrap script. Sometimes,
+is updated every fifteen minutes from the bootstrap branch. Sometimes,
 especially when the bootstrap script is rolled back, this
 process doesn't work as expected and requires manual intervention.
 
@@ -57,7 +49,5 @@ corrected quickly, in many cases before other users have yet to encounter them.
 Release Managers
 ----------------
 
-Jason R. Coombs is the primary release manager. Additionally, the following
-people have access to create releases:
-
-- Matthew Iversen (Ivoz)
+Additionally, anyone with push access to the master branch has access to cut
+releases.

docs/setuptools.txt

@@ -258,10 +258,9 @@ unless you need the associated ``setuptools`` feature.
 
 ``include_package_data``
     If set to ``True``, this tells ``setuptools`` to automatically include any
-    data files it finds inside your package directories, that are either under
-    CVS or Subversion control, or which are specified by your ``MANIFEST.in``
-    file.  For more information, see the section below on `Including Data
-    Files`_.
+    data files it finds inside your package directories that are specified by
+    your ``MANIFEST.in`` file.  For more information, see the section below on
+    `Including Data Files`_.
 
 ``exclude_package_data``
     A dictionary mapping package names to lists of glob patterns that should
@@ -785,17 +784,15 @@ e.g.::
     )
 
 This tells setuptools to install any data files it finds in your packages.
-The data files must be under CVS or Subversion control, or else they must be
-specified via the distutils' ``MANIFEST.in`` file.  (They can also be tracked
-by another revision control system, using an appropriate plugin.  See the
-section below on `Adding Support for Other Revision Control Systems`_ for
-information on how to write such plugins.)
-
-If the data files are not under version control, or are not in a supported
-version control system, or if you want finer-grained control over what files
-are included (for example, if you have documentation files in your package
-directories and want to exclude them from installation), then you can also use
-the ``package_data`` keyword, e.g.::
+The data files must be specified via the distutils' ``MANIFEST.in`` file.
+(They can also be tracked by a revision control system, using an appropriate
+plugin.  See the section below on `Adding Support for Revision Control
+Systems`_ for information on how to write such plugins.)
+
+If you want finer-grained control over what files are included (for example,
+if you have documentation files in your package directories and want to exclude
+them from installation), then you can also use the ``package_data`` keyword,
+e.g.::
 
     from setuptools import setup, find_packages
     setup(
@@ -853,8 +850,7 @@ converts slashes to appropriate platform-specific separators at build time.
 Python 2.4; there is `some documentation for the feature`__ available on the
 python.org website.  If using the setuptools-specific ``include_package_data``
 argument, files specified by ``package_data`` will *not* be automatically
-added to the manifest unless they are tracked by a supported version control
-system, or are listed in the MANIFEST.in file.)
+added to the manifest unless they are listed in the MANIFEST.in file.)
 
 __ http://docs.python.org/dist/node11.html
 
@@ -887,8 +883,7 @@ included as a result of using ``include_package_data``.
 In summary, the three options allow you to:
 
 ``include_package_data``
-    Accept all data files and directories matched by ``MANIFEST.in`` or found
-    in source control.
+    Accept all data files and directories matched by ``MANIFEST.in``.
 
 ``package_data``
     Specify additional patterns to match files and directories that may or may
@@ -1231,15 +1226,14 @@ Your Project's Dependencies
     target audience isn't able to compile packages (e.g. most Windows users)
     and your package or some of its dependencies include C code.
 
-Subversion or CVS Users and Co-Developers
+Revision Control System Users and Co-Developers
     Users and co-developers who are tracking your in-development code using
-    CVS, Subversion, or some other revision control system should probably read
-    this manual's sections regarding such development.  Alternately, you may
-    wish to create a quick-reference guide containing the tips from this manual
-    that apply to your particular situation.  For example, if you recommend
-    that people use ``setup.py develop`` when tracking your in-development
-    code, you should let them know that this needs to be run after every update
-    or commit.
+    a revision control system should probably read this manual's sections
+    regarding such development.  Alternately, you may wish to create a
+    quick-reference guide containing the tips from this manual that apply to
+    your particular situation.  For example, if you recommend that people use
+    ``setup.py develop`` when tracking your in-development code, you should let
+    them know that this needs to be run after every update or commit.
 
     Similarly, if you remove modules or data files from your project, you
     should remind them to run ``setup.py clean --all`` and delete any obsolete
@@ -1276,7 +1270,8 @@ Creating System Packages
 Setting the ``zip_safe`` flag
 -----------------------------
 
-For maximum performance, Python packages are best installed as zip files.
+For some use cases (such as bundling as part of a larger application), Python
+packages may be run directly from a zip file.
 Not all packages, however, are capable of running in compressed form, because
 they may expect to be able to access either source code or data files as
 normal operating system files.  So, ``setuptools`` can install your project
@@ -1468,18 +1463,11 @@ Generating Source Distributions
 -------------------------------
 
 ``setuptools`` enhances the distutils' default algorithm for source file
-selection, so that all files managed by CVS or Subversion in your project tree
-are included in any source distribution you build.  This is a big improvement
-over having to manually write a ``MANIFEST.in`` file and try to keep it in
-sync with your project.  So, if you are using CVS or Subversion, and your
-source distributions only need to include files that you're tracking in
-revision control, don't create a ``MANIFEST.in`` file for your project.
-(And, if you already have one, you might consider deleting it the next time
-you would otherwise have to change it.)
-
-(NOTE: other revision control systems besides CVS and Subversion can be
-supported using plugins; see the section below on `Adding Support for Other
-Revision Control Systems`_ for information on how to write such plugins.)
+selection with pluggable endpoints for looking up files to include. If you are
+using a revision control system, and your source distributions only need to
+include files that you're tracking in revision control, use a corresponding
+plugin instead of writing a ``MANIFEST.in`` file. See the section below on
+`Adding Support for Revision Control Systems`_ for information on plugins.
 
 If you need to include automatically generated files, or files that are kept in
 an unsupported revision control system, you'll need to create a ``MANIFEST.in``
@@ -1501,12 +1489,6 @@ the options that the distutils' more complex ``sdist`` process requires.  For
 all practical purposes, you'll probably use only the ``--formats`` option, if
 you use any option at all.
 
-(By the way, if you're using some other revision control system, you might
-consider creating and publishing a `revision control plugin for setuptools`_.)
-
-
-.. _revision control plugin for setuptools: `Adding Support for Other Revision Control Systems`_
-
 
 Making your package available for EasyInstall
 ---------------------------------------------
@@ -1687,9 +1669,10 @@ Of course, for this to work, your source distributions must include the C
 code generated by Pyrex, as well as your original ``.pyx`` files.  This means
 that you will probably want to include current ``.c`` files in your revision
 control system, rebuilding them whenever you check changes in for the ``.pyx``
-source files.  This will ensure that people tracking your project in CVS or
-Subversion will be able to build it even if they don't have Pyrex installed,
-and that your source releases will be similarly usable with or without Pyrex.
+source files.  This will ensure that people tracking your project in a revision
+control system will be able to build it even if they don't have Pyrex
+installed, and that your source releases will be similarly usable with or
+without Pyrex.
 
 
 -----------------
@@ -2569,15 +2552,21 @@ the ``cmd`` object's ``write_file()``, ``delete_file()``, and
 those methods' docstrings for more details.
 
 
-Adding Support for Other Revision Control Systems
+Adding Support for Revision Control Systems
 -------------------------------------------------
 
-If you would like to create a plugin for ``setuptools`` to find files in
-source control systems, you can do so by adding an
-entry point to the ``setuptools.file_finders`` group.  The entry point should
-be a function accepting a single directory name, and should yield
-all the filenames within that directory (and any subdirectories thereof) that
-are under revision control.
+If the files you want to include in the source distribution are tracked using
+Git, Mercurial or SVN, you can use the following packages to achieve that:
+
+- Git and Mercurial: `setuptools_scm <https://pypi.python.org/pypi/setuptools_scm>`_
+- SVN: `setuptools_svn <https://pypi.python.org/pypi/setuptools_svn>`_
+
+If you would like to create a plugin for ``setuptools`` to find files tracked
+by another revision control system, you can do so by adding an entry point to
+the ``setuptools.file_finders`` group.  The entry point should be a function
+accepting a single directory name, and should yield all the filenames within
+that directory (and any subdirectories thereof) that are under revision
+control.
 
 For example, if you were going to create a plugin for a revision control system
 called "foobar", you would write a function something like this:
@@ -2670,5 +2659,5 @@ confirmed via the list are actual bugs, and which you have reduced to a minimal
 set of steps to reproduce.
 
 .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-.. _setuptools bug tracker: https://bitbucket.org/pypa/setuptools/
+.. _setuptools bug tracker: https://github.com/pypa/setuptools/
 

pavement.py

+import re
+
+from paver.easy import task, path as Path
+import pip
+
+def remove_all(paths):
+    for path in paths:
+        path.rmtree() if path.isdir() else path.remove()
+
+@task
+def update_vendored():
+    vendor = Path('pkg_resources/_vendor')
+    remove_all(vendor.glob('packaging*'))
+    remove_all(vendor.glob('six*'))
+    remove_all(vendor.glob('pyparsing*'))
+    install_args = [
+        'install',
+        '-r', str(vendor/'vendored.txt'),
+        '-t', str(vendor),
+    ]
+    pip.main(install_args)
+    packaging = vendor / 'packaging'
+    for file in packaging.glob('*.py'):
+        text = file.text()
+        text = re.sub(r' (pyparsing|six)', r' pkg_resources.extern.\1', text)
+        file.write_text(text)
+    remove_all(vendor.glob('*.dist-info'))
+    remove_all(vendor.glob('*.egg-info'))

pkg_resources/_vendor/packaging/__about__.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 __all__ = [
@@ -22,10 +12,10 @@ __title__ = "packaging"
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "15.3"
+__version__ = "16.7"
 
-__author__ = "Donald Stufft"
+__author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"
 
-__license__ = "Apache License, Version 2.0"
-__copyright__ = "Copyright 2014 %s" % __author__
+__license__ = "BSD or Apache License, Version 2.0"
+__copyright__ = "Copyright 2014-2016 %s" % __author__

pkg_resources/_vendor/packaging/__init__.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 from .__about__ import (

pkg_resources/_vendor/packaging/_compat.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import sys

pkg_resources/_vendor/packaging/_structures.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 

pkg_resources/_vendor/packaging/markers.py

+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import operator
+import os
+import platform
+import sys
+
+from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd
+from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+
+from ._compat import string_types
+from .specifiers import Specifier, InvalidSpecifier
+
+
+__all__ = [
+    "InvalidMarker", "UndefinedComparison", "UndefinedEnvironmentName",
+    "Marker", "default_environment",
+]
+
+
+class InvalidMarker(ValueError):
+    """
+    An invalid marker was found, users should refer to PEP 508.
+    """
+
+
+class UndefinedComparison(ValueError):
+    """
+    An invalid operation was attempted on a value that doesn't support it.
+    """
+
+
+class UndefinedEnvironmentName(ValueError):
+    """
+    A name was attempted to be used that does not exist inside of the
+    environment.
+    """
+
+
+class Node(object):
+
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return "<{0}({1!r})>".format(self.__class__.__name__, str(self))
+
+
+class Variable(Node):
+    pass
+
+
+class Value(Node):
+    pass
+
+
+VARIABLE = (
+    L("implementation_version") |
+    L("platform_python_implementation") |
+    L("implementation_name") |
+    L("python_full_version") |
+    L("platform_release") |
+    L("platform_version") |
+    L("platform_machine") |
+    L("platform_system") |
+    L("python_version") |
+    L("sys_platform") |
+    L("os_name") |
+    L("os.name") |  # PEP-345
+    L("sys.platform") |  # PEP-345
+    L("platform.version") |  # PEP-345
+    L("platform.machine") |  # PEP-345
+    L("platform.python_implementation") |  # PEP-345
+    L("python_implementation") |  # undocumented setuptools legacy
+    L("extra")
+)
+ALIASES = {
+    'os.name': 'os_name',
+    'sys.platform': 'sys_platform',
+    'platform.version': 'platform_version',
+    'platform.machine': 'platform_machine',
+    'platform.python_implementation': 'platform_python_implementation',
+    'python_implementation': 'platform_python_implementation'
+}
+VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0])))
+
+VERSION_CMP = (
+    L("===") |
+    L("==") |
+    L(">=") |
+    L("<=") |
+    L("!=") |
+    L("~=") |
+    L(">") |
+    L("<")
+)
+
+MARKER_OP = VERSION_CMP | L("not in") | L("in")
+
+MARKER_VALUE = QuotedString("'") | QuotedString('"')
+MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0]))
+
+BOOLOP = L("and") | L("or")
+
+MARKER_VAR = VARIABLE | MARKER_VALUE
+
+MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR)
+MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0]))
+
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+
+MARKER_EXPR = Forward()
+MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN)
+MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR)
+
+MARKER = stringStart + MARKER_EXPR + stringEnd
+
+
+def _coerce_parse_result(results):
+    if isinstance(results, ParseResults):
+        return [_coerce_parse_result(i) for i in results]
+    else:
+        return results
+
+
+def _format_marker(marker, first=True):
+    assert isinstance(marker, (list, tuple, string_types))
+
+    # Sometimes we have a structure like [[...]] which is a single item list
+    # where the single item is itself it's own list. In that case we want skip
+    # the rest of this function so that we don't get extraneous () on the
+    # outside.
+    if (isinstance(marker, list) and len(marker) == 1 and
+            isinstance(marker[0], (list, tuple))):
+        return _format_marker(marker[0])
+
+    if isinstance(marker, list):
+        inner = (_format_marker(m, first=False) for m in marker)
+        if first:
+            return " ".join(inner)
+        else:
+            return "(" + " ".join(inner) + ")"
+    elif isinstance(marker, tuple):
+        return '{0} {1} "{2}"'.format(*marker)
+    else:
+        return marker
+
+
+_operators = {
+    "in": lambda lhs, rhs: lhs in rhs,
+    "not in": lambda lhs, rhs: lhs not in rhs,
+    "<": operator.lt,
+    "<=": operator.le,
+    "==": operator.eq,
+    "!=": operator.ne,
+    ">=": operator.ge,
+    ">": operator.gt,
+}
+
+
+def _eval_op(lhs, op, rhs):
+    try:
+        spec = Specifier("".join([op, rhs]))
+    except InvalidSpecifier:
+        pass
+    else:
+        return spec.contains(lhs)
+
+    oper = _operators.get(op)
+    if oper is None:
+        raise UndefinedComparison(
+            "Undefined {0!r} on {1!r} and {2!r}.".format(op, lhs, rhs)
+        )
+
+    return oper(lhs, rhs)
+
+
+_undefined = object()
+
+
+def _get_env(environment, name):
+    value = environment.get(name, _undefined)
+
+    if value is _undefined:
+        raise UndefinedEnvironmentName(
+            "{0!r} does not exist in evaluation environment.".format(name)
+        )
+
+    return value
+
+
+def _evaluate_markers(markers, environment):
+    groups = [[]]
+
+    for marker in markers:
+        assert isinstance(marker, (list, tuple, string_types))
+
+        if isinstance(marker, list):
+            groups[-1].append(_evaluate_markers(marker, environment))
+        elif isinstance(marker, tuple):
+            lhs, op, rhs = marker
+
+            if isinstance(lhs, Variable):
+                lhs_value = _get_env(environment, lhs.value)
+                rhs_value = rhs.value
+            else:
+                lhs_value = lhs.value
+                rhs_value = _get_env(environment, rhs.value)
+
+            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
+        else:
+            assert marker in ["and", "or"]
+            if marker == "or":
+                groups.append([])
+
+    return any(all(item) for item in groups)
+
+
+def format_full_version(info):
+    version = '{0.major}.{0.minor}.{0.micro}'.format(info)
+    kind = info.releaselevel
+    if kind != 'final':
+        version += kind[0] + str(info.serial)
+    return version
+
+
+def default_environment():
+    if hasattr(sys, 'implementation'):
+        iver = format_full_version(sys.implementation.version)
+        implementation_name = sys.implementation.name
+    else:
+        iver = '0'
+        implementation_name = ''
+
+    return {
+        "implementation_name": implementation_name,
+        "implementation_version": iver,
+        "os_name": os.name,
+        "platform_machine": platform.machine(),
+        "platform_release": platform.release(),
+        "platform_system": platform.system(),
+        "platform_version": platform.version(),
+        "python_full_version": platform.python_version(),
+        "platform_python_implementation": platform.python_implementation(),
+        "python_version": platform.python_version()[:3],
+        "sys_platform": sys.platform,
+    }
+
+
+class Marker(object):
+
+    def __init__(self, marker):
+        try:
+            self._markers = _coerce_parse_result(MARKER.parseString(marker))
+        except ParseException as e:
+            err_str = "Invalid marker: {0!r}, parse error at {1!r}".format(
+                marker, marker[e.loc:e.loc + 8])
+            raise InvalidMarker(err_str)
+
+    def __str__(self):
+        return _format_marker(self._markers)
+
+    def __repr__(self):
+        return "<Marker({0!r})>".format(str(self))
+
+    def evaluate(self, environment=None):
+        """Evaluate a marker.
+
+        Return the boolean from evaluating the given marker against the
+        environment. environment is an optional argument to override all or
+        part of the determined environment.
+
+        The environment is determined from the current Python process.
+        """
+        current_environment = default_environment()
+        if environment is not None:
+            current_environment.update(environment)
+
+        return _evaluate_markers(self._markers, current_environment)

pkg_resources/_vendor/packaging/requirements.py

+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import string
+import re
+
+from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
+from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
+from pkg_resources.extern.pyparsing import Literal as L  # noqa
+from pkg_resources.extern.six.moves.urllib import parse as urlparse
+
+from .markers import MARKER_EXPR, Marker
+from .specifiers import LegacySpecifier, Specifier, SpecifierSet
+
+
+class InvalidRequirement(ValueError):
+    """
+    An invalid requirement was found, users should refer to PEP 508.
+    """
+
+
+ALPHANUM = Word(string.ascii_letters + string.digits)
+
+LBRACKET = L("[").suppress()
+RBRACKET = L("]").suppress()
+LPAREN = L("(").suppress()
+RPAREN = L(")").suppress()
+COMMA = L(",").suppress()
+SEMICOLON = L(";").suppress()
+AT = L("@").suppress()
+
+PUNCTUATION = Word("-_.")
+IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM)
+IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END))
+
+NAME = IDENTIFIER("name")
+EXTRA = IDENTIFIER
+
+URI = Regex(r'[^ ]+')("url")
+URL = (AT + URI)
+
+EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA)
+EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras")
+
+VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE)
+VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE)
+
+VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY
+VERSION_MANY = Combine(VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE),
+                       joinString=",", adjacent=False)("_raw_spec")
+_VERSION_SPEC = Optional(((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY))
+_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or '')
+
+VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier")
+VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
+
+MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+MARKER_EXPR.setParseAction(
+    lambda s, l, t: Marker(s[t._original_start:t._original_end])
+)
+MARKER_SEPERATOR = SEMICOLON
+MARKER = MARKER_SEPERATOR + MARKER_EXPR
+
+VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER)
+URL_AND_MARKER = URL + Optional(MARKER)
+
+NAMED_REQUIREMENT = \
+    NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER)
+
+REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd
+
+
+class Requirement(object):
+    """Parse a requirement.
+
+    Parse a given requirement string into its parts, such as name, specifier,
+    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
+    string.
+    """
+
+    # TODO: Can we test whether something is contained within a requirement?
+    #       If so how do we do that? Do we need to test against the _name_ of
+    #       the thing as well as the version? What about the markers?
+    # TODO: Can we normalize the name and extra name?
+
+    def __init__(self, requirement_string):
+        try:
+            req = REQUIREMENT.parseString(requirement_string)
+        except ParseException as e:
+            raise InvalidRequirement(
+                "Invalid requirement, parse error at \"{0!r}\"".format(
+                    requirement_string[e.loc:e.loc + 8]))
+
+        self.name = req.name
+        if req.url:
+            parsed_url = urlparse.urlparse(req.url)
+            if not (parsed_url.scheme and parsed_url.netloc) or (
+                    not parsed_url.scheme and not parsed_url.netloc):
+                raise InvalidRequirement("Invalid URL given")
+            self.url = req.url
+        else:
+            self.url = None
+        self.extras = set(req.extras.asList() if req.extras else [])
+        self.specifier = SpecifierSet(req.specifier)
+        self.marker = req.marker if req.marker else None
+
+    def __str__(self):
+        parts = [self.name]
+
+        if self.extras:
+            parts.append("[{0}]".format(",".join(sorted(self.extras))))
+
+        if self.specifier:
+            parts.append(str(self.specifier))
+
+        if self.url:
+            parts.append("@ {0}".format(self.url))
+
+        if self.marker:
+            parts.append("; {0}".format(self.marker))
+
+        return "".join(parts)
+
+    def __repr__(self):
+        return "<Requirement({0!r})>".format(str(self))

pkg_resources/_vendor/packaging/specifiers.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import abc
@@ -204,8 +194,8 @@ class _IndividualSpecifier(BaseSpecifier):
                 # If our version is a prerelease, and we were not set to allow
                 # prereleases, then we'll store it for later incase nothing
                 # else matches this specifier.
-                if (parsed_version.is_prerelease
-                        and not (prereleases or self.prereleases)):
+                if (parsed_version.is_prerelease and not
+                        (prereleases or self.prereleases)):
                     found_prereleases.append(version)
                 # Either this is not a prerelease, or we should have been
                 # accepting prereleases from the begining.
@@ -223,23 +213,23 @@ class _IndividualSpecifier(BaseSpecifier):
 
 class LegacySpecifier(_IndividualSpecifier):
 
-    _regex = re.compile(
+    _regex_str = (
         r"""
-        ^
-        \s*
         (?P<operator>(==|!=|<=|>=|<|>))
         \s*
         (?P<version>
-            [^\s]* # We just match everything, except for whitespace since this
-                   # is a "legacy" specifier and the version string can be just
-                   # about anything.
+            [^,;\s)]* # Since this is a "legacy" specifier, and the version
+                      # string can be just about anything, we match everything
+                      # except for whitespace, a semi-colon for marker support,
+                      # a closing paren since versions can be enclosed in
+                      # them, and a comma since it's a version separator.
         )
-        \s*
-        $
-        """,
-        re.VERBOSE | re.IGNORECASE,
+        """
     )
 
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
     _operators = {
         "==": "equal",
         "!=": "not_equal",
@@ -284,10 +274,8 @@ def _require_version_compare(fn):
 
 class Specifier(_IndividualSpecifier):
 
-    _regex = re.compile(
+    _regex_str = (
         r"""
-        ^
-        \s*
         (?P<operator>(~=|==|!=|<=|>=|<|>|===))
         (?P<version>
             (?:
@@ -378,12 +366,12 @@ class Specifier(_IndividualSpecifier):
                 (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
             )
         )
-        \s*
-        $
-        """,
-        re.VERBOSE | re.IGNORECASE,
+        """
     )
 
+    _regex = re.compile(
+        r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE)
+
     _operators = {
         "~=": "compatible",
         "==": "equal",
@@ -409,8 +397,8 @@ class Specifier(_IndividualSpecifier):
         prefix = ".".join(
             list(
                 itertools.takewhile(
-                    lambda x: (not x.startswith("post")
-                               and not x.startswith("dev")),
+                    lambda x: (not x.startswith("post") and not
+                               x.startswith("dev")),
                     _version_split(spec),
                 )
             )[:-1]
@@ -419,13 +407,15 @@ class Specifier(_IndividualSpecifier):
         # Add the prefix notation to the end of our string
         prefix += ".*"
 
-        return (self._get_operator(">=")(prospective, spec)
-                and self._get_operator("==")(prospective, prefix))
+        return (self._get_operator(">=")(prospective, spec) and
+                self._get_operator("==")(prospective, prefix))
 
     @_require_version_compare
     def _compare_equal(self, prospective, spec):
         # We need special logic to handle prefix matching
         if spec.endswith(".*"):
+            # In the case of prefix matching we want to ignore local segment.
+            prospective = Version(prospective.public)
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
             spec = _version_split(spec[:-2])  # Remove the trailing .*
@@ -577,8 +567,8 @@ def _pad_version(left, right):
     right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
 
     # Get the rest of our versions
-    left_split.append(left[len(left_split):])
-    right_split.append(left[len(right_split):])
+    left_split.append(left[len(left_split[0]):])
+    right_split.append(right[len(right_split[0]):])
 
     # Insert our padding
     left_split.insert(

pkg_resources/_vendor/packaging/utils.py

+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
+from __future__ import absolute_import, division, print_function
+
+import re
+
+
+_canonicalize_regex = re.compile(r"[-_.]+")
+
+
+def canonicalize_name(name):
+    # This is taken from PEP 503.
+    return _canonicalize_regex.sub("-", name).lower()

pkg_resources/_vendor/packaging/version.py

-# Copyright 2014 Donald Stufft
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# This file is dual licensed under the terms of the Apache License, Version
+# 2.0, and the BSD License. See the LICENSE file in the root of this repository
+# for complete details.
 from __future__ import absolute_import, division, print_function
 
 import collections

pkg_resources/_vendor/vendored.txt

-packaging==15.3
+packaging==16.7
+pyparsing==2.0.6
 six==1.10.0

pkg_resources/api_tests.txt

@@ -338,88 +338,64 @@ Environment Markers
     >>> import os
 
     >>> print(im("sys_platform"))
-    Comparison or logical expression expected
+    Invalid marker: 'sys_platform', parse error at ''
 
     >>> print(im("sys_platform=="))
-    invalid syntax
+    Invalid marker: 'sys_platform==', parse error at ''
 
     >>> print(im("sys_platform=='win32'"))
     False
 
     >>> print(im("sys=='x'"))
-    Unknown name 'sys'
+    Invalid marker: "sys=='x'", parse error at "sys=='x'"
 
     >>> print(im("(extra)"))
-    Comparison or logical expression expected
+    Invalid marker: '(extra)', parse error at ')'
 
     >>> print(im("(extra"))
-    invalid syntax
+    Invalid marker: '(extra', parse error at ''
 
     >>> print(im("os.open('foo')=='y'"))
-    Language feature not supported in environment markers
+    Invalid marker: "os.open('foo')=='y'", parse error at 'os.open('
 
     >>> print(im("'x'=='y' and os.open('foo')=='y'"))   # no short-circuit!
-    Language feature not supported in environment markers
+    Invalid marker: "'x'=='y' and os.open('foo')=='y'", parse error at 'and os.o'
 
     >>> print(im("'x'=='x' or os.open('foo')=='y'"))   # no short-circuit!
-    Language feature not supported in environment markers
+    Invalid marker: "'x'=='x' or os.open('foo')=='y'", parse error at 'or os.op'
 
     >>> print(im("'x' < 'y' < 'z'"))
-    Chained comparison not allowed in environment markers
+    Invalid marker: "'x' < 'y' < 'z'", parse error at "< 'z'"
 
     >>> print(im("r'x'=='x'"))
-    Only plain strings allowed in environment markers
+    Invalid marker: "r'x'=='x'", parse error at "r'x'=='x"
 
     >>> print(im("'''x'''=='x'"))
-    Only plain strings allowed in environment markers
+    Invalid marker: "'''x'''=='x'", parse error at "'x'''=='"
 
     >>> print(im('"""x"""=="x"'))
-    Only plain strings allowed in environment markers
+    Invalid marker: '"""x"""=="x"', parse error at '"x"""=="'
 
-    >>> print(im(r"'x\n'=='x'"))
-    Only plain strings allowed in environment markers
+    >>> print(im(r"x\n=='x'"))
+    Invalid marker: "x\\n=='x'", parse error at "x\\n=='x'"
 
     >>> print(im("os.open=='y'"))
-    Language feature not supported in environment markers
-
-    >>> em('"x"=="x"')
-    True
-
-    >>> em('"x"=="y"')
-    False
-
-    >>> em('"x"=="y" and "x"=="x"')
-    False
-
-    >>> em('"x"=="y" or "x"=="x"')
-    True
-
-    >>> em('"x"=="y" and "x"=="q" or "z"=="z"')
-    True
-
-    >>> em('"x"=="y" and ("x"=="q" or "z"=="z")')
-    False
-
-    >>> em('"x"=="y" and "z"=="z" or "x"=="q"')
-    False
-
-    >>> em('"x"=="x" and "z"=="z" or "x"=="q"')
-    True
+    Invalid marker: "os.open=='y'", parse error at 'os.open='
 
     >>> em("sys_platform=='win32'") == (sys.platform=='win32')
     True
 
-    >>> em("'x' in 'yx'")
-    True
-
-    >>> em("'yx' in 'x'")
-    False
-
     >>> em("python_version >= '2.6'")
     True
 
     >>> em("python_version > '2.5'")
     True
 
+    >>> im("implementation_name=='cpython'")
+    False
+
     >>> im("platform_python_implementation=='CPython'")
     False
+
+    >>> im("implementation_version=='3.5.1'")
+    False

pkg_resources/extern/__init__.py

@@ -67,5 +67,5 @@ class VendorImporter:
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 
-names = 'packaging', 'six'
+names = 'packaging', 'pyparsing', 'six'
 VendorImporter(__name__, names).install()

pkg_resources/tests/test_markers.py

 try:
-	import unittest.mock as mock
+    import unittest.mock as mock
 except ImportError:
-	import mock
+    import mock
 
 from pkg_resources import evaluate_marker
 
-
-@mock.patch.dict('pkg_resources.MarkerEvaluation.values',
-	python_full_version=mock.Mock(return_value='2.7.10'))
-def test_lexicographic_ordering():
-	"""
-	Although one might like 2.7.10 to be greater than 2.7.3,
-	the marker spec only supports lexicographic ordering.
-	"""
-	assert evaluate_marker("python_full_version > '2.7.3'") is False
+@mock.patch('platform.python_version', return_value='2.7.10')
+def test_ordering(python_version_mock):
+    assert evaluate_marker("python_full_version > '2.7.3'") is True

pytest.ini

 [pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py
 norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern

release.py

-"""
-Setuptools is released using 'jaraco.packaging.release'. To make a release,
-install jaraco.packaging and run 'python -m jaraco.packaging.release'
-"""
-
-import os
-
-import pkg_resources
-
-pkg_resources.require('jaraco.packaging>=2.0')
-pkg_resources.require('wheel')
-
-files_with_versions = 'setuptools/version.py',
-
-# bdist_wheel must be included or pip will break
-dist_commands = 'sdist', 'bdist_wheel'
-
-test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"
-
-os.environ["SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES"] = "1"

setup.cfg

+[bumpversion]
+current_version = 21.0.0
+commit = True
+tag = True
+
 [egg_info]
-tag_build = dev
+tag_build = .post
+tag_date = 1
 
 [aliases]
-release = egg_info -RDb ''
+clean_egg_info = egg_info -RDb ''
+release = clean_egg_info sdist bdist_wheel build_sphinx
 source = register sdist binary
 binary = bdist_egg upload --show-response
 test = pytest
@@ -19,4 +26,7 @@ upload-dir = docs/build/html
 formats = gztar zip
 
 [wheel]
-universal=1
+universal = 1
+
+[bumpversion:file:setup.py]
+

setup.py

@@ -22,11 +22,6 @@ with open(init_path) as init_file:
 
 SETUP_COMMANDS = command_ns['__all__']
 
-main_ns = {}
-ver_path = convert_path('setuptools/version.py')
-with open(ver_path) as ver_file:
-    exec(ver_file.read(), main_ns)
-
 import setuptools
 
 scripts = []
@@ -48,7 +43,7 @@ def _gen_console_scripts():
 
 console_scripts = list(_gen_console_scripts())
 
-readme_file = io.open('README.txt', encoding='utf-8')
+readme_file = io.open('README.rst', encoding='utf-8')
 
 with readme_file:
     long_description = readme_file.read()
@@ -66,19 +61,21 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
 
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
+needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv)
+sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
+needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
+wheel = ['wheel'] if needs_wheel else []
 
 setup_params = dict(
     name="setuptools",
-    version=main_ns['__version__'],
+    version="21.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
                 "Python packages",
     author="Python Packaging Authority",
     author_email="distutils-sig@python.org",
     long_description=long_description,
     keywords="CPAN PyPI distutils eggs package management",
-    url="https://bitbucket.org/pypa/setuptools",
+    url="https://github.com/pypa/setuptools",
     src_root=src_root,
     packages=setuptools.find_packages(exclude=['*.tests']),
     package_data=package_data,
@@ -149,10 +146,10 @@ setup_params = dict(
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2015.11.20",
+        "certs": "certifi==2016.2.28",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts=[],
@@ -161,7 +158,7 @@ setup_params = dict(
         'pytest>=2.8',
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
-    ] + sphinx + pytest_runner,
+    ] + sphinx + pytest_runner + wheel,
 )
 
 if __name__ == '__main__':

setuptools/command/easy_install.py

@@ -710,10 +710,7 @@ class easy_install(Command):
         elif requirement is None or dist not in requirement:
             # if we wound up with a different version, resolve what we've got
             distreq = dist.as_requirement()
-            requirement = requirement or distreq
-            requirement = Requirement(
-                distreq.project_name, distreq.specs, requirement.extras
-            )
+            requirement = Requirement(str(distreq))
         log.info("Processing dependencies for %s", requirement)
         try:
             distros = WorkingSet([]).resolve(
@@ -783,7 +780,7 @@ class easy_install(Command):
         There are a couple of template scripts in the package. This
         function loads one of them and prepares it for use.
         """
-        # See https://bitbucket.org/pypa/setuptools/issue/134 for info
+        # See https://github.com/pypa/setuptools/issues/134 for info
         # on script file naming and downstream issues with SVR4
         name = 'script.tmpl'
         if dev_path:
@@ -1239,17 +1236,14 @@ class easy_install(Command):
 
         sitepy = os.path.join(self.install_dir, "site.py")
         source = resource_string("setuptools", "site-patch.py")
+        source = source.decode('utf-8')
         current = ""
 
         if os.path.exists(sitepy):
             log.debug("Checking existing site.py in %s", self.install_dir)
-            f = open(sitepy, 'rb')
-            current = f.read()
-            # we want str, not bytes
-            if six.PY3:
-                current = current.decode()
+            with io.open(sitepy) as strm:
+                current = strm.read()
 
-            f.close()
             if not current.startswith('def __boot():'):
                 raise DistutilsError(
                     "%s is not a setuptools-generated site.py; please"
@@ -1260,9 +1254,8 @@ class easy_install(Command):
             log.info("Creating %s", sitepy)
             if not self.dry_run:
                 ensure_directory(sitepy)
-                f = open(sitepy, 'wb')
-                f.write(source)
-                f.close()
+                with io.open(sitepy, 'w', encoding='utf-8') as strm:
+                    strm.write(source)
             self.byte_compile([sitepy])
 
         self.sitepy_installed = True
@@ -1769,7 +1762,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
         #  * Does not support the dict.pop() method, forcing us to use the
         #    get/del patterns instead. For more detailed information see the
         #    following links:
-        #      https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+        #      https://github.com/pypa/setuptools/issues/202#issuecomment-202913420
         #      https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
         old_entry = cache[p]
         del cache[p]

setuptools/command/egg_info.py

@@ -13,6 +13,7 @@ import sys
 import io
 import warnings
 import time
+import collections
 
 from setuptools.extern import six
 from setuptools.extern.six.moves import map
@@ -66,14 +67,20 @@ class egg_info(Command):
         self.vtags = None
 
     def save_version_info(self, filename):
-        values = dict(
-            egg_info=dict(
-                tag_svn_revision=0,
-                tag_date=0,
-                tag_build=self.tags(),
-            )
-        )
-        edit_config(filename, values)
+        """
+        Materialize the values of svn_revision and date into the
+        build tag. Install these keys in a deterministic order
+        to avoid arbitrary reordering on subsequent builds.
+        """
+        # python 2.6 compatibility
+        odict = getattr(collections, 'OrderedDict', dict)
+        egg_info = odict()
+        # follow the order these keys would have been added
+        # when PYTHONHASHSEED=0
+        egg_info['tag_build'] = self.tags()
+        egg_info['tag_date'] = 0
+        egg_info['tag_svn_revision'] = 0
+        edit_config(filename, dict(egg_info=egg_info))
 
     def finalize_options(self):
         self.egg_name = safe_name(self.distribution.get_name())

setuptools/command/install.py

@@ -8,7 +8,7 @@ import distutils.command.install as orig
 import setuptools
 
 # Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
-# now. See https://bitbucket.org/pypa/setuptools/issue/199/
+# now. See https://github.com/pypa/setuptools/issues/199/
 _install = orig.install
 
 

setuptools/command/rotate.py

@@ -2,6 +2,7 @@ from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
 import os
+import shutil
 
 from setuptools.extern import six
 
@@ -59,4 +60,7 @@ class rotate(Command):
             for (t, f) in files:
                 log.info("Deleting %s", f)
                 if not self.dry_run:
-                    os.unlink(f)
+                    if os.path.isdir(f):
+                        shutil.rmtree(f)
+                    else:
+                        os.unlink(f)

setuptools/command/upload.py

+import getpass
 from distutils.command import upload as orig
 
 
 class upload(orig.upload):
     """
-    Override default upload behavior to look up password
-    in the keyring if available.
+    Override default upload behavior to obtain password
+    in a variety of different ways.
     """
 
     def finalize_options(self):
         orig.upload.finalize_options(self)
-        self.password or self._load_password_from_keyring()
+        # Attempt to obtain password. Short circuit evaluation at the first
+        # sign of success.
+        self.password = (
+            self.password or
+            self._load_password_from_keyring() or
+            self._prompt_for_password()
+        )
 
     def _load_password_from_keyring(self):
         """
@@ -17,7 +24,15 @@ class upload(orig.upload):
         """
         try:
             keyring = __import__('keyring')
-            self.password = keyring.get_password(self.repository,
-                self.username)
+            return keyring.get_password(self.repository, self.username)
         except Exception:
             pass
+
+    def _prompt_for_password(self):
+        """
+        Prompt for a password on the tty. Suppress Exceptions.
+        """
+        try:
+            return getpass.getpass()
+        except (Exception, KeyboardInterrupt):
+            pass

setuptools/dist.py

@@ -720,7 +720,7 @@ class Feature:
     """
     **deprecated** -- The `Feature` facility was never completely implemented
     or supported, `has reported issues
-    <https://bitbucket.org/pypa/setuptools/issue/58>`_ and will be removed in
+    <https://github.com/pypa/setuptools/issues/58>`_ and will be removed in
     a future version.
 
     A subset of the distribution that can be excluded if unneeded/wanted
@@ -777,7 +777,7 @@ class Feature:
     def warn_deprecated():
         warnings.warn(
             "Features are deprecated and will be removed in a future "
-                "version. See http://bitbucket.org/pypa/setuptools/65.",
+                "version. See https://github.com/pypa/setuptools/issues/65.",
             DeprecationWarning,
             stacklevel=3,
         )

setuptools/launch.py

@@ -11,25 +11,25 @@ import sys
 
 
 def run():
-	"""
-	Run the script in sys.argv[1] as if it had
-	been invoked naturally.
-	"""
-	__builtins__
-	script_name = sys.argv[1]
-	namespace = dict(
-		__file__ = script_name,
-		__name__ = '__main__',
-		__doc__ = None,
-	)
-	sys.argv[:] = sys.argv[1:]
+    """
+    Run the script in sys.argv[1] as if it had
+    been invoked naturally.
+    """
+    __builtins__
+    script_name = sys.argv[1]
+    namespace = dict(
+        __file__ = script_name,
+        __name__ = '__main__',
+        __doc__ = None,
+    )
+    sys.argv[:] = sys.argv[1:]
 
-	open_ = getattr(tokenize, 'open', open)
-	script = open_(script_name).read()
-	norm_script = script.replace('\\r\\n', '\\n')
-	code = compile(norm_script, script_name, 'exec')
-	exec(code, namespace)
+    open_ = getattr(tokenize, 'open', open)
+    script = open_(script_name).read()
+    norm_script = script.replace('\\r\\n', '\\n')
+    code = compile(norm_script, script_name, 'exec')
+    exec(code, namespace)
 
 
 if __name__ == '__main__':
-	run()
+    run()

setuptools/py26compat.py

@@ -5,18 +5,18 @@ Compatibility Support for Python 2.6 and earlier
 import sys
 
 try:
-	from urllib.parse import splittag
+    from urllib.parse import splittag
 except ImportError:
-	from urllib import splittag
+    from urllib import splittag
 
 def strip_fragment(url):
-	"""
-	In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
-	later was patched to disregard the fragment when making URL requests.
-	Do the same for Python 2.6 and earlier.
-	"""
-	url, fragment = splittag(url)
-	return url
+    """
+    In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and
+    later was patched to disregard the fragment when making URL requests.
+    Do the same for Python 2.6 and earlier.
+    """
+    url, fragment = splittag(url)
+    return url
 
 if sys.version_info >= (2,7):
-	strip_fragment = lambda x: x
+    strip_fragment = lambda x: x

setuptools/py27compat.py

@@ -5,11 +5,11 @@ Compatibility Support for Python 2.7 and earlier
 import sys
 
 def get_all_headers(message, key):
-	"""
-	Given an HTTPMessage, return all headers matching a given key.
-	"""
-	return message.get_all(key)
+    """
+    Given an HTTPMessage, return all headers matching a given key.
+    """
+    return message.get_all(key)
 
 if sys.version_info < (3,):
-	def get_all_headers(message, key):
-		return message.getheaders(key)
+    def get_all_headers(message, key):
+        return message.getheaders(key)

setuptools/tests/py26compat.py

@@ -3,10 +3,10 @@ import tarfile
 import contextlib
 
 def _tarfile_open_ex(*args, **kwargs):
-	"""
-	Extend result as a context manager.
-	"""
-	return contextlib.closing(tarfile.open(*args, **kwargs))
+    """
+    Extend result as a context manager.
+    """
+    return contextlib.closing(tarfile.open(*args, **kwargs))
 
 if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 2):
     tarfile_open = _tarfile_open_ex

setuptools/tests/test_dist_info.py

@@ -28,14 +28,15 @@ class TestDistInfo:
         assert versioned.version == '2.718' # from filename
         assert unversioned.version == '0.3' # from METADATA
 
-    @pytest.mark.importorskip('ast')
     def test_conditional_dependencies(self):
         specs = 'splort==4', 'quux>=1.1'
         requires = list(map(pkg_resources.Requirement.parse, specs))
 
         for d in pkg_resources.find_distributions(self.tmpdir):
             assert d.requires() == requires[:1]
-            assert d.requires(extras=('baz',)) == requires
+            assert d.requires(extras=('baz',)) == [
+                requires[0],
+                pkg_resources.Requirement.parse('quux>=1.1;extra=="baz"')]
             assert d.extras == ['baz']
 
     metadata_template = DALS("""

setuptools/tests/test_easy_install.py

@@ -16,7 +16,6 @@ import itertools
 import distutils.errors
 import io
 
-from setuptools.extern import six
 from setuptools.extern.six.moves import urllib
 import time
 
@@ -38,7 +37,7 @@ import setuptools.tests.server
 import pkg_resources
 
 from .py26compat import tarfile_open
-from . import contexts, is_ascii
+from . import contexts
 from .textwrap import DALS
 
 
@@ -59,17 +58,13 @@ SETUP_PY = DALS("""
 
 class TestEasyInstallTest:
 
-    def test_install_site_py(self):
+    def test_install_site_py(self, tmpdir):
         dist = Distribution()
         cmd = ei.easy_install(dist)
         cmd.sitepy_installed = False
-        cmd.install_dir = tempfile.mkdtemp()
-        try:
-            cmd.install_site_py()
-            sitepy = os.path.join(cmd.install_dir, 'site.py')
-            assert os.path.exists(sitepy)
-        finally:
-            shutil.rmtree(cmd.install_dir)
+        cmd.install_dir = str(tmpdir)
+        cmd.install_site_py()
+        assert (tmpdir / 'site.py').exists()
 
     def test_get_script_args(self):
         header = ei.CommandSpec.best().from_environment().as_header()

setuptools/tests/test_egg_info.py

 import os
+import glob
+import re
 import stat
+import sys
 
+from setuptools.command.egg_info import egg_info
+from setuptools.dist import Distribution
 from setuptools.extern.six.moves import map
 
 import pytest
@@ -58,6 +63,79 @@ class TestEggInfo(object):
             })
             yield env
 
+    def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env):
+        """
+        When the egg_info section is empty or not present, running
+        save_version_info should add the settings to the setup.cfg
+        in a deterministic order, consistent with the ordering found
+        on Python 2.6 and 2.7 with PYTHONHASHSEED=0.
+        """
+        setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
+        dist = Distribution()
+        ei = egg_info(dist)
+        ei.initialize_options()
+        ei.save_version_info(setup_cfg)
+
+        with open(setup_cfg, 'r') as f:
+            content = f.read()
+
+        assert '[egg_info]' in content
+        assert 'tag_build =' in content
+        assert 'tag_date = 0' in content
+        assert 'tag_svn_revision = 0' in content
+
+        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+
+        self._validate_content_order(content, expected_order)
+
+    @staticmethod
+    def _validate_content_order(content, expected):
+        """
+        Assert that the strings in expected appear in content
+        in order.
+        """
+        if sys.version_info < (2, 7):
+            # On Python 2.6, expect dict key order.
+            expected = dict.fromkeys(expected).keys()
+
+        pattern = '.*'.join(expected)
+        flags = re.MULTILINE | re.DOTALL
+        assert re.search(pattern, content, flags)
+
+    def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env):
+        """
+        When running save_version_info on an existing setup.cfg
+        with the 'default' values present from a previous run,
+        the file should remain unchanged, except on Python 2.6,
+        where the order of the keys will be changed to match the
+        order as found in a dictionary of those keys.
+        """
+        setup_cfg = os.path.join(env.paths['home'], 'setup.cfg')
+        build_files({
+            setup_cfg: DALS("""
+            [egg_info]
+            tag_build =
+            tag_date = 0
+            tag_svn_revision = 0
+            """),
+        })
+        dist = Distribution()
+        ei = egg_info(dist)
+        ei.initialize_options()
+        ei.save_version_info(setup_cfg)
+
+        with open(setup_cfg, 'r') as f:
+            content = f.read()
+
+        assert '[egg_info]' in content
+        assert 'tag_build =' in content
+        assert 'tag_date = 0' in content
+        assert 'tag_svn_revision = 0' in content
+
+        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+
+        self._validate_content_order(content, expected_order)
+
     def test_egg_base_installed_egg_info(self, tmpdir_cwd, env):
         self._create_project()
 
@@ -89,17 +167,61 @@ class TestEggInfo(object):
         sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt')
         assert 'docs/usage.rst' in open(sources_txt).read().split('\n')
 
-    def _run_install_command(self, tmpdir_cwd, env):
+    def _setup_script_with_requires(self, requires_line):
+        setup_script = DALS("""
+            from setuptools import setup
+
+            setup(
+                name='foo',
+                %s
+                zip_safe=False,
+            )
+            """ % requires_line)
+        build_files({
+            'setup.py': setup_script,
+            })
+
+    def test_install_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """install_requires=["barbazquux;python_version<'2'"],""")
+        self._run_install_command(tmpdir_cwd, env)
+        egg_info_dir = self._find_egg_info_files(env.paths['lib']).base
+        requires_txt = os.path.join(egg_info_dir, 'requires.txt')
+        assert "barbazquux;python_version<'2'" in open(
+            requires_txt).read().split('\n')
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_setup_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """setup_requires=["barbazquux;python_version<'2'"],""")
+        self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_tests_require_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """tests_require=["barbazquux;python_version<'2'"],""")
+        self._run_install_command(
+            tmpdir_cwd, env, cmd=['test'], output="Ran 0 tests in")
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def test_extra_requires_with_markers(self, tmpdir_cwd, env):
+        self._setup_script_with_requires(
+            """extra_requires={":python_version<'2'": ["barbazquux"]},""")
+        self._run_install_command(tmpdir_cwd, env)
+        assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
+
+    def _run_install_command(self, tmpdir_cwd, env, cmd=None, output=None):
         environ = os.environ.copy().update(
             HOME=env.paths['home'],
         )
-        cmd = [
-            'install',
-            '--home', env.paths['home'],
-            '--install-lib', env.paths['lib'],
-            '--install-scripts', env.paths['scripts'],
-            '--install-data', env.paths['data'],
-        ]
+        if cmd is None:
+            cmd = [
+                'install',
+                '--home', env.paths['home'],
+                '--install-lib', env.paths['lib'],
+                '--install-scripts', env.paths['scripts'],
+                '--install-data', env.paths['data'],
+            ]
         code, data = environment.run_setup_py(
             cmd=cmd,
             pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]),
@@ -108,6 +230,8 @@ class TestEggInfo(object):
         )
         if code:
             raise AssertionError(data)
+        if output:
+            assert output in data
 
     def _find_egg_info_files(self, root):
         class DirList(list):

setuptools/tests/test_markerlib.py

-import os
-
-import pytest
-
-
-class TestMarkerlib:
-
-    @pytest.mark.importorskip('ast')
-    def test_markers(self):
-        from _markerlib import interpret, default_environment, compile
-
-        os_name = os.name
-
-        assert interpret("")
-
-        assert interpret("os.name != 'buuuu'")
-        assert interpret("os_name != 'buuuu'")
-        assert interpret("python_version > '1.0'")
-        assert interpret("python_version < '5.0'")
-        assert interpret("python_version <= '5.0'")
-        assert interpret("python_version >= '1.0'")
-        assert interpret("'%s' in os.name" % os_name)
-        assert interpret("'%s' in os_name" % os_name)
-        assert interpret("'buuuu' not in os.name")
-
-        assert not interpret("os.name == 'buuuu'")
-        assert not interpret("os_name == 'buuuu'")
-        assert not interpret("python_version < '1.0'")
-        assert not interpret("python_version > '5.0'")
-        assert not interpret("python_version >= '5.0'")
-        assert not interpret("python_version <= '1.0'")
-        assert not interpret("'%s' not in os.name" % os_name)
-        assert not interpret("'buuuu' in os.name and python_version >= '5.0'")
-        assert not interpret("'buuuu' in os_name and python_version >= '5.0'")
-
-        environment = default_environment()
-        environment['extra'] = 'test'
-        assert interpret("extra == 'test'", environment)
-        assert not interpret("extra == 'doc'", environment)
-
-        def raises_nameError():
-            try:
-                interpret("python.version == '42'")
-            except NameError:
-                pass
-            else:
-                raise Exception("Expected NameError")
-
-        raises_nameError()
-
-        def raises_syntaxError():
-            try:
-                interpret("(x for x in (4,))")
-            except SyntaxError:
-                pass
-            else:
-                raise Exception("Expected SyntaxError")
-
-        raises_syntaxError()
-
-        statement = "python_version == '5'"
-        assert compile(statement).__doc__ == statement
-

setuptools/version.py

-__version__ = '20.1.2'
+import pkg_resources
+
+try:
+    __version__ = pkg_resources.require('setuptools')[0].version
+except Exception:
+    __version__ = 'unknown'

tests/manual_test.py

@@ -43,10 +43,8 @@ PYVER = sys.version.split()[0][:3]
 _VARS = {'base': '.',
          'py_version_short': PYVER}
 
-if sys.platform == 'win32':
-    PURELIB = INSTALL_SCHEMES['nt']['purelib']
-else:
-    PURELIB = INSTALL_SCHEMES['unix_prefix']['purelib']
+scheme = 'nt' if sys.platform == 'win32' else 'unix_prefix'
+PURELIB = INSTALL_SCHEMES[scheme]['purelib']
 
 
 @tempdir