Merge pull request #560 from pypa/master

Merge master to bootstrap to deploy ez_setup.py to https://bootstrap.pypa.io/ez_setup.py

.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

@@ -1,56 +1,44 @@
-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
@@ -232,3 +220,41 @@ fbf06fa35f93a43f044b1645a7e4ff470edb462c 18.8.1
 cc41477ecf92f221c113736fac2830bf8079d40c 19.0
 834782ce49154e9744e499e00eb392c347f9e034 19.1
 0a2a3d89416e1642cf6f41d22dbc07b3d3c15a4d 19.1.1
+5d24cf9d1ced76c406ab3c4a94c25d1fe79b94bc 19.2
+66fa131a0d77a1b0e6f89ccb76b254cfb07d3da3 19.3b1
+32bba9bf8cce8350b560a7591c9ef5884a194211 19.3
+f47f3671508b015e9bb735603d3a0a6ec6a77b01 19.4
+0bda3291ac725750b899b4ba3e4b6765e7645daa 19.4.1
+0a68cbab72580a6f8d3bf9c45206669eefcd256b 19.5
+34121bf49b1a7ac77da7f7c75105c8a920218dd7 19.6b1
+3c2332e4ec72717bf17321473e5c3ad6e5778903 19.6
+35d9179d04390aada66eceae9ceb7b9274f67646 19.6.1
+d2782cbb2f15ca6831ab9426fbf8d4d6ca60db8a 19.6.2
+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

.travis.yml

@@ -6,6 +6,7 @@ python:
   - 3.4
   - 3.5
   - pypy
+  - pypy3
 env:
  - ""
  - LC_ALL=C LC_CTYPE=C
@@ -21,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