Hello community,
here is the log from the commit of package python3-setuptools for
openSUSE:Factory checked in at 2015-02-18 11:37:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old)
and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setuptools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes
2015-01-30 11:00:05.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes
2015-02-18 11:38:00.000000000 +0100
@@ -1,0 +2,18 @@
+Tue Feb 17 20:20:46 UTC 2015 - [email protected]
+
+- update to version 12.2:
+ * Issue #345: Unload all modules under pkg_resources during
+ "ez_setup.use_setuptools()".
+ * Issue #336: Removed deprecation from "ez_setup.use_setuptools",
+ as it is clearly still used by buildout's bootstrap. "ez_setup"
+ remains deprecated for use by individual packages.
+ * Simplified implementation of "ez_setup.use_setuptools".
+
+-------------------------------------------------------------------
+Sat Feb 14 17:09:08 UTC 2015 - [email protected]
+
+- update to version 12.1:
+* Pull Request #118: Soften warning for non-normalized versions in
+ Distribution.
+
+-------------------------------------------------------------------
Old:
----
setuptools-12.0.5.tar.gz
New:
----
setuptools-12.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools.spec ++++++
--- /var/tmp/diff_new_pack.T9IJpp/_old 2015-02-18 11:38:01.000000000 +0100
+++ /var/tmp/diff_new_pack.T9IJpp/_new 2015-02-18 11:38:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-setuptools
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python3-setuptools
-Version: 12.0.5
+Version: 12.2
Release: 0
Url: http://pypi.python.org/pypi/setuptools
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
++++++ setuptools-12.0.5.tar.gz -> setuptools-12.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/.gitignore
new/setuptools-12.2/.gitignore
--- old/setuptools-12.0.5/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/.gitignore 2015-02-16 14:57:31.000000000 +0100
@@ -0,0 +1,16 @@
+# syntax: glob
+bin
+build
+dist
+include
+lib
+distribute.egg-info
+setuptools.egg-info
+.coverage
+.tox
+CHANGES (links).txt
+*.egg
+*.py[cod]
+*.swp
+*~
+.hg*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/.hgignore
new/setuptools-12.2/.hgignore
--- old/setuptools-12.0.5/.hgignore 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/.hgignore 2015-02-16 14:57:31.000000000 +0100
@@ -0,0 +1,16 @@
+syntax: glob
+bin
+build
+dist
+include
+lib
+distribute.egg-info
+setuptools.egg-info
+.coverage
+.tox
+CHANGES (links).txt
+*.egg
+*.py[cod]
+*.swp
+*~
+.git*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/.hgtags new/setuptools-12.2/.hgtags
--- old/setuptools-12.0.5/.hgtags 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/.hgtags 2015-02-16 16:24:29.000000000 +0100
@@ -0,0 +1,195 @@
+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
+9b2e2aa06e058c63e06c5e42a7f279ddae2dfb7d 0.7b1
+0a783fa0dceb95b5fc743e47c2d89c1523d0afb7 0.6.40
+ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41
+f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
+8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2
+35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
+63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
+73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
+53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
+ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
+7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
+024dd30ed702135f5328975042566e48cc479d7d 0.7.1
+d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
+d212e48e0cef689acba57ed017289c027660b23c 0.7.3
+74c6c12268059986f9cc0b535399594f1d131201 0.8b1
+85640475dda0621f20e11db0995fa07f51744a98 0.7.4
+b57e5ba934767dd498669b17551678081b3047b5 0.6.46
+dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
+512744f3f306aea0fdde4cfd600af8b2d6e773e7 0.8b2
+8af9839a76407eebf3610fcd3e7973f1625abaa2 0.8b3
+ee2c967017024197b38e39ced852808265387a4b 0.6.47
+48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
+5b3c7981a02b4a86af1b10ae16492899b515d485 0.8b4
+cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
+1506fa538fff01e70424530a32a44e070720cf3c 0.7.7
+5679393794978a1d3e1e087472b8a0fdf3d8423c 0.8b5
+26f59ec0f0f69714d28a891aaad048e3b9fcd6f7 0.8b6
+f657df1f1ed46596d236376649c99a470662b4ba 0.6.49
+236de1de68b14230036147c7c9e7c09b215b53ee 0.7.8
+979d598822bc64b05fb177a2ba221e75ee5b44d3 0.8b7
+e3d70539e79f39a97f69674ab038661961a1eb43 0.8
+3078b1e566399bf0c5590f3528df03d0c23a0777 0.9
+9e5a8f734662dd36e6fd6e4ba9031d0e2d294632 0.9.1
+37444bb32e172aaacbc0aeafdf5a778ee471723d 0.9.2
+3e9d2e89de3aa499382d6be2ec8b64d2a29f7f13 0.9.3
+1aef141fc968113e4c521d1edf6ea863c4ff7e00 0.9.4
+88e3d6788facbb2dd6467a23c4f35529a5ce20a1 0.9.5
+acc6c5d61d0f82040c237ac7ea010c0fc9e67d66 0.9.6
+19965a03c1d5231c894e0fabfaf45af1fd99f484 0.9.7
+e0a6e225ad6b28471cd42cfede6e8a334bb548fb 0.9.8
+7b91ff93a30ef78634b7bb34f4a6229a5de281ee 1.0b1
+aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2
+8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3
+c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0
+d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1
+2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1
+462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2
+ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3
+f94c7e4fa03077e069c1c3cef93ead735559e706 1.1.4
+d9bb58331007ee3f69d31983a180f56b15c731c3 1.1.5
+5e426bdeb46b87e299422adc419f4163b6c78d13 1.1.6
+cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7
+4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1
+77921bbe3931caf40474dc36e55d3d541981c749 1.2
+19873119647deae8a68e9ed683317b9ee170a8d8 1.3
+a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1
+076b472a9e3f840021e9d5509878337e6e5fcd89 1.3.2
+0d1bdb99a535a2c7ed4edd37141fb0b54348b713 1.4b1
+a13f8c18ce742bc83c794b9eea57980cb94ae18a 1.4
+9a5f26d7df8ef779cb5f40cc0389343fb4c61365 1.4.1
+274cb3beba4f22d5f461b0578b6d56e171d94f2e 1.4.2
+0bb1df93c2eaa50e95ccfce18208b0cca20ebae3 2.0
+bbdba51e1bc1779728ed351529252f73543ace65 2.0.1
+5a62ac60ba31d249db1cfcff31d85ca26421be6d 2.0.2
+c49c651997ebec3b40b71139e8a6a6a15c62c848 2.1
+b5be6c2b828cb92d27f52fccc725ce86a37e9ce0 2.1.1
+ab1c2a26e06f2a2006e8e867e4d41ccf1d6cf9b2 2.2b1
+caab085e829f29679d0e47430b2761af6b20fc76 2.1.2
+39f7ef5ef22183f3eba9e05a46068e1d9fd877b0 2.2
+faba785e9b9e05ba890d0851ef1f3287c32fcac2 3.0b1
+8e8c50925f18eafb7e66fe020aa91a85b9a4b122 3.0
+cd9e857476ac70515f7436f846b593f696ac672d 3.0.1
+bad1f30ee0dfa7a2af4f428d06f62efa39ca48db 3.0.2
+47224d55ddc6bb08c1d17a219f124d0d9c524491 3.1
+07c459bea1c58ff52e0576fc29c1865d18a83b09 3.2
+b306e681a945406833fb297ae10241e2241fc22b 3.3
+78c8cfbe3e1017d1653c48f7306b2c4b4911bf1a 4.0b1
+5cb90066d98700e6d37a01d95c4a2090e730ae02 3.4
+e39de2d3eb774b70c023a1151758213cc9ed2178 3.4.1
+369f6f90f69683702cc0b72827ccf949977808b0 3.4.2
+06a56e063c327b0606f9e9690764279d424646b2 3.4.3
+0917d575d26091a184796624743825914994bf95 3.4.4
+98f29d521c3a57bae0090d2bc5597d93db95b108 3.5
+254d8c625f4620993ce2d2b21212ba01cf307fe6 3.5.1
+572201d08eadc59210f6f0f28f9dc79f906672d3 3.5.2
+e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6
+292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1
+49bd27eebf212c067392796bb2d0fa6d8e583586 3.7
+2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8
+9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1
+40744de29b848f0e88139ba91d645c08a56855e9 3.8.1
+84d936fd18a93d16c46e68ee2e39f5733f3cd863 5.0
+871bd7b4326f48860ebe0baccdaea8fe4f8f8583 5.0.1
+95996b713722376679c3168b15ab12ea8360dd5f 5.0.2
+3a948b6d01e3449b478fcdc532c44eb3cea5ee10 5.1
+f493e6c4ffd88951871110858c141385305e0077 5.2
+1f9505cfd7524ce0c83ab31d139f47b39c56ccbe 5.3
+baae103e80c307008b156e426a07eb9f486eb4f0 5.4
+ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1
+7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2
+68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5
+949a66af4f03521e1404deda940aa951418a13d2 5.5.1
+a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6
+37ed55fd310d0cd32009dc5676121e86b404a23d 5.7
+67550a8ed9f4ef49ee5a31f433adbf5a0eaeccf9 5.8
+755cbfd3743ffb186cdf7e20be8e61dbdaa22503 6.0
+bc6655b4acf205dd9f25c702955645656077398a 6.0.1
+1ae2a75724bbba56373784f185a7f235ed0f24a4 6.0.2b1
+01271e84e5125fcc4f0f368a6e21116a5722953c 6.0.2
+7ea80190d494a766c6356fce85c844703964b6cc 6.1
+df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
+850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1
+7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
+1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1
+d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
+1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
+6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
+2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
+3f87370b6863e5a4e831b394ef1a58e0e97a4336 8.1
+995f6d9651312cd481ca1e5ddb271cbdd0474c57 8.2
+efbe39dae0aba9a7db399f6442758ae94e315c93 8.2.1
+cd14b2a72e51c7d13873ab6c2041f901b1a7a1cd 8.3
+0eee586a153f068142c1a0df4bc2635ed2c1a1cc 9.0b1
+921e60a0f9067311571fde9ccf2f35223159d9f6 8.4
+0d7b9b63d06ab7f68bc8edd56cb2034e6395d7fc 9.0
+fa069bf2411a150c9379d31a04d1c3836e2d3027 9.0.1
+3ed27d68d3f41bb5daa2afecfa9180d5958fe9d3 9.1
+0c4d18a747a6d39bff8e194a58af949a960d674a 10.0
+4c41e2cdd70beb0da556d71f46a67734c14f2bc2 10.0.1
+26b00011ec65b8f7b4f3d51078ec0a694701a45c 10.1
+651d41db58849d4fc50e466f4dc458d448480c4e 10.2
+1f5de53c079d577ead9d80265c9e006503b16457 10.2.1
+b4b92805bc0e9802da0b597d00df4fa42b30bc40 11.0
+6cd2b18f4be2a9c188fa505b34505b32f4a4554b 11.1
+feb5971e7827483bbdeb67613126bb79ed09e6d9 11.2
+a1a6a1ac9113b90009052ca7263174a488434099 11.3
+1116e568f534ad8f4f41328a0f5fa183eb739c90 11.3.1
+55666947c9eb7e3ba78081ad6ae004807c84aede 12.0
+747018b2e35a40cb4b1c444f150f013d02197c64 12.0.1
+a177ea34bf81662b904fe3af46f3c8719a947ef1 12.0.2
+bf8c5bcacd49bf0f9648013a40ebfc8f7c727f7b 12.0.3
+73dcfc90e3eecec6baddea19302c6b342e68e2fa 12.0.4
+01fbfc9194a2bc502edd682eebbf4d2f1bc79eee 12.0.5
+7bca8938434839dbb546b8bfccd9aab7a86d851e 12.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/.travis.yml
new/setuptools-12.2/.travis.yml
--- old/setuptools-12.0.5/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/.travis.yml 2015-02-16 14:57:31.000000000 +0100
@@ -0,0 +1,15 @@
+language: python
+python:
+ - 2.6
+ - 2.7
+ - 3.2
+ - 3.3
+ - 3.4
+ - pypy
+# command to run tests
+script:
+ # update egg_info based on setup.py in checkout
+ - python bootstrap.py
+
+ - python setup.py ptr --addopts='-rs'
+ - python ez_setup.py --version 10.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/CHANGES.txt
new/setuptools-12.2/CHANGES.txt
--- old/setuptools-12.0.5/CHANGES.txt 2015-01-26 14:32:57.000000000 +0100
+++ new/setuptools-12.2/CHANGES.txt 2015-02-16 16:19:03.000000000 +0100
@@ -2,11 +2,30 @@
CHANGES
=======
+----
+12.2
+----
+
+* Issue #345: Unload all modules under pkg_resources during
+ ``ez_setup.use_setuptools()``.
+* Issue #336: Removed deprecation from ``ez_setup.use_setuptools``,
+ as it is clearly still used by buildout's bootstrap. ``ez_setup``
+ remains deprecated for use by individual packages.
+* Simplified implementation of ``ez_setup.use_setuptools``.
+
+----
+12.1
+----
+
+* Pull Request #118: Soften warning for non-normalized versions in
+ Distribution.
+
------
12.0.5
------
* Issue #339: Correct Attribute reference in ``cant_write_to_target``.
+* Issue #336: Deprecated ``ez_setup.use_setuptools``.
------
12.0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/Makefile
new/setuptools-12.2/Makefile
--- old/setuptools-12.0.5/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/Makefile 2015-02-16 14:57:31.000000000 +0100
@@ -0,0 +1,7 @@
+empty:
+ exit 1
+
+update-vendored:
+ rm -rf setuptools/_vendor/packaging
+ pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
+ rm -rf setuptools/_vendor/*.{egg,dist}-info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/PKG-INFO
new/setuptools-12.2/PKG-INFO
--- old/setuptools-12.0.5/PKG-INFO 2015-01-26 14:35:10.000000000 +0100
+++ new/setuptools-12.2/PKG-INFO 2015-02-16 16:24:39.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 12.0.5
+Version: 12.2
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/ez_setup.py
new/setuptools-12.2/ez_setup.py
--- old/setuptools-12.0.5/ez_setup.py 2015-01-22 16:26:13.000000000 +0100
+++ new/setuptools-12.2/ez_setup.py 2015-02-16 16:10:44.000000000 +0100
@@ -30,7 +30,7 @@
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "12.0.5"
+DEFAULT_VERSION = "12.2"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/";
@@ -134,44 +134,66 @@
version=DEFAULT_VERSION, download_base=DEFAULT_URL,
to_dir=os.curdir, download_delay=15):
"""
- *deprecated* Download, install, and import Setuptools.
+ Ensure that a setuptools version is installed.
- Return None.
+ Return None. Raise SystemExit if the requested version
+ or later cannot be installed.
"""
- warnings.warn(
- "`use_setuptools` is deprecated. To enforce a specific "
- "version of setuptools, use `pkg_resources.require`.",
- DeprecationWarning,
- )
to_dir = os.path.abspath(to_dir)
+
+ # prior to importing, capture the module state for
+ # representative modules.
rep_modules = 'pkg_resources', 'setuptools'
imported = set(sys.modules).intersection(rep_modules)
- conflict_tmpl = textwrap.dedent("""
- The required version of setuptools (>={version}) is not available,
- and can't be installed while this script is running. Please
- install a more recent version first, using
- 'easy_install -U setuptools'.
- (Currently using {VC_err.args[0]!r})
- """)
try:
import pkg_resources
- except ImportError:
- return _do_download(version, download_base, to_dir, download_delay)
- try:
pkg_resources.require("setuptools>=" + version)
+ # a suitable version is already installed
return
+ except ImportError:
+ # pkg_resources not available; setuptools is not installed; download
+ pass
except pkg_resources.DistributionNotFound:
- return _do_download(version, download_base, to_dir, download_delay)
+ # no version of setuptools was found; allow download
+ pass
except pkg_resources.VersionConflict as VC_err:
if imported:
- msg = conflict_tmpl.format(VC_err=VC_err, version=version)
- sys.stderr.write(msg)
- sys.exit(2)
-
- # otherwise, reload ok
- del pkg_resources, sys.modules['pkg_resources']
- return _do_download(version, download_base, to_dir, download_delay)
+ _conflict_bail(VC_err, version)
+
+ # otherwise, unload pkg_resources to allow the downloaded version to
+ # take precedence.
+ del pkg_resources
+ _unload_pkg_resources()
+
+ return _do_download(version, download_base, to_dir, download_delay)
+
+
+def _conflict_bail(VC_err, version):
+ """
+ Setuptools was imported prior to invocation, so it is
+ unsafe to unload it. Bail out.
+ """
+ conflict_tmpl = textwrap.dedent("""
+ The required version of setuptools (>={version}) is not available,
+ and can't be installed while this script is running. Please
+ install a more recent version first, using
+ 'easy_install -U setuptools'.
+
+ (Currently using {VC_err.args[0]!r})
+ """)
+ msg = conflict_tmpl.format(**locals())
+ sys.stderr.write(msg)
+ sys.exit(2)
+
+
+def _unload_pkg_resources():
+ del_modules = [
+ name for name in sys.modules
+ if name.startswith('pkg_resources')
+ ]
+ for mod_name in del_modules:
+ del sys.modules[mod_name]
def _clean_check(cmd, target):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/pkg_resources/__init__.py
new/setuptools-12.2/pkg_resources/__init__.py
--- old/setuptools-12.0.5/pkg_resources/__init__.py 2015-01-21
14:18:33.000000000 +0100
+++ new/setuptools-12.2/pkg_resources/__init__.py 2015-02-16
14:57:32.000000000 +0100
@@ -182,8 +182,10 @@
"You have iterated over the result of "
"pkg_resources.parse_version. This is a legacy behavior which is "
"inconsistent with the new version class introduced in setuptools "
- "8.0. That class should be used directly instead of attempting to "
- "iterate over the result.",
+ "8.0. In most cases, conversion to a tuple is unnecessary. For "
+ "comparison of versions, sort the Version instances directly. If "
+ "you have another use case requiring the tuple, please file a "
+ "bug with the setuptools project describing that need.",
RuntimeWarning,
stacklevel=1,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools/dist.py
new/setuptools-12.2/setuptools/dist.py
--- old/setuptools-12.0.5/setuptools/dist.py 2015-01-21 14:18:34.000000000
+0100
+++ new/setuptools-12.2/setuptools/dist.py 2015-02-16 14:57:33.000000000
+0100
@@ -277,10 +277,9 @@
normalized_version = str(ver)
if self.metadata.version != normalized_version:
warnings.warn(
- "The version specified requires normalization, "
- "consider using '%s' instead of '%s'." % (
- normalized_version,
+ "Normalizing '%s' to '%s'" % (
self.metadata.version,
+ normalized_version,
)
)
self.metadata.version = normalized_version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools/sandbox.py
new/setuptools-12.2/setuptools/sandbox.py
--- old/setuptools-12.0.5/setuptools/sandbox.py 2015-01-21 14:18:34.000000000
+0100
+++ new/setuptools-12.2/setuptools/sandbox.py 2015-02-16 14:57:33.000000000
+0100
@@ -47,8 +47,10 @@
@contextlib.contextmanager
-def save_argv():
+def save_argv(repl=None):
saved = sys.argv[:]
+ if repl is not None:
+ sys.argv[:] = repl
try:
yield saved
finally:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools/tests/contexts.py
new/setuptools-12.2/setuptools/tests/contexts.py
--- old/setuptools-12.0.5/setuptools/tests/contexts.py 2015-01-21
14:18:34.000000000 +0100
+++ new/setuptools-12.2/setuptools/tests/contexts.py 2015-02-16
14:57:33.000000000 +0100
@@ -49,14 +49,6 @@
@contextlib.contextmanager
-def argv(repl):
- old_argv = sys.argv[:]
- sys.argv[:] = repl
- yield
- sys.argv[:] = old_argv
-
-
[email protected]
def quiet():
"""
Redirect stdout/stderr to StringIO objects to prevent console output from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools-12.0.5/setuptools/tests/test_easy_install.py
new/setuptools-12.2/setuptools/tests/test_easy_install.py
--- old/setuptools-12.0.5/setuptools/tests/test_easy_install.py 2015-01-26
14:31:14.000000000 +0100
+++ new/setuptools-12.2/setuptools/tests/test_easy_install.py 2015-02-16
14:57:33.000000000 +0100
@@ -312,7 +312,7 @@
'--install-dir', temp_install_dir,
dist_file,
]
- with contexts.argv(['easy_install']):
+ with sandbox.save_argv(['easy_install']):
# attempt to install the dist. It should fail
because
# it doesn't exist.
with pytest.raises(SystemExit):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools/version.py
new/setuptools-12.2/setuptools/version.py
--- old/setuptools-12.0.5/setuptools/version.py 2015-01-21 14:18:58.000000000
+0100
+++ new/setuptools-12.2/setuptools/version.py 2015-02-16 14:57:33.000000000
+0100
@@ -1 +1 @@
-__version__ = '12.0.5'
+__version__ = '12.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools.egg-info/PKG-INFO
new/setuptools-12.2/setuptools.egg-info/PKG-INFO
--- old/setuptools-12.0.5/setuptools.egg-info/PKG-INFO 2015-01-26
14:35:08.000000000 +0100
+++ new/setuptools-12.2/setuptools.egg-info/PKG-INFO 2015-02-16
16:24:34.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: setuptools
-Version: 12.0.5
+Version: 12.2
Summary: Easily download, build, install, upgrade, and uninstall Python
packages
Home-page: https://bitbucket.org/pypa/setuptools
Author: Python Packaging Authority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/setuptools.egg-info/SOURCES.txt
new/setuptools-12.2/setuptools.egg-info/SOURCES.txt
--- old/setuptools-12.0.5/setuptools.egg-info/SOURCES.txt 2015-01-26
14:35:10.000000000 +0100
+++ new/setuptools-12.2/setuptools.egg-info/SOURCES.txt 2015-02-16
16:24:39.000000000 +0100
@@ -1,6 +1,11 @@
+.gitignore
+.hgignore
+.hgtags
+.travis.yml
CHANGES.txt
DEVGUIDE.txt
MANIFEST.in
+Makefile
README.txt
bootstrap.py
conftest.py
@@ -12,6 +17,7 @@
release.py
setup.cfg
setup.py
+tox.ini
_markerlib/__init__.py
_markerlib/markers.py
docs/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools-12.0.5/tox.ini new/setuptools-12.2/tox.ini
--- old/setuptools-12.0.5/tox.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/setuptools-12.2/tox.ini 2015-02-16 14:57:34.000000000 +0100
@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27,py31,py32,py33,py34
+[testenv]
+deps=pytest
+commands=py.test {posargs}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
