Merge lp:~logan/ubuntu/saucy/distribute/0.6.36-1ubuntu1 into lp:ubuntu/saucy/distribute

Proposed by Logan Rosen
Status: Merged
Merged at revision: 22
Proposed branch: lp:~logan/ubuntu/saucy/distribute/0.6.36-1ubuntu1
Merge into: lp:ubuntu/saucy/distribute
Diff against target: 2411 lines (+1055/-999)
19 files modified
CHANGES.txt (+27/-5)
PKG-INFO (+42/-27)
README.txt (+3/-3)
debian/changelog (+21/-0)
debian/control (+2/-2)
debian/rules (+3/-1)
distribute.egg-info/PKG-INFO (+883/-868)
distribute.egg-info/SOURCES.txt (+1/-0)
distribute.egg-info/entry_points.txt (+43/-43)
distribute.egg-info/top_level.txt (+1/-1)
distribute_setup.py (+1/-1)
docs/build/html/_sources/setuptools.txt (+6/-12)
docs/conf.py (+2/-2)
docs/setuptools.txt (+6/-12)
pkg_resources.py (+3/-1)
release.py (+2/-2)
setup.py (+2/-2)
setuptools/command/easy_install.py (+4/-0)
setuptools/tests/test_resources.py (+3/-17)
To merge this branch: bzr merge lp:~logan/ubuntu/saucy/distribute/0.6.36-1ubuntu1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+162678@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CHANGES.txt'
--- CHANGES.txt 2013-01-15 21:13:37 +0000
+++ CHANGES.txt 2013-05-06 21:42:26 +0000
@@ -2,11 +2,33 @@
2CHANGES2CHANGES
3=======3=======
44
5----------5------
6Unreleased60.6.36
7----------7------
88
9+ Issue #341: 0.6.33 fails to build under python 2.49* Pull Request #35: In `Buildout issue 64
10 <https://github.com/buildout/buildout/issues/64>`_, it was reported that
11 under Python 3, installation of distutils scripts could attempt to copy
12 the ``__pycache__`` directory as a file, causing an error, apparently only
13 under Windows. Easy_install now skips all directories when processing
14 metadata scripts.
15
16------
170.6.35
18------
19
20Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
21how it parses version numbers.
22
23* Issue #278: Restored compatibility with distribute 0.6.22 and setuptools
24 0.6. Updated the documentation to match more closely with the version
25 parsing as intended in setuptools 0.6.
26
27------
280.6.34
29------
30
31* Issue #341: 0.6.33 fails to build under Python 2.4.
1032
11------33------
120.6.33340.6.33
1335
=== modified file 'PKG-INFO'
--- PKG-INFO 2013-01-15 21:13:37 +0000
+++ PKG-INFO 2013-05-06 21:42:26 +0000
@@ -1,6 +1,6 @@
1Metadata-Version: 1.11Metadata-Version: 1.1
2Name: distribute2Name: distribute
3Version: 0.6.343Version: 0.6.36
4Summary: Easily download, build, install, upgrade, and uninstall Python packages4Summary: Easily download, build, install, upgrade, and uninstall Python packages
5Home-page: http://packages.python.org/distribute5Home-page: http://packages.python.org/distribute
6Author: The fellowship of the packaging6Author: The fellowship of the packaging
@@ -107,9 +107,9 @@
107 107
108 Download the source tarball, uncompress it, then run the install command::108 Download the source tarball, uncompress it, then run the install command::
109 109
110 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz110 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
111 $ tar -xzvf distribute-0.6.34.tar.gz111 $ tar -xzvf distribute-0.6.36.tar.gz
112 $ cd distribute-0.6.34112 $ cd distribute-0.6.36
113 $ python setup.py install113 $ python setup.py install
114 114
115 ---------------------------115 ---------------------------
@@ -238,11 +238,33 @@
238 CHANGES238 CHANGES
239 =======239 =======
240 240
241 ----------241 ------
242 Unreleased242 0.6.36
243 ----------243 ------
244 244
245 + `Issue #341`_: 0.6.33 fails to build under python 2.4245 * Pull Request #35: In `Buildout `issue 64`_
246 <https://github.com/buildout/buildout/issues/64>`_, it was reported that
247 under Python 3, installation of distutils scripts could attempt to copy
248 the ``__pycache__`` directory as a file, causing an error, apparently only
249 under Windows. Easy_install now skips all directories when processing
250 metadata scripts.
251
252 ------
253 0.6.35
254 ------
255
256 Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
257 how it parses version numbers.
258
259 * `Issue #278`_: Restored compatibility with distribute 0.6.22 and setuptools
260 0.6. Updated the documentation to match more closely with the version
261 parsing as intended in setuptools 0.6.
262
263 ------
264 0.6.34
265 ------
266
267 * `Issue #341`_: 0.6.33 fails to build under Python 2.4.
246 268
247 ------269 ------
248 0.6.33270 0.6.33
@@ -273,8 +295,8 @@
273 * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3.295 * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3.
274 * `Issue #329`_: Properly close files created by tests for compatibility with296 * `Issue #329`_: Properly close files created by tests for compatibility with
275 Jython.297 Jython.
276 * Work around Jython bugs `#1980 <http://bugs.jython.org/`issue1980`_>`_ and298 * Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and
277 `#1981 <http://bugs.jython.org/`issue1981`_>`_.299 `#1981 <http://bugs.jython.org/issue1981>`_.
278 * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__`300 * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__`
279 such as numpy does. This change should address301 such as numpy does. This change should address
280 `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long302 `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
@@ -625,19 +647,19 @@
625 ==========647 ==========
626 648
627 * Added Python 3 support; see docs/python3.txt.649 * Added Python 3 support; see docs/python3.txt.
628 This closes http://bugs.python.org/setuptools/`issue39`_.650 This closes http://bugs.python.org/setuptools/issue39.
629 651
630 * Added option to run 2to3 automatically when installing on Python 3.652 * Added option to run 2to3 automatically when installing on Python 3.
631 This closes `issue #31`_.653 This closes `issue #31`_.
632 654
633 * Fixed invalid usage of requirement.parse, that broke develop -d.655 * Fixed invalid usage of requirement.parse, that broke develop -d.
634 This closes http://bugs.python.org/setuptools/`issue44`_.656 This closes http://bugs.python.org/setuptools/issue44.
635 657
636 * Fixed script launcher for 64-bit Windows.658 * Fixed script launcher for 64-bit Windows.
637 This closes http://bugs.python.org/setuptools/`issue2`_.659 This closes http://bugs.python.org/setuptools/issue2.
638 660
639 * KeyError when compiling extensions.661 * KeyError when compiling extensions.
640 This closes http://bugs.python.org/setuptools/`issue41`_.662 This closes http://bugs.python.org/setuptools/issue41.
641 663
642 bootstrapping664 bootstrapping
643 =============665 =============
@@ -647,7 +669,7 @@
647 * Fixed 2.6 dependencies. This closes `issue #50`_.669 * Fixed 2.6 dependencies. This closes `issue #50`_.
648 670
649 * Make sure setuptools is patched when running through easy_install671 * Make sure setuptools is patched when running through easy_install
650 This closes http://bugs.python.org/setuptools/`issue40`_.672 This closes http://bugs.python.org/setuptools/issue40.
651 673
652 -----674 -----
653 0.6.1675 0.6.1
@@ -660,9 +682,9 @@
660 This closes `issue #16`_ and `issue #18`_.682 This closes `issue #16`_ and `issue #18`_.
661 683
662 * zip_ok is now False by default. This closes684 * zip_ok is now False by default. This closes
663 http://bugs.python.org/setuptools/`issue33`_.685 http://bugs.python.org/setuptools/issue33.
664 686
665 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/`issue20`_.687 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
666 688
667 * Fixed invalid bootstraping with easy_install installation (`issue #40`_).689 * Fixed invalid bootstraping with easy_install installation (`issue #40`_).
668 Thanks to Florian Schulze for the help.690 Thanks to Florian Schulze for the help.
@@ -746,6 +768,7 @@
746 .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269768 .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269
747 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272769 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272
748 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273770 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273
771 .. _`Issue #278`: http://bitbucket.org/tarek/distribute/issue/278
749 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283772 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283
750 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294773 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294
751 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299774 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299
@@ -836,15 +859,7 @@
836 .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7859 .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7
837 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8860 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8
838 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9861 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9
839 .. _`issue1980`: http://bitbucket.org/tarek/distribute/issue/1980862 .. _`issue 64`: http://bitbucket.org/tarek/distribute/issue/64
840 .. _`issue1981`: http://bitbucket.org/tarek/distribute/issue/1981
841 .. _`issue2`: http://bitbucket.org/tarek/distribute/issue/2
842 .. _`issue20`: http://bitbucket.org/tarek/distribute/issue/20
843 .. _`issue33`: http://bitbucket.org/tarek/distribute/issue/33
844 .. _`issue39`: http://bitbucket.org/tarek/distribute/issue/39
845 .. _`issue40`: http://bitbucket.org/tarek/distribute/issue/40
846 .. _`issue41`: http://bitbucket.org/tarek/distribute/issue/41
847 .. _`issue44`: http://bitbucket.org/tarek/distribute/issue/44
848 863
849 864
850Keywords: CPAN PyPI distutils eggs package management865Keywords: CPAN PyPI distutils eggs package management
851866
=== modified file 'README.txt'
--- README.txt 2013-01-15 21:13:37 +0000
+++ README.txt 2013-05-06 21:42:26 +0000
@@ -99,9 +99,9 @@
9999
100Download the source tarball, uncompress it, then run the install command::100Download the source tarball, uncompress it, then run the install command::
101101
102 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz102 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
103 $ tar -xzvf distribute-0.6.34.tar.gz103 $ tar -xzvf distribute-0.6.36.tar.gz
104 $ cd distribute-0.6.34104 $ cd distribute-0.6.36
105 $ python setup.py install105 $ python setup.py install
106106
107---------------------------107---------------------------
108108
=== modified file 'debian/changelog'
--- debian/changelog 2013-01-15 21:13:37 +0000
+++ debian/changelog 2013-05-06 21:42:26 +0000
@@ -1,3 +1,24 @@
1distribute (0.6.36-1ubuntu1) saucy; urgency=low
2
3 * Merge from Debian unstable. Remaining changes:
4 - debian/control: Remove python3-sphinx from Build-Depends, as it is in
5 universe.
6 - debian/rules: Don't build for Python 2.7 and 3.2.
7
8 -- Logan Rosen <logan@ubuntu.com> Mon, 06 May 2013 17:32:15 -0400
9
10distribute (0.6.36-1) unstable; urgency=low
11
12 * New upstream version.
13
14 -- Matthias Klose <doko@debian.org> Sun, 07 Apr 2013 21:56:28 +0200
15
16distribute (0.6.34-1) experimental; urgency=low
17
18 * New upstream version.
19
20 -- Matthias Klose <doko@debian.org> Sun, 20 Jan 2013 17:46:12 +0100
21
1distribute (0.6.34-0ubuntu1) raring; urgency=low22distribute (0.6.34-0ubuntu1) raring; urgency=low
223
3 * New upstream release.24 * New upstream release.
425
=== modified file 'debian/control'
--- debian/control 2012-11-19 17:10:25 +0000
+++ debian/control 2013-05-06 21:42:26 +0000
@@ -3,10 +3,10 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>5XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
6Build-Depends-Indep: python-all-dev (>= 2.6.6-2~), python3-all-dev (>= 3.1.2-8~), python-sphinx6Build-Depends-Indep: python-all-dev (>= 2.6.6-2~), python3-all-dev (>= 3.1.2-8~), python-sphinx (>= 1.0.7+dfsg), python3.3-dev (>= 3.3.0)
7Build-Depends: debhelper (>= 5.0.37.1)7Build-Depends: debhelper (>= 5.0.37.1)
8XS-Python-Version: 2.78XS-Python-Version: 2.7
9Standards-Version: 3.9.39Standards-Version: 3.9.4
10Homepage: http://packages.python.org/distribute10Homepage: http://packages.python.org/distribute
1111
12#Package: python-distribute12#Package: python-distribute
1313
=== modified file 'debian/rules'
--- debian/rules 2012-11-07 23:59:55 +0000
+++ debian/rules 2013-05-06 21:42:26 +0000
@@ -141,10 +141,12 @@
141 dh_installdocs -p$(p_setp) -Xpkg_resources docs/*.txt141 dh_installdocs -p$(p_setp) -Xpkg_resources docs/*.txt
142 mkdir -p $(d_doc)/usr/share/doc/$(p_dist)142 mkdir -p $(d_doc)/usr/share/doc/$(p_dist)
143 cp -pr docs/build/html $(d_doc)/usr/share/doc/$(p_dist)/143 cp -pr docs/build/html $(d_doc)/usr/share/doc/$(p_dist)/
144 dh_sphinxdoc -p$(p_doc)
144 dh_link -p$(p_doc) \145 dh_link -p$(p_doc) \
145 /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_doc)/html \146 /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_doc)/html \
146 /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_setp)/html \147 /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_setp)/html \
147 /usr/share/javacript/jquery/jquery.js /usr/share/doc/$(p_dist)/html/_static/jquery.js148
149# /usr/share/javacript/jquery/jquery.js /usr/share/doc/$(p_dist)/html/_static/jquery.js
148 dh_compress -i150 dh_compress -i
149 dh_fixperms -i151 dh_fixperms -i
150152
151153
=== modified file 'distribute.egg-info/PKG-INFO'
--- distribute.egg-info/PKG-INFO 2013-01-15 21:13:37 +0000
+++ distribute.egg-info/PKG-INFO 2013-05-06 21:42:26 +0000
@@ -1,868 +1,883 @@
1Metadata-Version: 1.11Metadata-Version: 1.1
2Name: distribute2Name: distribute
3Version: 0.6.343Version: 0.6.36
4Summary: Easily download, build, install, upgrade, and uninstall Python packages4Summary: Easily download, build, install, upgrade, and uninstall Python packages
5Home-page: http://packages.python.org/distribute5Home-page: http://packages.python.org/distribute
6Author: The fellowship of the packaging6Author: The fellowship of the packaging
7Author-email: distutils-sig@python.org7Author-email: distutils-sig@python.org
8License: PSF or ZPL8License: PSF or ZPL
9Description: ===============================9Description: ===============================
10 Installing and Using Distribute10 Installing and Using Distribute
11 ===============================11 ===============================
12 12
13 .. contents:: **Table of Contents**13 .. contents:: **Table of Contents**
14 14
15 -----------15 -----------
16 Disclaimers16 Disclaimers
17 -----------17 -----------
18 18
19 About the fork19 About the fork
20 ==============20 ==============
21 21
22 `Distribute` is a fork of the `Setuptools` project.22 `Distribute` is a fork of the `Setuptools` project.
23 23
24 Distribute is intended to replace Setuptools as the standard method24 Distribute is intended to replace Setuptools as the standard method
25 for working with Python module distributions.25 for working with Python module distributions.
26 26
27 The fork has two goals:27 The fork has two goals:
28 28
29 - Providing a backward compatible version to replace Setuptools29 - Providing a backward compatible version to replace Setuptools
30 and make all distributions that depend on Setuptools work as30 and make all distributions that depend on Setuptools work as
31 before, but with less bugs and behaviorial issues.31 before, but with less bugs and behaviorial issues.
32 32
33 This work is done in the 0.6.x series.33 This work is done in the 0.6.x series.
34 34
35 Starting with version 0.6.2, Distribute supports Python 3.35 Starting with version 0.6.2, Distribute supports Python 3.
36 Installing and using distribute for Python 3 code works exactly36 Installing and using distribute for Python 3 code works exactly
37 the same as for Python 2 code, but Distribute also helps you to support37 the same as for Python 2 code, but Distribute also helps you to support
38 Python 2 and Python 3 from the same source code by letting you run 2to338 Python 2 and Python 3 from the same source code by letting you run 2to3
39 on the code as a part of the build process, by setting the keyword parameter39 on the code as a part of the build process, by setting the keyword parameter
40 ``use_2to3`` to True. See http://packages.python.org/distribute for more40 ``use_2to3`` to True. See http://packages.python.org/distribute for more
41 information.41 information.
42 42
43 - Refactoring the code, and releasing it in several distributions.43 - Refactoring the code, and releasing it in several distributions.
44 This work is being done in the 0.7.x series but not yet released.44 This work is being done in the 0.7.x series but not yet released.
45 45
46 The roadmap is still evolving, and the page that is up-to-date is46 The roadmap is still evolving, and the page that is up-to-date is
47 located at : `http://packages.python.org/distribute/roadmap`.47 located at : `http://packages.python.org/distribute/roadmap`.
48 48
49 If you install `Distribute` and want to switch back for any reason to49 If you install `Distribute` and want to switch back for any reason to
50 `Setuptools`, get to the `Uninstallation instructions`_ section.50 `Setuptools`, get to the `Uninstallation instructions`_ section.
51 51
52 More documentation52 More documentation
53 ==================53 ==================
54 54
55 You can get more information in the Sphinx-based documentation, located55 You can get more information in the Sphinx-based documentation, located
56 at http://packages.python.org/distribute. This documentation includes the old56 at http://packages.python.org/distribute. This documentation includes the old
57 Setuptools documentation that is slowly replaced, and brand new content.57 Setuptools documentation that is slowly replaced, and brand new content.
58 58
59 About the installation process59 About the installation process
60 ==============================60 ==============================
61 61
62 The `Distribute` installer modifies your installation by de-activating an62 The `Distribute` installer modifies your installation by de-activating an
63 existing installation of `Setuptools` in a bootstrap process. This process63 existing installation of `Setuptools` in a bootstrap process. This process
64 has been tested in various installation schemes and contexts but in case of a64 has been tested in various installation schemes and contexts but in case of a
65 bug during this process your Python installation might be left in a broken65 bug during this process your Python installation might be left in a broken
66 state. Since all modified files and directories are copied before the66 state. Since all modified files and directories are copied before the
67 installation starts, you will be able to get back to a normal state by reading67 installation starts, you will be able to get back to a normal state by reading
68 the instructions in the `Uninstallation instructions`_ section.68 the instructions in the `Uninstallation instructions`_ section.
69 69
70 In any case, it is recommended to save you `site-packages` directory before70 In any case, it is recommended to save you `site-packages` directory before
71 you start the installation of `Distribute`.71 you start the installation of `Distribute`.
72 72
73 -------------------------73 -------------------------
74 Installation Instructions74 Installation Instructions
75 -------------------------75 -------------------------
76 76
77 Distribute is only released as a source distribution.77 Distribute is only released as a source distribution.
78 78
79 It can be installed using pip, and can be done so with the source tarball,79 It can be installed using pip, and can be done so with the source tarball,
80 or by using the ``distribute_setup.py`` script provided online.80 or by using the ``distribute_setup.py`` script provided online.
81 81
82 ``distribute_setup.py`` is the simplest and preferred way on all systems.82 ``distribute_setup.py`` is the simplest and preferred way on all systems.
83 83
84 distribute_setup.py84 distribute_setup.py
85 ===================85 ===================
86 86
87 Download87 Download
88 `distribute_setup.py <http://python-distribute.org/distribute_setup.py>`_88 `distribute_setup.py <http://python-distribute.org/distribute_setup.py>`_
89 and execute it, using the Python interpreter of your choice.89 and execute it, using the Python interpreter of your choice.
90 90
91 If your shell has the ``curl`` program you can do::91 If your shell has the ``curl`` program you can do::
92 92
93 $ curl -O http://python-distribute.org/distribute_setup.py93 $ curl -O http://python-distribute.org/distribute_setup.py
94 $ python distribute_setup.py94 $ python distribute_setup.py
95 95
96 Notice this file is also provided in the source release.96 Notice this file is also provided in the source release.
97 97
98 pip98 pip
99 ===99 ===
100 100
101 Run easy_install or pip::101 Run easy_install or pip::
102 102
103 $ pip install distribute103 $ pip install distribute
104 104
105 Source installation105 Source installation
106 ===================106 ===================
107 107
108 Download the source tarball, uncompress it, then run the install command::108 Download the source tarball, uncompress it, then run the install command::
109 109
110 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz110 $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz
111 $ tar -xzvf distribute-0.6.34.tar.gz111 $ tar -xzvf distribute-0.6.36.tar.gz
112 $ cd distribute-0.6.34112 $ cd distribute-0.6.36
113 $ python setup.py install113 $ python setup.py install
114 114
115 ---------------------------115 ---------------------------
116 Uninstallation Instructions116 Uninstallation Instructions
117 ---------------------------117 ---------------------------
118 118
119 Like other distutils-based distributions, Distribute doesn't provide an119 Like other distutils-based distributions, Distribute doesn't provide an
120 uninstaller yet. It's all done manually! We are all waiting for PEP 376120 uninstaller yet. It's all done manually! We are all waiting for PEP 376
121 support in Python.121 support in Python.
122 122
123 Distribute is installed in three steps:123 Distribute is installed in three steps:
124 124
125 1. it gets out of the way an existing installation of Setuptools125 1. it gets out of the way an existing installation of Setuptools
126 2. it installs a `fake` setuptools installation126 2. it installs a `fake` setuptools installation
127 3. it installs distribute127 3. it installs distribute
128 128
129 Distribute can be removed like this:129 Distribute can be removed like this:
130 130
131 - remove the ``distribute*.egg`` file located in your site-packages directory131 - remove the ``distribute*.egg`` file located in your site-packages directory
132 - remove the ``setuptools.pth`` file located in you site-packages directory132 - remove the ``setuptools.pth`` file located in you site-packages directory
133 - remove the easy_install script located in you ``sys.prefix/bin`` directory133 - remove the easy_install script located in you ``sys.prefix/bin`` directory
134 - remove the ``setuptools*.egg`` directory located in your site-packages directory,134 - remove the ``setuptools*.egg`` directory located in your site-packages directory,
135 if any.135 if any.
136 136
137 If you want to get back to setuptools:137 If you want to get back to setuptools:
138 138
139 - reinstall setuptools using its instruction.139 - reinstall setuptools using its instruction.
140 140
141 Lastly:141 Lastly:
142 142
143 - remove the *.OLD.* directory located in your site-packages directory if any,143 - remove the *.OLD.* directory located in your site-packages directory if any,
144 **once you have checked everything was working correctly again**.144 **once you have checked everything was working correctly again**.
145 145
146 -------------------------146 -------------------------
147 Quick help for developers147 Quick help for developers
148 -------------------------148 -------------------------
149 149
150 To create an egg which is compatible with Distribute, use the same150 To create an egg which is compatible with Distribute, use the same
151 practice as with Setuptools, e.g.::151 practice as with Setuptools, e.g.::
152 152
153 from setuptools import setup153 from setuptools import setup
154 154
155 setup(...155 setup(...
156 )156 )
157 157
158 To use `pkg_resources` to access data files in the egg, you should158 To use `pkg_resources` to access data files in the egg, you should
159 require the Setuptools distribution explicitly::159 require the Setuptools distribution explicitly::
160 160
161 from setuptools import setup161 from setuptools import setup
162 162
163 setup(...163 setup(...
164 install_requires=['setuptools']164 install_requires=['setuptools']
165 )165 )
166 166
167 Only if you need Distribute-specific functionality should you depend167 Only if you need Distribute-specific functionality should you depend
168 on it explicitly. In this case, replace the Setuptools dependency::168 on it explicitly. In this case, replace the Setuptools dependency::
169 169
170 from setuptools import setup170 from setuptools import setup
171 171
172 setup(...172 setup(...
173 install_requires=['distribute']173 install_requires=['distribute']
174 )174 )
175 175
176 -----------176 -----------
177 Install FAQ177 Install FAQ
178 -----------178 -----------
179 179
180 - **Why is Distribute wrapping my Setuptools installation?**180 - **Why is Distribute wrapping my Setuptools installation?**
181 181
182 Since Distribute is a fork, and since it provides the same package182 Since Distribute is a fork, and since it provides the same package
183 and modules, it renames the existing Setuptools egg and inserts a183 and modules, it renames the existing Setuptools egg and inserts a
184 new one which merely wraps the Distribute code. This way, full184 new one which merely wraps the Distribute code. This way, full
185 backwards compatibility is kept for packages which rely on the185 backwards compatibility is kept for packages which rely on the
186 Setuptools modules.186 Setuptools modules.
187 187
188 At the same time, packages can meet their dependency on Setuptools188 At the same time, packages can meet their dependency on Setuptools
189 without actually installing it (which would disable Distribute).189 without actually installing it (which would disable Distribute).
190 190
191 - **How does Distribute interact with virtualenv?**191 - **How does Distribute interact with virtualenv?**
192 192
193 Everytime you create a virtualenv it will install setuptools by default.193 Everytime you create a virtualenv it will install setuptools by default.
194 You either need to re-install Distribute in it right after or pass the194 You either need to re-install Distribute in it right after or pass the
195 ``--distribute`` option when creating it.195 ``--distribute`` option when creating it.
196 196
197 Once installed, your virtualenv will use Distribute transparently.197 Once installed, your virtualenv will use Distribute transparently.
198 198
199 Although, if you have Setuptools installed in your system-wide Python,199 Although, if you have Setuptools installed in your system-wide Python,
200 and if the virtualenv you are in was generated without the `--no-site-packages`200 and if the virtualenv you are in was generated without the `--no-site-packages`
201 option, the Distribute installation will stop.201 option, the Distribute installation will stop.
202 202
203 You need in this case to build a virtualenv with the `--no-site-packages`203 You need in this case to build a virtualenv with the `--no-site-packages`
204 option or to install `Distribute` globally.204 option or to install `Distribute` globally.
205 205
206 - **How does Distribute interacts with zc.buildout?**206 - **How does Distribute interacts with zc.buildout?**
207 207
208 You can use Distribute in your zc.buildout, with the --distribute option,208 You can use Distribute in your zc.buildout, with the --distribute option,
209 starting at zc.buildout 1.4.2::209 starting at zc.buildout 1.4.2::
210 210
211 $ python bootstrap.py --distribute211 $ python bootstrap.py --distribute
212 212
213 For previous zc.buildout versions, *the only thing* you need to do213 For previous zc.buildout versions, *the only thing* you need to do
214 is use the bootstrap at `http://python-distribute.org/bootstrap.py`. Run214 is use the bootstrap at `http://python-distribute.org/bootstrap.py`. Run
215 that bootstrap and ``bin/buildout`` (and all other buildout-generated215 that bootstrap and ``bin/buildout`` (and all other buildout-generated
216 scripts) will transparently use distribute instead of setuptools. You do216 scripts) will transparently use distribute instead of setuptools. You do
217 not need a specific buildout release.217 not need a specific buildout release.
218 218
219 A shared eggs directory is no problem (since 0.6.6): the setuptools egg is219 A shared eggs directory is no problem (since 0.6.6): the setuptools egg is
220 left in place unmodified. So other buildouts that do not yet use the new220 left in place unmodified. So other buildouts that do not yet use the new
221 bootstrap continue to work just fine. And there is no need to list221 bootstrap continue to work just fine. And there is no need to list
222 ``distribute`` somewhere in your eggs: using the bootstrap is enough.222 ``distribute`` somewhere in your eggs: using the bootstrap is enough.
223 223
224 The source code for the bootstrap script is located at224 The source code for the bootstrap script is located at
225 `http://bitbucket.org/tarek/buildout-distribute`.225 `http://bitbucket.org/tarek/buildout-distribute`.
226 226
227 227
228 228
229 -----------------------------229 -----------------------------
230 Feedback and getting involved230 Feedback and getting involved
231 -----------------------------231 -----------------------------
232 232
233 - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig233 - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig
234 - Issue tracker: http://bitbucket.org/tarek/distribute/issues/234 - Issue tracker: http://bitbucket.org/tarek/distribute/issues/
235 - Code Repository: http://bitbucket.org/tarek/distribute235 - Code Repository: http://bitbucket.org/tarek/distribute
236 236
237 =======237 =======
238 CHANGES238 CHANGES
239 =======239 =======
240 240
241 ----------241 ------
242 Unreleased242 0.6.36
243 ----------243 ------
244 244
245 + `Issue #341`_: 0.6.33 fails to build under python 2.4245 * Pull Request #35: In `Buildout `issue 64`_
246 246 <https://github.com/buildout/buildout/issues/64>`_, it was reported that
247 ------247 under Python 3, installation of distutils scripts could attempt to copy
248 0.6.33248 the ``__pycache__`` directory as a file, causing an error, apparently only
249 ------249 under Windows. Easy_install now skips all directories when processing
250 250 metadata scripts.
251 * Fix 2 errors with Jython 2.5.251
252 * Fix 1 failure with Jython 2.5 and 2.7.252 ------
253 * Disable workaround for Jython scripts on Linux systems.253 0.6.35
254 * `Issue #336`_: `setup.py` no longer masks failure exit code when tests fail.254 ------
255 * Fix issue in pkg_resources where try/except around a platform-dependent255
256 import would trigger hook load failures on Mercurial. See pull request 32256 Note this release is backward-incompatible with distribute 0.6.23-0.6.34 in
257 for details.257 how it parses version numbers.
258 * `Issue #341`_: Fix a ResourceWarning.258
259 259 * `Issue #278`_: Restored compatibility with distribute 0.6.22 and setuptools
260 ------260 0.6. Updated the documentation to match more closely with the version
261 0.6.32261 parsing as intended in setuptools 0.6.
262 ------262
263 263 ------
264 * Fix test suite with Python 2.6.264 0.6.34
265 * Fix some DeprecationWarnings and ResourceWarnings.265 ------
266 * `Issue #335`_: Backed out `setup_requires` superceding installed requirements266
267 until regression can be addressed.267 * `Issue #341`_: 0.6.33 fails to build under Python 2.4.
268 268
269 ------269 ------
270 0.6.31270 0.6.33
271 ------271 ------
272 272
273 * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3.273 * Fix 2 errors with Jython 2.5.
274 * `Issue #329`_: Properly close files created by tests for compatibility with274 * Fix 1 failure with Jython 2.5 and 2.7.
275 Jython.275 * Disable workaround for Jython scripts on Linux systems.
276 * Work around Jython bugs `#1980 <http://bugs.jython.org/`issue1980`_>`_ and276 * `Issue #336`_: `setup.py` no longer masks failure exit code when tests fail.
277 `#1981 <http://bugs.jython.org/`issue1981`_>`_.277 * Fix issue in pkg_resources where try/except around a platform-dependent
278 * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__`278 import would trigger hook load failures on Mercurial. See pull request 32
279 such as numpy does. This change should address279 for details.
280 `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long280 * `Issue #341`_: Fix a ResourceWarning.
281 as the system encoding is UTF-8 or the IO encoding is specified in the281
282 environment, i.e.::282 ------
283 283 0.6.32
284 PYTHONIOENCODING=utf8 pip install numpy284 ------
285 285
286 * Fix for encoding issue when installing from Windows executable on Python 3.286 * Fix test suite with Python 2.6.
287 * `Issue #323`_: Allow `setup_requires` requirements to supercede installed287 * Fix some DeprecationWarnings and ResourceWarnings.
288 requirements. Added some new keyword arguments to existing pkg_resources288 * `Issue #335`_: Backed out `setup_requires` superceding installed requirements
289 methods. Also had to updated how __path__ is handled for namespace packages289 until regression can be addressed.
290 to ensure that when a new egg distribution containing a namespace package is290
291 placed on sys.path, the entries in __path__ are found in the same order they291 ------
292 would have been in had that egg been on the path when pkg_resources was292 0.6.31
293 first imported.293 ------
294 294
295 ------295 * `Issue #303`_: Make sure the manifest only ever contains UTF-8 in Python 3.
296 0.6.30296 * `Issue #329`_: Properly close files created by tests for compatibility with
297 ------297 Jython.
298 298 * Work around Jython bugs `#1980 <http://bugs.jython.org/issue1980>`_ and
299 * `Issue #328`_: Clean up temporary directories in distribute_setup.py.299 `#1981 <http://bugs.jython.org/issue1981>`_.
300 * Fix fatal bug in distribute_setup.py.300 * `Issue #334`_: Provide workaround for packages that reference `sys.__stdout__`
301 301 such as numpy does. This change should address
302 ------302 `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long
303 0.6.29303 as the system encoding is UTF-8 or the IO encoding is specified in the
304 ------304 environment, i.e.::
305 305
306 * Pull Request #14: Honor file permissions in zip files.306 PYTHONIOENCODING=utf8 pip install numpy
307 * `Issue #327`_: Merged pull request #24 to fix a dependency problem with pip.307
308 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.308 * Fix for encoding issue when installing from Windows executable on Python 3.
309 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`309 * `Issue #323`_: Allow `setup_requires` requirements to supercede installed
310 to produce uploadable documentation.310 requirements. Added some new keyword arguments to existing pkg_resources
311 * `Issue #326`_: `upload_docs` provided mangled auth credentials under Python 3.311 methods. Also had to updated how __path__ is handled for namespace packages
312 * `Issue #320`_: Fix check for "createable" in distribute_setup.py.312 to ensure that when a new egg distribution containing a namespace package is
313 * `Issue #305`_: Remove a warning that was triggered during normal operations.313 placed on sys.path, the entries in __path__ are found in the same order they
314 * `Issue #311`_: Print metadata in UTF-8 independent of platform.314 would have been in had that egg been on the path when pkg_resources was
315 * `Issue #303`_: Read manifest file with UTF-8 encoding under Python 3.315 first imported.
316 * `Issue #301`_: Allow to run tests of namespace packages when using 2to3.316
317 * `Issue #304`_: Prevent import loop in site.py under Python 3.3.317 ------
318 * `Issue #283`_: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.318 0.6.30
319 * `Issue #299`_: The develop command didn't work on Python 3, when using 2to3,319 ------
320 as the egg link would go to the Python 2 source. Linking to the 2to3'd code320
321 in build/lib makes it work, although you will have to rebuild the module321 * `Issue #328`_: Clean up temporary directories in distribute_setup.py.
322 before testing it.322 * Fix fatal bug in distribute_setup.py.
323 * `Issue #306`_: Even if 2to3 is used, we build in-place under Python 2.323
324 * `Issue #307`_: Prints the full path when .svn/entries is broken.324 ------
325 * `Issue #313`_: Support for sdist subcommands (Python 2.7)325 0.6.29
326 * `Issue #314`_: test_local_index() would fail an OS X.326 ------
327 * `Issue #310`_: Non-ascii characters in a namespace __init__.py causes errors.327
328 * `Issue #218`_: Improved documentation on behavior of `package_data` and328 * Pull Request #14: Honor file permissions in zip files.
329 `include_package_data`. Files indicated by `package_data` are now included329 * `Issue #327`_: Merged pull request #24 to fix a dependency problem with pip.
330 in the manifest.330 * Merged pull request #23 to fix https://github.com/pypa/virtualenv/issues/301.
331 * `distribute_setup.py` now allows a `--download-base` argument for retrieving331 * If Sphinx is installed, the `upload_docs` command now runs `build_sphinx`
332 distribute from a specified location.332 to produce uploadable documentation.
333 333 * `Issue #326`_: `upload_docs` provided mangled auth credentials under Python 3.
334 ------334 * `Issue #320`_: Fix check for "createable" in distribute_setup.py.
335 0.6.28335 * `Issue #305`_: Remove a warning that was triggered during normal operations.
336 ------336 * `Issue #311`_: Print metadata in UTF-8 independent of platform.
337 337 * `Issue #303`_: Read manifest file with UTF-8 encoding under Python 3.
338 * `Issue #294`_: setup.py can now be invoked from any directory.338 * `Issue #301`_: Allow to run tests of namespace packages when using 2to3.
339 * Scripts are now installed honoring the umask.339 * `Issue #304`_: Prevent import loop in site.py under Python 3.3.
340 * Added support for .dist-info directories.340 * `Issue #283`_: Reenable scanning of `*.pyc` / `*.pyo` files on Python 3.3.
341 * `Issue #283`_: Fix and disable scanning of `*.pyc` / `*.pyo` files on341 * `Issue #299`_: The develop command didn't work on Python 3, when using 2to3,
342 Python 3.3.342 as the egg link would go to the Python 2 source. Linking to the 2to3'd code
343 343 in build/lib makes it work, although you will have to rebuild the module
344 ------344 before testing it.
345 0.6.27345 * `Issue #306`_: Even if 2to3 is used, we build in-place under Python 2.
346 ------346 * `Issue #307`_: Prints the full path when .svn/entries is broken.
347 347 * `Issue #313`_: Support for sdist subcommands (Python 2.7)
348 * Support current snapshots of CPython 3.3.348 * `Issue #314`_: test_local_index() would fail an OS X.
349 * Distribute now recognizes README.rst as a standard, default readme file.349 * `Issue #310`_: Non-ascii characters in a namespace __init__.py causes errors.
350 * Exclude 'encodings' modules when removing modules from sys.modules.350 * `Issue #218`_: Improved documentation on behavior of `package_data` and
351 Workaround for #285.351 `include_package_data`. Files indicated by `package_data` are now included
352 * `Issue #231`_: Don't fiddle with system python when used with buildout352 in the manifest.
353 (bootstrap.py)353 * `distribute_setup.py` now allows a `--download-base` argument for retrieving
354 354 distribute from a specified location.
355 ------355
356 0.6.26356 ------
357 ------357 0.6.28
358 358 ------
359 * `Issue #183`_: Symlinked files are now extracted from source distributions.359
360 * `Issue #227`_: Easy_install fetch parameters are now passed during the360 * `Issue #294`_: setup.py can now be invoked from any directory.
361 installation of a source distribution; now fulfillment of setup_requires361 * Scripts are now installed honoring the umask.
362 dependencies will honor the parameters passed to easy_install.362 * Added support for .dist-info directories.
363 363 * `Issue #283`_: Fix and disable scanning of `*.pyc` / `*.pyo` files on
364 ------364 Python 3.3.
365 0.6.25365
366 ------366 ------
367 367 0.6.27
368 * `Issue #258`_: Workaround a cache issue368 ------
369 * `Issue #260`_: distribute_setup.py now accepts the --user parameter for369
370 Python 2.6 and later.370 * Support current snapshots of CPython 3.3.
371 * `Issue #262`_: package_index.open_with_auth no longer throws LookupError371 * Distribute now recognizes README.rst as a standard, default readme file.
372 on Python 3.372 * Exclude 'encodings' modules when removing modules from sys.modules.
373 * `Issue #269`_: AttributeError when an exception occurs reading Manifest.in373 Workaround for #285.
374 on late releases of Python.374 * `Issue #231`_: Don't fiddle with system python when used with buildout
375 * `Issue #272`_: Prevent TypeError when namespace package names are unicode375 (bootstrap.py)
376 and single-install-externally-managed is used. Also fixes PIP `issue376
377 449`_.377 ------
378 * `Issue #273`_: Legacy script launchers now install with Python2/3 support.378 0.6.26
379 379 ------
380 ------380
381 0.6.24381 * `Issue #183`_: Symlinked files are now extracted from source distributions.
382 ------382 * `Issue #227`_: Easy_install fetch parameters are now passed during the
383 383 installation of a source distribution; now fulfillment of setup_requires
384 * `Issue #249`_: Added options to exclude 2to3 fixers384 dependencies will honor the parameters passed to easy_install.
385 385
386 ------386 ------
387 0.6.23387 0.6.25
388 ------388 ------
389 389
390 * `Issue #244`_: Fixed a test390 * `Issue #258`_: Workaround a cache issue
391 * `Issue #243`_: Fixed a test391 * `Issue #260`_: distribute_setup.py now accepts the --user parameter for
392 * `Issue #239`_: Fixed a test392 Python 2.6 and later.
393 * `Issue #240`_: Fixed a test393 * `Issue #262`_: package_index.open_with_auth no longer throws LookupError
394 * `Issue #241`_: Fixed a test394 on Python 3.
395 * `Issue #237`_: Fixed a test395 * `Issue #269`_: AttributeError when an exception occurs reading Manifest.in
396 * `Issue #238`_: easy_install now uses 64bit executable wrappers on 64bit Python396 on late releases of Python.
397 * `Issue #208`_: Fixed parsed_versions, it now honors post-releases as noted in the documentation397 * `Issue #272`_: Prevent TypeError when namespace package names are unicode
398 * `Issue #207`_: Windows cli and gui wrappers pass CTRL-C to child python process398 and single-install-externally-managed is used. Also fixes PIP `issue
399 * `Issue #227`_: easy_install now passes its arguments to setup.py bdist_egg399 449`_.
400 * `Issue #225`_: Fixed a NameError on Python 2.5, 2.4400 * `Issue #273`_: Legacy script launchers now install with Python2/3 support.
401 401
402 ------402 ------
403 0.6.21403 0.6.24
404 ------404 ------
405 405
406 * `Issue #225`_: FIxed a regression on py2.4406 * `Issue #249`_: Added options to exclude 2to3 fixers
407 407
408 ------408 ------
409 0.6.20409 0.6.23
410 ------410 ------
411 411
412 * `Issue #135`_: Include url in warning when processing URLs in package_index.412 * `Issue #244`_: Fixed a test
413 * `Issue #212`_: Fix issue where easy_instal fails on Python 3 on windows installer.413 * `Issue #243`_: Fixed a test
414 * `Issue #213`_: Fix typo in documentation.414 * `Issue #239`_: Fixed a test
415 415 * `Issue #240`_: Fixed a test
416 ------416 * `Issue #241`_: Fixed a test
417 0.6.19417 * `Issue #237`_: Fixed a test
418 ------418 * `Issue #238`_: easy_install now uses 64bit executable wrappers on 64bit Python
419 419 * `Issue #208`_: Fixed parsed_versions, it now honors post-releases as noted in the documentation
420 * `Issue 206`_: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'420 * `Issue #207`_: Windows cli and gui wrappers pass CTRL-C to child python process
421 421 * `Issue #227`_: easy_install now passes its arguments to setup.py bdist_egg
422 ------422 * `Issue #225`_: Fixed a NameError on Python 2.5, 2.4
423 0.6.18423
424 ------424 ------
425 425 0.6.21
426 * `Issue 210`_: Fixed a regression introduced by `Issue 204`_ fix.426 ------
427 427
428 ------428 * `Issue #225`_: FIxed a regression on py2.4
429 0.6.17429
430 ------430 ------
431 431 0.6.20
432 * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment432 ------
433 variable to allow to disable installation of easy_install-${version} script.433
434 * Support Python >=3.1.4 and >=3.2.1.434 * `Issue #135`_: Include url in warning when processing URLs in package_index.
435 * `Issue 204`_: Don't try to import the parent of a namespace package in435 * `Issue #212`_: Fix issue where easy_instal fails on Python 3 on windows installer.
436 declare_namespace436 * `Issue #213`_: Fix typo in documentation.
437 * `Issue 196`_: Tolerate responses with multiple Content-Length headers437
438 * `Issue 205`_: Sandboxing doesn't preserve working_set. Leads to setup_requires438 ------
439 problems.439 0.6.19
440 440 ------
441 ------441
442 0.6.16442 * `Issue 206`_: AttributeError: 'HTTPMessage' object has no attribute 'getheaders'
443 ------443
444 444 ------
445 * Builds sdist gztar even on Windows (avoiding `Issue 193`_).445 0.6.18
446 * `Issue 192`_: Fixed metadata omitted on Windows when package_dir446 ------
447 specified with forward-slash.447
448 * `Issue 195`_: Cython build support.448 * `Issue 210`_: Fixed a regression introduced by `Issue 204`_ fix.
449 * `Issue 200`_: Issues with recognizing 64-bit packages on Windows.449
450 450 ------
451 ------451 0.6.17
452 0.6.15452 ------
453 ------453
454 454 * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment
455 * Fixed typo in bdist_egg455 variable to allow to disable installation of easy_install-${version} script.
456 * Several issues under Python 3 has been solved.456 * Support Python >=3.1.4 and >=3.2.1.
457 * `Issue 146`_: Fixed missing DLL files after easy_install of windows exe package.457 * `Issue 204`_: Don't try to import the parent of a namespace package in
458 458 declare_namespace
459 ------459 * `Issue 196`_: Tolerate responses with multiple Content-Length headers
460 0.6.14460 * `Issue 205`_: Sandboxing doesn't preserve working_set. Leads to setup_requires
461 ------461 problems.
462 462
463 * `Issue 170`_: Fixed unittest failure. Thanks to Toshio.463 ------
464 * `Issue 171`_: Fixed race condition in unittests cause deadlocks in test suite.464 0.6.16
465 * `Issue 143`_: Fixed a lookup issue with easy_install.465 ------
466 Thanks to David and Zooko.466
467 * `Issue 174`_: Fixed the edit mode when its used with setuptools itself467 * Builds sdist gztar even on Windows (avoiding `Issue 193`_).
468 468 * `Issue 192`_: Fixed metadata omitted on Windows when package_dir
469 ------469 specified with forward-slash.
470 0.6.13470 * `Issue 195`_: Cython build support.
471 ------471 * `Issue 200`_: Issues with recognizing 64-bit packages on Windows.
472 472
473 * `Issue 160`_: 2.7 gives ValueError("Invalid IPv6 URL")473 ------
474 * `Issue 150`_: Fixed using ~/.local even in a --no-site-packages virtualenv474 0.6.15
475 * `Issue 163`_: scan index links before external links, and don't use the md5 when475 ------
476 comparing two distributions476
477 477 * Fixed typo in bdist_egg
478 ------478 * Several issues under Python 3 has been solved.
479 0.6.12479 * `Issue 146`_: Fixed missing DLL files after easy_install of windows exe package.
480 ------480
481 481 ------
482 * `Issue 149`_: Fixed various failures on 2.3/2.4482 0.6.14
483 483 ------
484 ------484
485 0.6.11485 * `Issue 170`_: Fixed unittest failure. Thanks to Toshio.
486 ------486 * `Issue 171`_: Fixed race condition in unittests cause deadlocks in test suite.
487 487 * `Issue 143`_: Fixed a lookup issue with easy_install.
488 * Found another case of SandboxViolation - fixed488 Thanks to David and Zooko.
489 * `Issue 15`_ and 48: Introduced a socket timeout of 15 seconds on url openings489 * `Issue 174`_: Fixed the edit mode when its used with setuptools itself
490 * Added indexsidebar.html into MANIFEST.in490
491 * `Issue 108`_: Fixed TypeError with Python3.1491 ------
492 * `Issue 121`_: Fixed --help install command trying to actually install.492 0.6.13
493 * `Issue 112`_: Added an os.makedirs so that Tarek's solution will work.493 ------
494 * `Issue 133`_: Added --no-find-links to easy_install494
495 * Added easy_install --user495 * `Issue 160`_: 2.7 gives ValueError("Invalid IPv6 URL")
496 * `Issue 100`_: Fixed develop --user not taking '.' in PYTHONPATH into account496 * `Issue 150`_: Fixed using ~/.local even in a --no-site-packages virtualenv
497 * `Issue 134`_: removed spurious UserWarnings. Patch by VanLindberg497 * `Issue 163`_: scan index links before external links, and don't use the md5 when
498 * `Issue 138`_: cant_write_to_target error when setup_requires is used.498 comparing two distributions
499 * `Issue 147`_: respect the sys.dont_write_bytecode flag499
500 500 ------
501 ------501 0.6.12
502 0.6.10502 ------
503 ------503
504 504 * `Issue 149`_: Fixed various failures on 2.3/2.4
505 * Reverted change made for the DistributionNotFound exception because505
506 zc.buildout uses the exception message to get the name of the506 ------
507 distribution.507 0.6.11
508 508 ------
509 -----509
510 0.6.9510 * Found another case of SandboxViolation - fixed
511 -----511 * `Issue 15`_ and 48: Introduced a socket timeout of 15 seconds on url openings
512 512 * Added indexsidebar.html into MANIFEST.in
513 * `Issue 90`_: unknown setuptools version can be added in the working set513 * `Issue 108`_: Fixed TypeError with Python3.1
514 * `Issue 87`_: setupt.py doesn't try to convert distribute_setup.py anymore514 * `Issue 121`_: Fixed --help install command trying to actually install.
515 Initial Patch by arfrever.515 * `Issue 112`_: Added an os.makedirs so that Tarek's solution will work.
516 * `Issue 89`_: added a side bar with a download link to the doc.516 * `Issue 133`_: Added --no-find-links to easy_install
517 * `Issue 86`_: fixed missing sentence in pkg_resources doc.517 * Added easy_install --user
518 * Added a nicer error message when a DistributionNotFound is raised.518 * `Issue 100`_: Fixed develop --user not taking '.' in PYTHONPATH into account
519 * `Issue 80`_: test_develop now works with Python 3.1519 * `Issue 134`_: removed spurious UserWarnings. Patch by VanLindberg
520 * `Issue 93`_: upload_docs now works if there is an empty sub-directory.520 * `Issue 138`_: cant_write_to_target error when setup_requires is used.
521 * `Issue 70`_: exec bit on non-exec files521 * `Issue 147`_: respect the sys.dont_write_bytecode flag
522 * `Issue 99`_: now the standalone easy_install command doesn't uses a522
523 "setup.cfg" if any exists in the working directory. It will use it523 ------
524 only if triggered by ``install_requires`` from a setup.py call524 0.6.10
525 (install, develop, etc).525 ------
526 * `Issue 101`_: Allowing ``os.devnull`` in Sandbox526
527 * `Issue 92`_: Fixed the "no eggs" found error with MacPort527 * Reverted change made for the DistributionNotFound exception because
528 (platform.mac_ver() fails)528 zc.buildout uses the exception message to get the name of the
529 * `Issue 103`_: test_get_script_header_jython_workaround not run529 distribution.
530 anymore under py3 with C or POSIX local. Contributed by Arfrever.530
531 * `Issue 104`_: remvoved the assertion when the installation fails,531 -----
532 with a nicer message for the end user.532 0.6.9
533 * `Issue 100`_: making sure there's no SandboxViolation when533 -----
534 the setup script patches setuptools.534
535 535 * `Issue 90`_: unknown setuptools version can be added in the working set
536 -----536 * `Issue 87`_: setupt.py doesn't try to convert distribute_setup.py anymore
537 0.6.8537 Initial Patch by arfrever.
538 -----538 * `Issue 89`_: added a side bar with a download link to the doc.
539 539 * `Issue 86`_: fixed missing sentence in pkg_resources doc.
540 * Added "check_packages" in dist. (added in Setuptools 0.6c11)540 * Added a nicer error message when a DistributionNotFound is raised.
541 * Fixed the DONT_PATCH_SETUPTOOLS state.541 * `Issue 80`_: test_develop now works with Python 3.1
542 542 * `Issue 93`_: upload_docs now works if there is an empty sub-directory.
543 -----543 * `Issue 70`_: exec bit on non-exec files
544 0.6.7544 * `Issue 99`_: now the standalone easy_install command doesn't uses a
545 -----545 "setup.cfg" if any exists in the working directory. It will use it
546 546 only if triggered by ``install_requires`` from a setup.py call
547 * `Issue 58`_: Added --user support to the develop command547 (install, develop, etc).
548 * `Issue 11`_: Generated scripts now wrap their call to the script entry point548 * `Issue 101`_: Allowing ``os.devnull`` in Sandbox
549 in the standard "if name == 'main'"549 * `Issue 92`_: Fixed the "no eggs" found error with MacPort
550 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv550 (platform.mac_ver() fails)
551 can drive an installation that doesn't patch a global setuptools.551 * `Issue 103`_: test_get_script_header_jython_workaround not run
552 * Reviewed unladen-swallow specific change from552 anymore under py3 with C or POSIX local. Contributed by Arfrever.
553 http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719553 * `Issue 104`_: remvoved the assertion when the installation fails,
554 and determined that it no longer applies. Distribute should work fine with554 with a nicer message for the end user.
555 Unladen Swallow 2009Q3.555 * `Issue 100`_: making sure there's no SandboxViolation when
556 * `Issue 21`_: Allow PackageIndex.open_url to gracefully handle all cases of a556 the setup script patches setuptools.
557 httplib.HTTPException instead of just InvalidURL and BadStatusLine.557
558 * Removed virtual-python.py from this distribution and updated documentation558 -----
559 to point to the actively maintained virtualenv instead.559 0.6.8
560 * `Issue 64`_: use_setuptools no longer rebuilds the distribute egg every560 -----
561 time it is run561
562 * use_setuptools now properly respects the requested version562 * Added "check_packages" in dist. (added in Setuptools 0.6c11)
563 * use_setuptools will no longer try to import a distribute egg for the563 * Fixed the DONT_PATCH_SETUPTOOLS state.
564 wrong Python version564
565 * `Issue 74`_: no_fake should be True by default.565 -----
566 * `Issue 72`_: avoid a bootstrapping issue with easy_install -U566 0.6.7
567 567 -----
568 -----568
569 0.6.6569 * `Issue 58`_: Added --user support to the develop command
570 -----570 * `Issue 11`_: Generated scripts now wrap their call to the script entry point
571 571 in the standard "if name == 'main'"
572 * Unified the bootstrap file so it works on both py2.x and py3k without 2to3572 * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv
573 (patch by Holger Krekel)573 can drive an installation that doesn't patch a global setuptools.
574 574 * Reviewed unladen-swallow specific change from
575 -----575 http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719
576 0.6.5576 and determined that it no longer applies. Distribute should work fine with
577 -----577 Unladen Swallow 2009Q3.
578 578 * `Issue 21`_: Allow PackageIndex.open_url to gracefully handle all cases of a
579 * `Issue 65`_: cli.exe and gui.exe are now generated at build time,579 httplib.HTTPException instead of just InvalidURL and BadStatusLine.
580 depending on the platform in use.580 * Removed virtual-python.py from this distribution and updated documentation
581 581 to point to the actively maintained virtualenv instead.
582 * `Issue 67`_: Fixed doc typo (PEP 381/382)582 * `Issue 64`_: use_setuptools no longer rebuilds the distribute egg every
583 583 time it is run
584 * Distribute no longer shadows setuptools if we require a 0.7-series584 * use_setuptools now properly respects the requested version
585 setuptools. And an error is raised when installing a 0.7 setuptools with585 * use_setuptools will no longer try to import a distribute egg for the
586 distribute.586 wrong Python version
587 587 * `Issue 74`_: no_fake should be True by default.
588 * When run from within buildout, no attempt is made to modify an existing588 * `Issue 72`_: avoid a bootstrapping issue with easy_install -U
589 setuptools egg, whether in a shared egg directory or a system setuptools.589
590 590 -----
591 * Fixed a hole in sandboxing allowing builtin file to write outside of591 0.6.6
592 the sandbox.592 -----
593 593
594 -----594 * Unified the bootstrap file so it works on both py2.x and py3k without 2to3
595 0.6.4595 (patch by Holger Krekel)
596 -----596
597 597 -----
598 * Added the generation of `distribute_setup_3k.py` during the release.598 0.6.5
599 This closes `issue #52`_.599 -----
600 600
601 * Added an upload_docs command to easily upload project documentation to601 * `Issue 65`_: cli.exe and gui.exe are now generated at build time,
602 PyPI's http://packages.python.org. This close `issue #56`_.602 depending on the platform in use.
603 603
604 * Fixed a bootstrap bug on the use_setuptools() API.604 * `Issue 67`_: Fixed doc typo (PEP 381/382)
605 605
606 -----606 * Distribute no longer shadows setuptools if we require a 0.7-series
607 0.6.3607 setuptools. And an error is raised when installing a 0.7 setuptools with
608 -----608 distribute.
609 609
610 setuptools610 * When run from within buildout, no attempt is made to modify an existing
611 ==========611 setuptools egg, whether in a shared egg directory or a system setuptools.
612 612
613 * Fixed a bunch of calls to file() that caused crashes on Python 3.613 * Fixed a hole in sandboxing allowing builtin file to write outside of
614 614 the sandbox.
615 bootstrapping615
616 =============616 -----
617 617 0.6.4
618 * Fixed a bug in sorting that caused bootstrap to fail on Python 3.618 -----
619 619
620 -----620 * Added the generation of `distribute_setup_3k.py` during the release.
621 0.6.2621 This closes `issue #52`_.
622 -----622
623 623 * Added an upload_docs command to easily upload project documentation to
624 setuptools624 PyPI's http://packages.python.org. This close `issue #56`_.
625 ==========625
626 626 * Fixed a bootstrap bug on the use_setuptools() API.
627 * Added Python 3 support; see docs/python3.txt.627
628 This closes http://bugs.python.org/setuptools/`issue39`_.628 -----
629 629 0.6.3
630 * Added option to run 2to3 automatically when installing on Python 3.630 -----
631 This closes `issue #31`_.631
632 632 setuptools
633 * Fixed invalid usage of requirement.parse, that broke develop -d.633 ==========
634 This closes http://bugs.python.org/setuptools/`issue44`_.634
635 635 * Fixed a bunch of calls to file() that caused crashes on Python 3.
636 * Fixed script launcher for 64-bit Windows.636
637 This closes http://bugs.python.org/setuptools/`issue2`_.637 bootstrapping
638 638 =============
639 * KeyError when compiling extensions.639
640 This closes http://bugs.python.org/setuptools/`issue41`_.640 * Fixed a bug in sorting that caused bootstrap to fail on Python 3.
641 641
642 bootstrapping642 -----
643 =============643 0.6.2
644 644 -----
645 * Fixed bootstrap not working on Windows. This closes `issue #49`_.645
646 646 setuptools
647 * Fixed 2.6 dependencies. This closes `issue #50`_.647 ==========
648 648
649 * Make sure setuptools is patched when running through easy_install649 * Added Python 3 support; see docs/python3.txt.
650 This closes http://bugs.python.org/setuptools/`issue40`_.650 This closes http://bugs.python.org/setuptools/issue39.
651 651
652 -----652 * Added option to run 2to3 automatically when installing on Python 3.
653 0.6.1653 This closes `issue #31`_.
654 -----654
655 655 * Fixed invalid usage of requirement.parse, that broke develop -d.
656 setuptools656 This closes http://bugs.python.org/setuptools/issue44.
657 ==========657
658 658 * Fixed script launcher for 64-bit Windows.
659 * package_index.urlopen now catches BadStatusLine and malformed url errors.659 This closes http://bugs.python.org/setuptools/issue2.
660 This closes `issue #16`_ and `issue #18`_.660
661 661 * KeyError when compiling extensions.
662 * zip_ok is now False by default. This closes662 This closes http://bugs.python.org/setuptools/issue41.
663 http://bugs.python.org/setuptools/`issue33`_.663
664 664 bootstrapping
665 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/`issue20`_.665 =============
666 666
667 * Fixed invalid bootstraping with easy_install installation (`issue #40`_).667 * Fixed bootstrap not working on Windows. This closes `issue #49`_.
668 Thanks to Florian Schulze for the help.668
669 669 * Fixed 2.6 dependencies. This closes `issue #50`_.
670 * Removed buildout/bootstrap.py. A new repository will create a specific670
671 bootstrap.py script.671 * Make sure setuptools is patched when running through easy_install
672 672 This closes http://bugs.python.org/setuptools/issue40.
673 673
674 bootstrapping674 -----
675 =============675 0.6.1
676 676 -----
677 * The boostrap process leave setuptools alone if detected in the system677
678 and --root or --prefix is provided, but is not in the same location.678 setuptools
679 This closes `issue #10`_.679 ==========
680 680
681 ---681 * package_index.urlopen now catches BadStatusLine and malformed url errors.
682 0.6682 This closes `issue #16`_ and `issue #18`_.
683 ---683
684 684 * zip_ok is now False by default. This closes
685 setuptools685 http://bugs.python.org/setuptools/issue33.
686 ==========686
687 687 * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20.
688 * Packages required at build time where not fully present at install time.688
689 This closes `issue #12`_.689 * Fixed invalid bootstraping with easy_install installation (`issue #40`_).
690 690 Thanks to Florian Schulze for the help.
691 * Protected against failures in tarfile extraction. This closes `issue #10`_.691
692 692 * Removed buildout/bootstrap.py. A new repository will create a specific
693 * Made Jython api_tests.txt doctest compatible. This closes `issue #7`_.693 bootstrap.py script.
694 694
695 * sandbox.py replaced builtin type file with builtin function open. This695
696 closes `issue #6`_.696 bootstrapping
697 697 =============
698 * Immediately close all file handles. This closes `issue #3`_.698
699 699 * The boostrap process leave setuptools alone if detected in the system
700 * Added compatibility with Subversion 1.6. This references `issue #1`_.700 and --root or --prefix is provided, but is not in the same location.
701 701 This closes `issue #10`_.
702 pkg_resources702
703 =============703 ---
704 704 0.6
705 * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API705 ---
706 instead. Based on a patch from ronaldoussoren. This closes `issue #5`_.706
707 707 setuptools
708 * Fixed a SandboxViolation for mkdir that could occur in certain cases.708 ==========
709 This closes `issue #13`_.709
710 710 * Packages required at build time where not fully present at install time.
711 * Allow to find_on_path on systems with tight permissions to fail gracefully.711 This closes `issue #12`_.
712 This closes `issue #9`_.712
713 713 * Protected against failures in tarfile extraction. This closes `issue #10`_.
714 * Corrected inconsistency between documentation and code of add_entry.714
715 This closes `issue #8`_.715 * Made Jython api_tests.txt doctest compatible. This closes `issue #7`_.
716 716
717 * Immediately close all file handles. This closes `issue #3`_.717 * sandbox.py replaced builtin type file with builtin function open. This
718 718 closes `issue #6`_.
719 easy_install719
720 ============720 * Immediately close all file handles. This closes `issue #3`_.
721 721
722 * Immediately close all file handles. This closes `issue #3`_.722 * Added compatibility with Subversion 1.6. This references `issue #1`_.
723 723
724 724 pkg_resources
725 .. _`Issue #135`: http://bitbucket.org/tarek/distribute/issue/135725 =============
726 .. _`Issue #183`: http://bitbucket.org/tarek/distribute/issue/183726
727 .. _`Issue #207`: http://bitbucket.org/tarek/distribute/issue/207727 * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API
728 .. _`Issue #208`: http://bitbucket.org/tarek/distribute/issue/208728 instead. Based on a patch from ronaldoussoren. This closes `issue #5`_.
729 .. _`Issue #212`: http://bitbucket.org/tarek/distribute/issue/212729
730 .. _`Issue #213`: http://bitbucket.org/tarek/distribute/issue/213730 * Fixed a SandboxViolation for mkdir that could occur in certain cases.
731 .. _`Issue #218`: http://bitbucket.org/tarek/distribute/issue/218731 This closes `issue #13`_.
732 .. _`Issue #225`: http://bitbucket.org/tarek/distribute/issue/225732
733 .. _`Issue #227`: http://bitbucket.org/tarek/distribute/issue/227733 * Allow to find_on_path on systems with tight permissions to fail gracefully.
734 .. _`Issue #231`: http://bitbucket.org/tarek/distribute/issue/231734 This closes `issue #9`_.
735 .. _`Issue #237`: http://bitbucket.org/tarek/distribute/issue/237735
736 .. _`Issue #238`: http://bitbucket.org/tarek/distribute/issue/238736 * Corrected inconsistency between documentation and code of add_entry.
737 .. _`Issue #239`: http://bitbucket.org/tarek/distribute/issue/239737 This closes `issue #8`_.
738 .. _`Issue #240`: http://bitbucket.org/tarek/distribute/issue/240738
739 .. _`Issue #241`: http://bitbucket.org/tarek/distribute/issue/241739 * Immediately close all file handles. This closes `issue #3`_.
740 .. _`Issue #243`: http://bitbucket.org/tarek/distribute/issue/243740
741 .. _`Issue #244`: http://bitbucket.org/tarek/distribute/issue/244741 easy_install
742 .. _`Issue #249`: http://bitbucket.org/tarek/distribute/issue/249742 ============
743 .. _`Issue #258`: http://bitbucket.org/tarek/distribute/issue/258743
744 .. _`Issue #260`: http://bitbucket.org/tarek/distribute/issue/260744 * Immediately close all file handles. This closes `issue #3`_.
745 .. _`Issue #262`: http://bitbucket.org/tarek/distribute/issue/262745
746 .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269746
747 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272747 .. _`Issue #135`: http://bitbucket.org/tarek/distribute/issue/135
748 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273748 .. _`Issue #183`: http://bitbucket.org/tarek/distribute/issue/183
749 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283749 .. _`Issue #207`: http://bitbucket.org/tarek/distribute/issue/207
750 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294750 .. _`Issue #208`: http://bitbucket.org/tarek/distribute/issue/208
751 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299751 .. _`Issue #212`: http://bitbucket.org/tarek/distribute/issue/212
752 .. _`Issue #301`: http://bitbucket.org/tarek/distribute/issue/301752 .. _`Issue #213`: http://bitbucket.org/tarek/distribute/issue/213
753 .. _`Issue #303`: http://bitbucket.org/tarek/distribute/issue/303753 .. _`Issue #218`: http://bitbucket.org/tarek/distribute/issue/218
754 .. _`Issue #304`: http://bitbucket.org/tarek/distribute/issue/304754 .. _`Issue #225`: http://bitbucket.org/tarek/distribute/issue/225
755 .. _`Issue #305`: http://bitbucket.org/tarek/distribute/issue/305755 .. _`Issue #227`: http://bitbucket.org/tarek/distribute/issue/227
756 .. _`Issue #306`: http://bitbucket.org/tarek/distribute/issue/306756 .. _`Issue #231`: http://bitbucket.org/tarek/distribute/issue/231
757 .. _`Issue #307`: http://bitbucket.org/tarek/distribute/issue/307757 .. _`Issue #237`: http://bitbucket.org/tarek/distribute/issue/237
758 .. _`Issue #310`: http://bitbucket.org/tarek/distribute/issue/310758 .. _`Issue #238`: http://bitbucket.org/tarek/distribute/issue/238
759 .. _`Issue #311`: http://bitbucket.org/tarek/distribute/issue/311759 .. _`Issue #239`: http://bitbucket.org/tarek/distribute/issue/239
760 .. _`Issue #313`: http://bitbucket.org/tarek/distribute/issue/313760 .. _`Issue #240`: http://bitbucket.org/tarek/distribute/issue/240
761 .. _`Issue #314`: http://bitbucket.org/tarek/distribute/issue/314761 .. _`Issue #241`: http://bitbucket.org/tarek/distribute/issue/241
762 .. _`Issue #320`: http://bitbucket.org/tarek/distribute/issue/320762 .. _`Issue #243`: http://bitbucket.org/tarek/distribute/issue/243
763 .. _`Issue #323`: http://bitbucket.org/tarek/distribute/issue/323763 .. _`Issue #244`: http://bitbucket.org/tarek/distribute/issue/244
764 .. _`Issue #326`: http://bitbucket.org/tarek/distribute/issue/326764 .. _`Issue #249`: http://bitbucket.org/tarek/distribute/issue/249
765 .. _`Issue #327`: http://bitbucket.org/tarek/distribute/issue/327765 .. _`Issue #258`: http://bitbucket.org/tarek/distribute/issue/258
766 .. _`Issue #328`: http://bitbucket.org/tarek/distribute/issue/328766 .. _`Issue #260`: http://bitbucket.org/tarek/distribute/issue/260
767 .. _`Issue #329`: http://bitbucket.org/tarek/distribute/issue/329767 .. _`Issue #262`: http://bitbucket.org/tarek/distribute/issue/262
768 .. _`Issue #334`: http://bitbucket.org/tarek/distribute/issue/334768 .. _`Issue #269`: http://bitbucket.org/tarek/distribute/issue/269
769 .. _`Issue #335`: http://bitbucket.org/tarek/distribute/issue/335769 .. _`Issue #272`: http://bitbucket.org/tarek/distribute/issue/272
770 .. _`Issue #336`: http://bitbucket.org/tarek/distribute/issue/336770 .. _`Issue #273`: http://bitbucket.org/tarek/distribute/issue/273
771 .. _`Issue #341`: http://bitbucket.org/tarek/distribute/issue/341771 .. _`Issue #278`: http://bitbucket.org/tarek/distribute/issue/278
772 .. _`Issue 100`: http://bitbucket.org/tarek/distribute/issue/100772 .. _`Issue #283`: http://bitbucket.org/tarek/distribute/issue/283
773 .. _`Issue 101`: http://bitbucket.org/tarek/distribute/issue/101773 .. _`Issue #294`: http://bitbucket.org/tarek/distribute/issue/294
774 .. _`Issue 103`: http://bitbucket.org/tarek/distribute/issue/103774 .. _`Issue #299`: http://bitbucket.org/tarek/distribute/issue/299
775 .. _`Issue 104`: http://bitbucket.org/tarek/distribute/issue/104775 .. _`Issue #301`: http://bitbucket.org/tarek/distribute/issue/301
776 .. _`Issue 108`: http://bitbucket.org/tarek/distribute/issue/108776 .. _`Issue #303`: http://bitbucket.org/tarek/distribute/issue/303
777 .. _`Issue 11`: http://bitbucket.org/tarek/distribute/issue/11777 .. _`Issue #304`: http://bitbucket.org/tarek/distribute/issue/304
778 .. _`Issue 112`: http://bitbucket.org/tarek/distribute/issue/112778 .. _`Issue #305`: http://bitbucket.org/tarek/distribute/issue/305
779 .. _`Issue 121`: http://bitbucket.org/tarek/distribute/issue/121779 .. _`Issue #306`: http://bitbucket.org/tarek/distribute/issue/306
780 .. _`Issue 133`: http://bitbucket.org/tarek/distribute/issue/133780 .. _`Issue #307`: http://bitbucket.org/tarek/distribute/issue/307
781 .. _`Issue 134`: http://bitbucket.org/tarek/distribute/issue/134781 .. _`Issue #310`: http://bitbucket.org/tarek/distribute/issue/310
782 .. _`Issue 138`: http://bitbucket.org/tarek/distribute/issue/138782 .. _`Issue #311`: http://bitbucket.org/tarek/distribute/issue/311
783 .. _`Issue 143`: http://bitbucket.org/tarek/distribute/issue/143783 .. _`Issue #313`: http://bitbucket.org/tarek/distribute/issue/313
784 .. _`Issue 146`: http://bitbucket.org/tarek/distribute/issue/146784 .. _`Issue #314`: http://bitbucket.org/tarek/distribute/issue/314
785 .. _`Issue 147`: http://bitbucket.org/tarek/distribute/issue/147785 .. _`Issue #320`: http://bitbucket.org/tarek/distribute/issue/320
786 .. _`Issue 149`: http://bitbucket.org/tarek/distribute/issue/149786 .. _`Issue #323`: http://bitbucket.org/tarek/distribute/issue/323
787 .. _`Issue 15`: http://bitbucket.org/tarek/distribute/issue/15787 .. _`Issue #326`: http://bitbucket.org/tarek/distribute/issue/326
788 .. _`Issue 150`: http://bitbucket.org/tarek/distribute/issue/150788 .. _`Issue #327`: http://bitbucket.org/tarek/distribute/issue/327
789 .. _`Issue 160`: http://bitbucket.org/tarek/distribute/issue/160789 .. _`Issue #328`: http://bitbucket.org/tarek/distribute/issue/328
790 .. _`Issue 163`: http://bitbucket.org/tarek/distribute/issue/163790 .. _`Issue #329`: http://bitbucket.org/tarek/distribute/issue/329
791 .. _`Issue 170`: http://bitbucket.org/tarek/distribute/issue/170791 .. _`Issue #334`: http://bitbucket.org/tarek/distribute/issue/334
792 .. _`Issue 171`: http://bitbucket.org/tarek/distribute/issue/171792 .. _`Issue #335`: http://bitbucket.org/tarek/distribute/issue/335
793 .. _`Issue 174`: http://bitbucket.org/tarek/distribute/issue/174793 .. _`Issue #336`: http://bitbucket.org/tarek/distribute/issue/336
794 .. _`Issue 192`: http://bitbucket.org/tarek/distribute/issue/192794 .. _`Issue #341`: http://bitbucket.org/tarek/distribute/issue/341
795 .. _`Issue 193`: http://bitbucket.org/tarek/distribute/issue/193795 .. _`Issue 100`: http://bitbucket.org/tarek/distribute/issue/100
796 .. _`Issue 195`: http://bitbucket.org/tarek/distribute/issue/195796 .. _`Issue 101`: http://bitbucket.org/tarek/distribute/issue/101
797 .. _`Issue 196`: http://bitbucket.org/tarek/distribute/issue/196797 .. _`Issue 103`: http://bitbucket.org/tarek/distribute/issue/103
798 .. _`Issue 200`: http://bitbucket.org/tarek/distribute/issue/200798 .. _`Issue 104`: http://bitbucket.org/tarek/distribute/issue/104
799 .. _`Issue 204`: http://bitbucket.org/tarek/distribute/issue/204799 .. _`Issue 108`: http://bitbucket.org/tarek/distribute/issue/108
800 .. _`Issue 205`: http://bitbucket.org/tarek/distribute/issue/205800 .. _`Issue 11`: http://bitbucket.org/tarek/distribute/issue/11
801 .. _`Issue 206`: http://bitbucket.org/tarek/distribute/issue/206801 .. _`Issue 112`: http://bitbucket.org/tarek/distribute/issue/112
802 .. _`Issue 21`: http://bitbucket.org/tarek/distribute/issue/21802 .. _`Issue 121`: http://bitbucket.org/tarek/distribute/issue/121
803 .. _`Issue 210`: http://bitbucket.org/tarek/distribute/issue/210803 .. _`Issue 133`: http://bitbucket.org/tarek/distribute/issue/133
804 .. _`Issue 58`: http://bitbucket.org/tarek/distribute/issue/58804 .. _`Issue 134`: http://bitbucket.org/tarek/distribute/issue/134
805 .. _`Issue 64`: http://bitbucket.org/tarek/distribute/issue/64805 .. _`Issue 138`: http://bitbucket.org/tarek/distribute/issue/138
806 .. _`Issue 65`: http://bitbucket.org/tarek/distribute/issue/65806 .. _`Issue 143`: http://bitbucket.org/tarek/distribute/issue/143
807 .. _`Issue 67`: http://bitbucket.org/tarek/distribute/issue/67807 .. _`Issue 146`: http://bitbucket.org/tarek/distribute/issue/146
808 .. _`Issue 70`: http://bitbucket.org/tarek/distribute/issue/70808 .. _`Issue 147`: http://bitbucket.org/tarek/distribute/issue/147
809 .. _`Issue 72`: http://bitbucket.org/tarek/distribute/issue/72809 .. _`Issue 149`: http://bitbucket.org/tarek/distribute/issue/149
810 .. _`Issue 74`: http://bitbucket.org/tarek/distribute/issue/74810 .. _`Issue 15`: http://bitbucket.org/tarek/distribute/issue/15
811 .. _`Issue 80`: http://bitbucket.org/tarek/distribute/issue/80811 .. _`Issue 150`: http://bitbucket.org/tarek/distribute/issue/150
812 .. _`Issue 86`: http://bitbucket.org/tarek/distribute/issue/86812 .. _`Issue 160`: http://bitbucket.org/tarek/distribute/issue/160
813 .. _`Issue 87`: http://bitbucket.org/tarek/distribute/issue/87813 .. _`Issue 163`: http://bitbucket.org/tarek/distribute/issue/163
814 .. _`Issue 89`: http://bitbucket.org/tarek/distribute/issue/89814 .. _`Issue 170`: http://bitbucket.org/tarek/distribute/issue/170
815 .. _`Issue 90`: http://bitbucket.org/tarek/distribute/issue/90815 .. _`Issue 171`: http://bitbucket.org/tarek/distribute/issue/171
816 .. _`Issue 92`: http://bitbucket.org/tarek/distribute/issue/92816 .. _`Issue 174`: http://bitbucket.org/tarek/distribute/issue/174
817 .. _`Issue 93`: http://bitbucket.org/tarek/distribute/issue/93817 .. _`Issue 192`: http://bitbucket.org/tarek/distribute/issue/192
818 .. _`Issue 99`: http://bitbucket.org/tarek/distribute/issue/99818 .. _`Issue 193`: http://bitbucket.org/tarek/distribute/issue/193
819 .. _`issue819 .. _`Issue 195`: http://bitbucket.org/tarek/distribute/issue/195
820 449`: http://bitbucket.org/tarek/distribute/issue/449820 .. _`Issue 196`: http://bitbucket.org/tarek/distribute/issue/196
821 .. _`issue #1`: http://bitbucket.org/tarek/distribute/issue/1821 .. _`Issue 200`: http://bitbucket.org/tarek/distribute/issue/200
822 .. _`issue #10`: http://bitbucket.org/tarek/distribute/issue/10822 .. _`Issue 204`: http://bitbucket.org/tarek/distribute/issue/204
823 .. _`issue #12`: http://bitbucket.org/tarek/distribute/issue/12823 .. _`Issue 205`: http://bitbucket.org/tarek/distribute/issue/205
824 .. _`issue #13`: http://bitbucket.org/tarek/distribute/issue/13824 .. _`Issue 206`: http://bitbucket.org/tarek/distribute/issue/206
825 .. _`issue #16`: http://bitbucket.org/tarek/distribute/issue/16825 .. _`Issue 21`: http://bitbucket.org/tarek/distribute/issue/21
826 .. _`issue #18`: http://bitbucket.org/tarek/distribute/issue/18826 .. _`Issue 210`: http://bitbucket.org/tarek/distribute/issue/210
827 .. _`issue #3`: http://bitbucket.org/tarek/distribute/issue/3827 .. _`Issue 58`: http://bitbucket.org/tarek/distribute/issue/58
828 .. _`issue #31`: http://bitbucket.org/tarek/distribute/issue/31828 .. _`Issue 64`: http://bitbucket.org/tarek/distribute/issue/64
829 .. _`issue #40`: http://bitbucket.org/tarek/distribute/issue/40829 .. _`Issue 65`: http://bitbucket.org/tarek/distribute/issue/65
830 .. _`issue #49`: http://bitbucket.org/tarek/distribute/issue/49830 .. _`Issue 67`: http://bitbucket.org/tarek/distribute/issue/67
831 .. _`issue #5`: http://bitbucket.org/tarek/distribute/issue/5831 .. _`Issue 70`: http://bitbucket.org/tarek/distribute/issue/70
832 .. _`issue #50`: http://bitbucket.org/tarek/distribute/issue/50832 .. _`Issue 72`: http://bitbucket.org/tarek/distribute/issue/72
833 .. _`issue #52`: http://bitbucket.org/tarek/distribute/issue/52833 .. _`Issue 74`: http://bitbucket.org/tarek/distribute/issue/74
834 .. _`issue #56`: http://bitbucket.org/tarek/distribute/issue/56834 .. _`Issue 80`: http://bitbucket.org/tarek/distribute/issue/80
835 .. _`issue #6`: http://bitbucket.org/tarek/distribute/issue/6835 .. _`Issue 86`: http://bitbucket.org/tarek/distribute/issue/86
836 .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7836 .. _`Issue 87`: http://bitbucket.org/tarek/distribute/issue/87
837 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8837 .. _`Issue 89`: http://bitbucket.org/tarek/distribute/issue/89
838 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9838 .. _`Issue 90`: http://bitbucket.org/tarek/distribute/issue/90
839 .. _`issue1980`: http://bitbucket.org/tarek/distribute/issue/1980839 .. _`Issue 92`: http://bitbucket.org/tarek/distribute/issue/92
840 .. _`issue1981`: http://bitbucket.org/tarek/distribute/issue/1981840 .. _`Issue 93`: http://bitbucket.org/tarek/distribute/issue/93
841 .. _`issue2`: http://bitbucket.org/tarek/distribute/issue/2841 .. _`Issue 99`: http://bitbucket.org/tarek/distribute/issue/99
842 .. _`issue20`: http://bitbucket.org/tarek/distribute/issue/20842 .. _`issue
843 .. _`issue33`: http://bitbucket.org/tarek/distribute/issue/33843 449`: http://bitbucket.org/tarek/distribute/issue/449
844 .. _`issue39`: http://bitbucket.org/tarek/distribute/issue/39844 .. _`issue #1`: http://bitbucket.org/tarek/distribute/issue/1
845 .. _`issue40`: http://bitbucket.org/tarek/distribute/issue/40845 .. _`issue #10`: http://bitbucket.org/tarek/distribute/issue/10
846 .. _`issue41`: http://bitbucket.org/tarek/distribute/issue/41846 .. _`issue #12`: http://bitbucket.org/tarek/distribute/issue/12
847 .. _`issue44`: http://bitbucket.org/tarek/distribute/issue/44847 .. _`issue #13`: http://bitbucket.org/tarek/distribute/issue/13
848 848 .. _`issue #16`: http://bitbucket.org/tarek/distribute/issue/16
849 849 .. _`issue #18`: http://bitbucket.org/tarek/distribute/issue/18
850Keywords: CPAN PyPI distutils eggs package management850 .. _`issue #3`: http://bitbucket.org/tarek/distribute/issue/3
851Platform: UNKNOWN851 .. _`issue #31`: http://bitbucket.org/tarek/distribute/issue/31
852Classifier: Development Status :: 5 - Production/Stable852 .. _`issue #40`: http://bitbucket.org/tarek/distribute/issue/40
853Classifier: Intended Audience :: Developers853 .. _`issue #49`: http://bitbucket.org/tarek/distribute/issue/49
854Classifier: License :: OSI Approved :: Python Software Foundation License854 .. _`issue #5`: http://bitbucket.org/tarek/distribute/issue/5
855Classifier: License :: OSI Approved :: Zope Public License855 .. _`issue #50`: http://bitbucket.org/tarek/distribute/issue/50
856Classifier: Operating System :: OS Independent856 .. _`issue #52`: http://bitbucket.org/tarek/distribute/issue/52
857Classifier: Programming Language :: Python :: 2.4857 .. _`issue #56`: http://bitbucket.org/tarek/distribute/issue/56
858Classifier: Programming Language :: Python :: 2.5858 .. _`issue #6`: http://bitbucket.org/tarek/distribute/issue/6
859Classifier: Programming Language :: Python :: 2.6859 .. _`issue #7`: http://bitbucket.org/tarek/distribute/issue/7
860Classifier: Programming Language :: Python :: 2.7860 .. _`issue #8`: http://bitbucket.org/tarek/distribute/issue/8
861Classifier: Programming Language :: Python :: 3861 .. _`issue #9`: http://bitbucket.org/tarek/distribute/issue/9
862Classifier: Programming Language :: Python :: 3.1862 .. _`issue 64`: http://bitbucket.org/tarek/distribute/issue/64
863Classifier: Programming Language :: Python :: 3.2863
864Classifier: Programming Language :: Python :: 3.3864
865Classifier: Topic :: Software Development :: Libraries :: Python Modules865Keywords: CPAN PyPI distutils eggs package management
866Classifier: Topic :: System :: Archiving :: Packaging866Platform: UNKNOWN
867Classifier: Topic :: System :: Systems Administration867Classifier: Development Status :: 5 - Production/Stable
868Classifier: Topic :: Utilities868Classifier: Intended Audience :: Developers
869Classifier: License :: OSI Approved :: Python Software Foundation License
870Classifier: License :: OSI Approved :: Zope Public License
871Classifier: Operating System :: OS Independent
872Classifier: Programming Language :: Python :: 2.4
873Classifier: Programming Language :: Python :: 2.5
874Classifier: Programming Language :: Python :: 2.6
875Classifier: Programming Language :: Python :: 2.7
876Classifier: Programming Language :: Python :: 3
877Classifier: Programming Language :: Python :: 3.1
878Classifier: Programming Language :: Python :: 3.2
879Classifier: Programming Language :: Python :: 3.3
880Classifier: Topic :: Software Development :: Libraries :: Python Modules
881Classifier: Topic :: System :: Archiving :: Packaging
882Classifier: Topic :: System :: Systems Administration
883Classifier: Topic :: Utilities
869884
=== modified file 'distribute.egg-info/SOURCES.txt'
--- distribute.egg-info/SOURCES.txt 2012-10-21 22:15:11 +0000
+++ distribute.egg-info/SOURCES.txt 2013-05-06 21:42:26 +0000
@@ -11,6 +11,7 @@
11setup.cfg11setup.cfg
12setup.py12setup.py
13site.py13site.py
14template.py
14_markerlib/__init__.py15_markerlib/__init__.py
15_markerlib/markers.py16_markerlib/markers.py
16distribute.egg-info/PKG-INFO17distribute.egg-info/PKG-INFO
1718
=== modified file 'distribute.egg-info/entry_points.txt'
--- distribute.egg-info/entry_points.txt 2012-10-21 22:15:11 +0000
+++ distribute.egg-info/entry_points.txt 2013-05-06 21:42:26 +0000
@@ -1,63 +1,63 @@
1[egg_info.writers]1[egg_info.writers]
2eager_resources.txt = setuptools.command.egg_info:overwrite_arg
3entry_points.txt = setuptools.command.egg_info:write_entries2entry_points.txt = setuptools.command.egg_info:write_entries
4PKG-INFO = setuptools.command.egg_info:write_pkg_info3PKG-INFO = setuptools.command.egg_info:write_pkg_info
5top_level.txt = setuptools.command.egg_info:write_toplevel_names
6dependency_links.txt = setuptools.command.egg_info:overwrite_arg
7depends.txt = setuptools.command.egg_info:warn_depends_obsolete4depends.txt = setuptools.command.egg_info:warn_depends_obsolete
5eager_resources.txt = setuptools.command.egg_info:overwrite_arg
8namespace_packages.txt = setuptools.command.egg_info:overwrite_arg6namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
9requires.txt = setuptools.command.egg_info:write_requirements7requires.txt = setuptools.command.egg_info:write_requirements
8top_level.txt = setuptools.command.egg_info:write_toplevel_names
9dependency_links.txt = setuptools.command.egg_info:overwrite_arg
1010
11[setuptools.installation]11[setuptools.installation]
12eggsecutable = setuptools.command.easy_install:bootstrap12eggsecutable = setuptools.command.easy_install:bootstrap
1313
14[console_scripts]14[setuptools.file_finders]
15easy_install = setuptools.command.easy_install:main15svn_cvs = setuptools.command.sdist:_default_revctrl
16easy_install-2.6 = setuptools.command.easy_install:main16
17easy_install-2.7 = setuptools.command.easy_install:main17[distutils.setup_keywords]
18dependency_links = setuptools.dist:assert_string_list
19test_suite = setuptools.dist:check_test_suite
20convert_2to3_doctests = setuptools.dist:assert_string_list
21exclude_package_data = setuptools.dist:check_package_data
22packages = setuptools.dist:check_packages
23use_2to3 = setuptools.dist:assert_bool
24use_2to3_fixers = setuptools.dist:assert_string_list
25extras_require = setuptools.dist:check_extras
26install_requires = setuptools.dist:check_requirements
27zip_safe = setuptools.dist:assert_bool
28eager_resources = setuptools.dist:assert_string_list
29test_loader = setuptools.dist:check_importable
30use_2to3_exclude_fixers = setuptools.dist:assert_string_list
31tests_require = setuptools.dist:check_requirements
32entry_points = setuptools.dist:check_entry_points
33namespace_packages = setuptools.dist:check_nsp
34include_package_data = setuptools.dist:assert_bool
35package_data = setuptools.dist:check_package_data
1836
19[distutils.commands]37[distutils.commands]
20test = setuptools.command.test:test38setopt = setuptools.command.setopt:setopt
39install_scripts = setuptools.command.install_scripts:install_scripts
40upload_docs = setuptools.command.upload_docs:upload_docs
21alias = setuptools.command.alias:alias41alias = setuptools.command.alias:alias
42build_ext = setuptools.command.build_ext:build_ext
22bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst43bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
44sdist = setuptools.command.sdist:sdist
45easy_install = setuptools.command.easy_install:easy_install
46install_lib = setuptools.command.install_lib:install_lib
47bdist_egg = setuptools.command.bdist_egg:bdist_egg
23saveopts = setuptools.command.saveopts:saveopts48saveopts = setuptools.command.saveopts:saveopts
24install = setuptools.command.install:install49register = setuptools.command.register:register
25bdist_egg = setuptools.command.bdist_egg:bdist_egg50egg_info = setuptools.command.egg_info:egg_info
51test = setuptools.command.test:test
52develop = setuptools.command.develop:develop
26install_egg_info = setuptools.command.install_egg_info:install_egg_info53install_egg_info = setuptools.command.install_egg_info:install_egg_info
27sdist = setuptools.command.sdist:sdist
28rotate = setuptools.command.rotate:rotate54rotate = setuptools.command.rotate:rotate
29build_py = setuptools.command.build_py:build_py55build_py = setuptools.command.build_py:build_py
30build_ext = setuptools.command.build_ext:build_ext56install = setuptools.command.install:install
31easy_install = setuptools.command.easy_install:easy_install
32install_scripts = setuptools.command.install_scripts:install_scripts
33egg_info = setuptools.command.egg_info:egg_info
34setopt = setuptools.command.setopt:setopt
35install_lib = setuptools.command.install_lib:install_lib
36develop = setuptools.command.develop:develop
37upload_docs = setuptools.command.upload_docs:upload_docs
38bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm57bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
39register = setuptools.command.register:register58
4059[console_scripts]
41[distutils.setup_keywords]60easy_install-2.6 = setuptools.command.easy_install:main
42convert_2to3_doctests = setuptools.dist:assert_string_list61easy_install-2.7 = setuptools.command.easy_install:main
43use_2to3_exclude_fixers = setuptools.dist:assert_string_list62easy_install = setuptools.command.easy_install:main
44test_suite = setuptools.dist:check_test_suite
45zip_safe = setuptools.dist:assert_bool
46install_requires = setuptools.dist:check_requirements
47package_data = setuptools.dist:check_package_data
48test_loader = setuptools.dist:check_importable
49entry_points = setuptools.dist:check_entry_points
50use_2to3_fixers = setuptools.dist:assert_string_list
51packages = setuptools.dist:check_packages
52dependency_links = setuptools.dist:assert_string_list
53extras_require = setuptools.dist:check_extras
54use_2to3 = setuptools.dist:assert_bool
55namespace_packages = setuptools.dist:check_nsp
56include_package_data = setuptools.dist:assert_bool
57eager_resources = setuptools.dist:assert_string_list
58exclude_package_data = setuptools.dist:check_package_data
59tests_require = setuptools.dist:check_requirements
60
61[setuptools.file_finders]
62svn_cvs = setuptools.command.sdist:_default_revctrl
6363
6464
=== modified file 'distribute.egg-info/top_level.txt'
--- distribute.egg-info/top_level.txt 2012-10-21 22:15:11 +0000
+++ distribute.egg-info/top_level.txt 2013-05-06 21:42:26 +0000
@@ -1,5 +1,5 @@
1easy_install
2site1site
3_markerlib2_markerlib
4pkg_resources3pkg_resources
5setuptools4setuptools
5easy_install
66
=== modified file 'distribute_setup.py'
--- distribute_setup.py 2013-01-15 21:13:37 +0000
+++ distribute_setup.py 2013-05-06 21:42:26 +0000
@@ -49,7 +49,7 @@
49 args = [quote(arg) for arg in args]49 args = [quote(arg) for arg in args]
50 return os.spawnl(os.P_WAIT, sys.executable, *args) == 050 return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
5151
52DEFAULT_VERSION = "0.6.34"52DEFAULT_VERSION = "0.6.36"
53DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"53DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
54SETUPTOOLS_FAKED_VERSION = "0.6c11"54SETUPTOOLS_FAKED_VERSION = "0.6c11"
5555
5656
=== modified file 'docs/build/html/_sources/setuptools.txt'
--- docs/build/html/_sources/setuptools.txt 2013-01-15 21:13:37 +0000
+++ docs/build/html/_sources/setuptools.txt 2013-05-06 21:42:26 +0000
@@ -187,10 +187,11 @@
187187
188A pre-release tag is a series of letters that are alphabetically before188A pre-release tag is a series of letters that are alphabetically before
189"final". Some examples of prerelease tags would include ``alpha``, ``beta``,189"final". Some examples of prerelease tags would include ``alpha``, ``beta``,
190``a``, ``c``, ``dev``, and so on. You do not have to place a dot before190``a``, ``c``, ``dev``, and so on. You do not have to place a dot or dash
191the prerelease tag if it's immediately after a number, but it's okay to do191before the prerelease tag if it's immediately after a number, but it's okay to
192so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` both represent release192do so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
193candidate 1 of version ``2.4``, and are treated as identical by setuptools.193represent release candidate 1 of version ``2.4``, and are treated as identical
194by setuptools.
194195
195In addition, there are three special prerelease tags that are treated as if196In addition, there are three special prerelease tags that are treated as if
196they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version197they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version
@@ -216,13 +217,6 @@
216For the most part, setuptools' interpretation of version numbers is intuitive,217For the most part, setuptools' interpretation of version numbers is intuitive,
217but here are a few tips that will keep you out of trouble in the corner cases:218but here are a few tips that will keep you out of trouble in the corner cases:
218219
219* Don't use ``-`` or any other character than ``.`` as a separator, unless you
220 really want a post-release. Remember that ``2.1-rc2`` means you've
221 *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates
222 you're putting out *before* ``2.1``. If you accidentally distribute copies
223 of a post-release that you meant to be a pre-release, the only safe fix is to
224 bump your main release number (e.g. to ``2.1.1``) and re-release the project.
225
226* Don't stick adjoining pre-release tags together without a dot or number220* Don't stick adjoining pre-release tags together without a dot or number
227 between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,221 between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
228 *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in222 *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in
@@ -239,7 +233,7 @@
239 >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')233 >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
240 True234 True
241 >>> parse_version('2.1-rc2') < parse_version('2.1')235 >>> parse_version('2.1-rc2') < parse_version('2.1')
242 False236 True
243 >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')237 >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
244 True238 True
245239
246240
=== modified file 'docs/conf.py'
--- docs/conf.py 2013-01-15 21:13:37 +0000
+++ docs/conf.py 2013-05-06 21:42:26 +0000
@@ -48,9 +48,9 @@
48# built documents.48# built documents.
49#49#
50# The short X.Y version.50# The short X.Y version.
51version = '0.6.34'51version = '0.6.36'
52# The full version, including alpha/beta/rc tags.52# The full version, including alpha/beta/rc tags.
53release = '0.6.34'53release = '0.6.36'
5454
55# The language for content autogenerated by Sphinx. Refer to documentation55# The language for content autogenerated by Sphinx. Refer to documentation
56# for a list of supported languages.56# for a list of supported languages.
5757
=== modified file 'docs/setuptools.txt'
--- docs/setuptools.txt 2013-01-15 21:13:37 +0000
+++ docs/setuptools.txt 2013-05-06 21:42:26 +0000
@@ -187,10 +187,11 @@
187187
188A pre-release tag is a series of letters that are alphabetically before188A pre-release tag is a series of letters that are alphabetically before
189"final". Some examples of prerelease tags would include ``alpha``, ``beta``,189"final". Some examples of prerelease tags would include ``alpha``, ``beta``,
190``a``, ``c``, ``dev``, and so on. You do not have to place a dot before190``a``, ``c``, ``dev``, and so on. You do not have to place a dot or dash
191the prerelease tag if it's immediately after a number, but it's okay to do191before the prerelease tag if it's immediately after a number, but it's okay to
192so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` both represent release192do so if you prefer. Thus, ``2.4c1`` and ``2.4.c1`` and ``2.4-c1`` all
193candidate 1 of version ``2.4``, and are treated as identical by setuptools.193represent release candidate 1 of version ``2.4``, and are treated as identical
194by setuptools.
194195
195In addition, there are three special prerelease tags that are treated as if196In addition, there are three special prerelease tags that are treated as if
196they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version197they were the letter ``c``: ``pre``, ``preview``, and ``rc``. So, version
@@ -216,13 +217,6 @@
216For the most part, setuptools' interpretation of version numbers is intuitive,217For the most part, setuptools' interpretation of version numbers is intuitive,
217but here are a few tips that will keep you out of trouble in the corner cases:218but here are a few tips that will keep you out of trouble in the corner cases:
218219
219* Don't use ``-`` or any other character than ``.`` as a separator, unless you
220 really want a post-release. Remember that ``2.1-rc2`` means you've
221 *already* released ``2.1``, whereas ``2.1rc2`` and ``2.1.c2`` are candidates
222 you're putting out *before* ``2.1``. If you accidentally distribute copies
223 of a post-release that you meant to be a pre-release, the only safe fix is to
224 bump your main release number (e.g. to ``2.1.1``) and re-release the project.
225
226* Don't stick adjoining pre-release tags together without a dot or number220* Don't stick adjoining pre-release tags together without a dot or number
227 between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,221 between them. Version ``1.9adev`` is the ``adev`` prerelease of ``1.9``,
228 *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in222 *not* a development pre-release of ``1.9a``. Use ``.dev`` instead, as in
@@ -239,7 +233,7 @@
239 >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')233 >>> parse_version('1.9.a.dev') == parse_version('1.9a0dev')
240 True234 True
241 >>> parse_version('2.1-rc2') < parse_version('2.1')235 >>> parse_version('2.1-rc2') < parse_version('2.1')
242 False236 True
243 >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')237 >>> parse_version('0.6a9dev-r41475') < parse_version('0.6a9')
244 True238 True
245239
246240
=== modified file 'pkg_resources.py'
--- pkg_resources.py 2013-01-15 21:13:37 +0000
+++ pkg_resources.py 2013-05-06 21:42:26 +0000
@@ -1936,7 +1936,7 @@
1936def _parse_version_parts(s):1936def _parse_version_parts(s):
1937 for part in component_re.split(s):1937 for part in component_re.split(s):
1938 part = replace(part,part)1938 part = replace(part,part)
1939 if part in ['', '.']:1939 if not part or part=='.':
1940 continue1940 continue
1941 if part[:1] in '0123456789':1941 if part[:1] in '0123456789':
1942 yield part.zfill(8) # pad for numeric comparison1942 yield part.zfill(8) # pad for numeric comparison
@@ -1979,6 +1979,8 @@
1979 parts = []1979 parts = []
1980 for part in _parse_version_parts(s.lower()):1980 for part in _parse_version_parts(s.lower()):
1981 if part.startswith('*'):1981 if part.startswith('*'):
1982 if part<'*final': # remove '-' before a prerelease tag
1983 while parts and parts[-1]=='*final-': parts.pop()
1982 # remove trailing zeros from each series of numeric parts1984 # remove trailing zeros from each series of numeric parts
1983 while parts and parts[-1]=='00000000':1985 while parts and parts[-1]=='00000000':
1984 parts.pop()1986 parts.pop()
19851987
=== modified file 'release.py'
--- release.py 2013-01-15 21:13:37 +0000
+++ release.py 2013-05-06 21:42:26 +0000
@@ -20,7 +20,7 @@
20except Exception:20except Exception:
21 pass21 pass
2222
23VERSION = '0.6.34'23VERSION = '0.6.36'
2424
25def get_next_version():25def get_next_version():
26 digits = map(int, VERSION.split('.'))26 digits = map(int, VERSION.split('.'))
@@ -50,7 +50,7 @@
50 # todo: consider getting this from .hgrc50 # todo: consider getting this from .hgrc
51 username = username or getpass.getuser()51 username = username or getpass.getuser()
52 keyring_username = '@@'.join((username, system))52 keyring_username = '@@'.join((username, system))
53 system = '@'.join((keyring_username, 'Mercurial'))53 system = 'Mercurial'
54 password = (54 password = (
55 keyring.get_password(system, keyring_username)55 keyring.get_password(system, keyring_username)
56 if 'keyring' in globals()56 if 'keyring' in globals()
5757
=== modified file 'setup.py'
--- setup.py 2013-01-15 21:13:37 +0000
+++ setup.py 2013-05-06 21:42:26 +0000
@@ -46,7 +46,7 @@
46init_file.close()46init_file.close()
4747
48SETUP_COMMANDS = d['__all__']48SETUP_COMMANDS = d['__all__']
49VERSION = "0.6.34"49VERSION = "0.6.36"
5050
51from setuptools import setup, find_packages51from setuptools import setup, find_packages
52from setuptools.command.build_py import build_py as _build_py52from setuptools.command.build_py import build_py as _build_py
@@ -141,7 +141,7 @@
141# return contents of reStructureText file with linked issue references141# return contents of reStructureText file with linked issue references
142def _linkified(rst_path):142def _linkified(rst_path):
143 bitroot = 'http://bitbucket.org/tarek/distribute'143 bitroot = 'http://bitbucket.org/tarek/distribute'
144 revision = re.compile(r'\b(issue\s*#?\d+)\b', re.M | re.I)144 revision = re.compile(r'\b(issue\s+#?\d+)\b', re.M | re.I)
145145
146 rst_file = open(rst_path)146 rst_file = open(rst_path)
147 rst_content = rst_file.read()147 rst_content = rst_file.read()
148148
=== modified file 'setuptools/command/easy_install.py'
--- setuptools/command/easy_install.py 2013-01-15 21:13:37 +0000
+++ setuptools/command/easy_install.py 2013-05-06 21:42:26 +0000
@@ -541,6 +541,10 @@
541 """Write all the scripts for `dist`, unless scripts are excluded"""541 """Write all the scripts for `dist`, unless scripts are excluded"""
542 if not self.exclude_scripts and dist.metadata_isdir('scripts'):542 if not self.exclude_scripts and dist.metadata_isdir('scripts'):
543 for script_name in dist.metadata_listdir('scripts'):543 for script_name in dist.metadata_listdir('scripts'):
544 if dist.metadata_isdir('scripts/' + script_name):
545 # The "script" is a directory, likely a Python 3
546 # __pycache__ directory, so skip it.
547 continue
544 self.install_script(548 self.install_script(
545 dist, script_name,549 dist, script_name,
546 dist.get_metadata('scripts/'+script_name)550 dist.get_metadata('scripts/'+script_name)
547551
=== modified file 'setuptools/tests/test_resources.py'
--- setuptools/tests/test_resources.py 2013-01-15 21:13:37 +0000
+++ setuptools/tests/test_resources.py 2013-05-06 21:42:26 +0000
@@ -477,13 +477,14 @@
477 p1, p2 = parse_version(s1),parse_version(s2)477 p1, p2 = parse_version(s1),parse_version(s2)
478 self.assertEqual(p1,p2, (s1,s2,p1,p2))478 self.assertEqual(p1,p2, (s1,s2,p1,p2))
479479
480 c('1.2-rc1', '1.2rc1')
480 c('0.4', '0.4.0')481 c('0.4', '0.4.0')
481 c('0.4.0.0', '0.4.0')482 c('0.4.0.0', '0.4.0')
482 c('0.4.0-0', '0.4-0')483 c('0.4.0-0', '0.4-0')
483 c('0pl1', '0.0pl1')484 c('0pl1', '0.0pl1')
484 c('0pre1', '0.0c1')485 c('0pre1', '0.0c1')
485 c('0.0.0preview1', '0c1')486 c('0.0.0preview1', '0c1')
486 c('0.0c1', '0rc1')487 c('0.0c1', '0-rc1')
487 c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')488 c('1.2a1', '1.2.a.1'); c('1.2...a', '1.2a')
488489
489 def testVersionOrdering(self):490 def testVersionOrdering(self):
@@ -492,14 +493,11 @@
492 self.assertTrue(p1<p2, (s1,s2,p1,p2))493 self.assertTrue(p1<p2, (s1,s2,p1,p2))
493494
494 c('2.1','2.1.1')495 c('2.1','2.1.1')
495 c('2.1.0','2.10')
496 c('2a1','2b0')496 c('2a1','2b0')
497 c('2b1','2c0')
498 c('2a1','2.1')497 c('2a1','2.1')
499 c('2.3a1', '2.3')498 c('2.3a1', '2.3')
500 c('2.1-1', '2.1-2')499 c('2.1-1', '2.1-2')
501 c('2.1-1', '2.1.1')500 c('2.1-1', '2.1.1')
502 c('2.1', '2.1.1-1')
503 c('2.1', '2.1pl4')501 c('2.1', '2.1pl4')
504 c('2.1a0-20040501', '2.1')502 c('2.1a0-20040501', '2.1')
505 c('1.1', '02.1')503 c('1.1', '02.1')
@@ -510,20 +508,8 @@
510 c('0.4', '4.0')508 c('0.4', '4.0')
511 c('0.0.4', '0.4.0')509 c('0.0.4', '0.4.0')
512 c('0pl1', '0.4pl1')510 c('0pl1', '0.4pl1')
511 c('2.1.0-rc1','2.1.0')
513 c('2.1dev','2.1a0')512 c('2.1dev','2.1a0')
514 c('2.1.0rc1','2.1.0')
515 c('2.1.0','2.1.0-rc0')
516 c('2.1.0','2.1.0-a')
517 c('2.1.0','2.1.0-alpha')
518 c('2.1.0','2.1.0-foo')
519 c('1.0','1.0-1')
520 c('1.0-1','1.0.1')
521 c('1.0a','1.0b')
522 c('1.0dev','1.0rc1')
523 c('1.0pre','1.0')
524 c('1.0pre','1.0')
525 c('1.0a','1.0-a')
526 c('1.0rc1','1.0-rc1')
527513
528 torture ="""514 torture ="""
529 0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1515 0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1

Subscribers

People subscribed via source and target branches

to all changes: