--- distribute-0.6.16.orig/distribute_setup.py +++ distribute-0.6.16/distribute_setup.py @@ -299,8 +299,7 @@ log.warn('Could not find the install location') return pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1]) - setuptools_file = 'setuptools-%s-py%s.egg-info' % \ - (SETUPTOOLS_FAKED_VERSION, pyver) + setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION pkg_info = os.path.join(placeholder, setuptools_file) if os.path.exists(pkg_info): log.warn('%s already exists', pkg_info) --- distribute-0.6.16.orig/setup.cfg +++ distribute-0.6.16/setup.cfg @@ -1,21 +1,19 @@ -[egg_info] -tag_build = -tag_svn_revision = 0 -tag_date = 0 - -[aliases] -release = egg_info -RDb '' -source = register sdist binary -binary = bdist_egg upload --show-response - -[build_sphinx] -source-dir = docs/ -build-dir = docs/build -all_files = 1 - -[upload_docs] -upload-dir = docs/build/html - -[sdist] -formats = gztar - +[egg_info] +tag_build = dev +tag_svn_revision = 1 + +[aliases] +release = egg_info -RDb '' +source = register sdist binary +binary = bdist_egg upload --show-response + +[build_sphinx] +source-dir = docs/ +build-dir = docs/build +all_files = 1 + +[upload_docs] +upload-dir = docs/build/html + +[sdist] +formats=gztar --- distribute-0.6.16.orig/setup.py +++ distribute-0.6.16/setup.py @@ -96,6 +96,15 @@ f.close() +console_scripts = ["easy_install = setuptools.command.easy_install:main"] +if 'XPYVERS' in os.environ: + for version in os.environ['XPYVERS'].split(): + console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" + % version) +else: + console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" + % sys.version[:3]) + # if we are installing Distribute using "python setup.py install" # we need to get setuptools out of the way def _easy_install_marker(): @@ -182,11 +191,7 @@ "dependency_links.txt = setuptools.command.egg_info:overwrite_arg", ], - "console_scripts": [ - "easy_install = setuptools.command.easy_install:main", - "easy_install-%s = setuptools.command.easy_install:main" - % sys.version[:3] - ], + "console_scripts": console_scripts, "setuptools.file_finders": ["svn_cvs = setuptools.command.sdist:_default_revctrl"], --- distribute-0.6.16.orig/pkg_resources.py +++ distribute-0.6.16/pkg_resources.py @@ -1773,7 +1773,8 @@ if '.' in packageName: parent = '.'.join(packageName.split('.')[:-1]) declare_namespace(parent) - __import__(parent) + if parent not in _namespace_packages: + __import__(parent) try: path = sys.modules[parent].__path__ except AttributeError: --- distribute-0.6.16.orig/debian/copyright +++ distribute-0.6.16/debian/copyright @@ -0,0 +1,333 @@ +This package was debianized by Matthias Klose on +Tue, 14 Dec 2004 12:45:14 +0100. + +It was downloaded from +http://pypi.python.org/pypi/distribute/ + +Copyright: + +Upstream Author: Phillip J. Eby, Tarek Ziade and the distutils SIG + +License: + +PSF or ZPL (both appended in this file) + + +PSF +------------------------------------------------------------------------------ + +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PSF LICENSE AGREEMENT FOR PYTHON 2.3 +------------------------------------ + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using Python 2.3 software in source or binary form and its +associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 2.3 +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002 Python Software Foundation; All Rights Reserved" are +retained in Python 2.3 alone or in any derivative version prepared by +Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 2.3 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 2.3. + +4. PSF is making Python 2.3 available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python 2.3, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + +Zope Public License (ZPL) Version 2.1 +------------------------------------------------------------------------------ + +A copyright notice accompanies this license document that +identifies the copyright holders. + +This license has been certified as open source. It has also +been designated as GPL compatible by the Free Software +Foundation (FSF). + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions in source code must retain the + accompanying copyright notice, this list of conditions, + and the following disclaimer. + +2. Redistributions in binary form must reproduce the accompanying + copyright notice, this list of conditions, and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +3. Names of the copyright holders must not be used to + endorse or promote products derived from this software + without prior written permission from the copyright + holders. + +4. The right to distribute this software or to use it for + any purpose does not give you the right to use + Servicemarks (sm) or Trademarks (tm) of the copyright + holders. Use of them is covered by separate agreement + with the copyright holders. + +5. If any files are modified, you must cause the modified + files to carry prominent notices stating that you changed + the files and the date of any change. + +Disclaimer + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' + AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT + NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + NO EVENT SHALL THE COPYRIGHT HOLDERS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. --- distribute-0.6.16.orig/debian/control +++ distribute-0.6.16/debian/control @@ -0,0 +1,96 @@ +Source: distribute +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthias Klose +Build-Depends-Indep: python-all-dev (>= 2.6.6-2~), python3-all-dev (>= 3.1.2-8~), python-sphinx +Build-Depends: debhelper (>= 5.0.37.1) +XS-Python-Version: 2.7 +Standards-Version: 3.9.1 +Homepage: http://packages.python.org/distribute + +#Package: python-distribute +#Architecture: all +#Depends: ${python:Depends}, python-setuptools (= ${binary:Version}), ${misc:Depends} +#Suggests: python-distribute-doc +#Provides: ${python:Provides} +#XB-Python-Version: ${python:Versions} +#Description: Python Distutils Enhancements (based on distribute) +# Extensions to the Python distutils for large or complex distributions. +# . +# distribute is a "fork" of setuptools, which is supposed to replace setuptools. +# This package only contains the distribute egg. + +Package: python-pkg-resources +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Suggests: python-distribute, python-distribute-doc +Conflicts: python2.3-setuptools (<< 0.6b2), python2.4-setuptools (<< 0.6b2), python-setuptools (<< 0.6c8-3) +Replaces: python2.3-setuptools, python2.4-setuptools +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Package Discovery and Resource Access using pkg_resources + The pkg_resources module provides an API for Python libraries to + access their resource files, and for extensible applications and + frameworks to automatically discover plugins. It also provides + runtime support for using C extensions that are inside zipfile-format + eggs, support for merging packages that have separately-distributed + modules or subpackages, and APIs for managing Python's current + "working set" of active packages. + +Package: python-setuptools +Architecture: all +Depends: ${python:Depends}, python-pkg-resources (= ${binary:Version}), ${misc:Depends} +Conflicts: python2.3-setuptools (<< 0.6b2), python2.4-setuptools (<< 0.6b2), python-distribute (<< 0.7) +Replaces: python2.3-setuptools, python2.4-setuptools, python-distribute (<< 0.6.6) +Provides: ${python:Provides}, python-distribute +XB-Python-Version: ${python:Versions} +Description: Python Distutils Enhancements (setuptools compatibility) + Extensions to the python-distutils for large or complex distributions. + . + Package providing compatibility with old setuptools (0.6c9). + +Package: python-distribute-doc +Architecture: all +Section: doc +Depends: libjs-jquery, ${misc:Depends} +Description: Python Distutils Enhancements (based on distribute), documentation + Extensions to the Python distutils for large or complex distributions. + The package contains the documentation in html format. + . + distribute is a "fork" of setuptools, which is supposed to replace setuptools. + +#Package: python3-distribute +#Architecture: all +#Depends: ${python:Depends}, python3-pkg-resources (= ${binary:Version}), ${misc:Depends} +#Provides: ${python:Provides} +#XB-Python-Version: ${python:Versions} +#Description: Python3 Distutils Enhancements (based on distribute) +# Extensions to the Python3 distutils for large or complex distributions. +# . +# distribute is a "fork" of setuptools, which is supposed to replace setuptools. + +Package: python3-pkg-resources +Architecture: all +Depends: ${python3:Depends}, ${misc:Depends} +Provides: ${python3:Provides} +Suggests: python3-setuptools +Conflicts: python-pkg-resources (= 0.6.10-2) +Description: Package Discovery and Resource Access using pkg_resources + The pkg_resources module provides an API for Python libraries to + access their resource files, and for extensible applications and + frameworks to automatically discover plugins. It also provides + runtime support for using C extensions that are inside zipfile-format + eggs, support for merging packages that have separately-distributed + modules or subpackages, and APIs for managing Python's current + "working set" of active packages. + +Package: python3-setuptools +Architecture: all +Depends: ${python3:Depends}, python3-pkg-resources (= ${binary:Version}), ${misc:Depends} +Provides: ${python3:Provides} +Conflicts: python-setuptools (= 0.6.10-2) +Description: Python3 Distutils Enhancements (setuptools compatibility) + Extensions to the python-distutils for large or complex distributions. + . + Package providing compatibility with old setuptools (0.6c9). --- distribute-0.6.16.orig/debian/rules +++ distribute-0.6.16/debian/rules @@ -0,0 +1,184 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# setuptools doesn't handle translated messages +export LC_ALL=C + +#PYVERS := 2.3 2.5 $(shell pyversions -vr debian/control) +XPYVERS := 2.6 2.7 +PYVERS := 2.6 2.7 +PYVERS3 := 3.2 +PYVER := $(shell python -c 'import sys; print sys.version[:3]') +SETUPTOOLSVER=0.6c11 +export XPYVERS + +include /usr/share/python3/python.mk + +pname = $(if $(findstring 3.,$(2)),$(subst python-,python3-,$(1)),$(1)) + +p_dist = python-distribute +p_pkgr = python-pkg-resources +p_setp = python-setuptools +p_doc = python-distribute-doc + +d_dist = debian/$(p_dist) +d_pkgr = debian/$(p_pkgr) +d_setp = debian/$(p_setp) +d_doc = debian/$(p_doc) + +build: build-stamp +build-stamp: $(PYVERS:%=build-python%) $(PYVERS3:%=build-python%) build-doc-stamp + touch $@ +build-doc-stamp: + $(MAKE) -C docs html + touch $@ +build-python%: + python$* setup.py build + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-python* build-doc-stamp build-stamp + rm -rf build dist + -find -name '*.py[co]' | xargs rm -f + rm -rf docs/build + dh_clean + +install: build install-prereq $(PYVERS:%=install-python%) $(PYVERS3:%=install-python%) + find debian -name 'setuptools_boot.py*' | xargs -r rm -f + find debian -name '*.py[co]' | xargs -r rm -f + pkgs=$$(dh_listpackages); cd debian && find $$pkgs -mindepth 1 -type d -empty -print -delete + + rm -f debian/python-*/usr/bin/easy_install-3* + rm -f debian/python3-*/usr/bin/easy_install-2* + mv debian/python3-setuptools/usr/bin/easy_install \ + debian/python3-setuptools/usr/bin/easy_install3 + + : # Replace all '#!' calls to python with $(PYTHON) + : # and make them executable + for i in \ + `find debian/python-*/usr/lib debian/python-*/usr/bin -type f`; \ + do \ + case "$$i" in *-[0-9].[0-9]) continue; esac; \ + sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + + for i in \ + `find debian/python3-*/usr/lib debian/python3-*/usr/bin -type f`; \ + do \ + case "$$i" in *-[0-9].[0-9]) continue; esac; \ + sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python3\1,' \ + $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod 755 $$i; \ + echo "fixed interpreter: $$i"; \ + fi; \ + done + +install-prereq: + dh_testdir + dh_testroot + dh_clean -k + +install-python%: + dh_installdirs -A usr/bin /$(call py_libdir,$*) + python$* setup.py install \ + --root=$(CURDIR)/$(call pname,$(d_setp),$*) --install-layout=deb + + mv $(call pname,$(d_setp),$*)/$(call py_libdir,$*)/pkg_resources.py \ + $(call pname,$(d_pkgr),$*)/$(call py_libdir,$*)/ + +# mv $(call pname,$(d_setp),$*)/$(call py_libdir,$*)/distribute-*.egg-info \ +# $(call pname,$(d_dist),$*)/$(call py_libdir,$*)/ + + mv $(call pname,$(d_setp),$*)/$(call py_libdir,$*)/setuptools-$(SETUPTOOLSVER).egg-info \ + $(call pname,$(d_setp),$*)/$(call py_libdir,$*)/setuptools.egg-info + + rm -f $(call pname,$(d_dist),$*)/$(call py_libdir,$*)/setuptools.pth + echo setuptools-$(SETUPTOOLSVER).egg-info \ + > $(call pname,$(d_setp),$*)/$(call py_libdir,$*)/setuptools.pth + +binary-arch: + +binary-indep: build install + dh_testdir + dh_testroot +# dh_installchangelogs -p$(p_dist) CHANGES.txt +# dh_installchangelogs -N$(p_dist) + dh_installchangelogs -p$(p_setp) CHANGES.txt + dh_installchangelogs -N$(p_setp) + dh_installdocs -N$(p_setp) -N$(p_pkgr) + dh_installdocs -p$(p_pkgr) docs/pkg_resources.txt + dh_installdocs -p$(p_setp) -Xpkg_resources docs/*.txt + mkdir -p $(d_doc)/usr/share/doc/$(p_dist) + cp -pr docs/build/html $(d_doc)/usr/share/doc/$(p_dist)/ + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_doc)/html \ + /usr/share/doc/$(p_dist)/html /usr/share/doc/$(p_setp)/html \ + /usr/share/javacript/jquery/jquery.js /usr/share/doc/$(p_dist)/html/_static/jquery.js + dh_compress -i + dh_fixperms -i + + for v in $(filter-out 3.%, $(PYVERS)); do \ + sed -i "s/python2\../python$$v/g" $(d_setp)/usr/bin/easy_install-$$v; \ + done +# for v in $(filter-out 2.%, $(PYVERS)); do \ +# sed -i "s/python3\../python$$v/g" debian/$(call pname,$(p_setp),3.1)/usr/bin/easy_install-$$v; \ +# done + + dh_python2 -p$(p_pkgr) -p$(p_setp) #-p$(p_dist) + cat $(d_setp).substvars + ( \ + echo 'python:Versions=2.6, 2.7'; \ + echo 'python:Provides=python2.6-setuptools, python2.7-setuptools'; \ + echo 'python:Depends=python (>= 2.6), python (<< 2.8)'; \ + ) > $(d_setp).substvars + cp $(d_setp).substvars $(d_pkgr).substvars + + dh_python3 -p$(call pname,$(p_pkgr),3.2) -p$(call pname,$(p_setp),3.2) # -p$(call pname,$(p_dist),3.2) + cat debian/$(call pname,$(p_setp),3.2).substvars + cat debian/$(call pname,$(p_pkgr),3.2).substvars + +## cp $(d_setp).substvars $(d_dist).substvars + + ( \ + echo 'python3:Versions=3.2'; \ + echo 'python3:Provides=python3.2-setuptools'; \ + echo 'python3:Depends=python3 (>= 3.1.2-8~)'; \ + ) > $(call pname,$(d_setp),3.2).substvars + cp $(call pname,$(d_setp),3.2).substvars $(call pname,$(d_pkgr),3.2).substvars + + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install --- distribute-0.6.16.orig/debian/watch +++ distribute-0.6.16/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pypi.python.org/packages/source/d/distribute/distribute-([0-9.]*).tar.gz --- distribute-0.6.16.orig/debian/changelog +++ distribute-0.6.16/debian/changelog @@ -0,0 +1,290 @@ +distribute (0.6.16-1ubuntu0.2) oneiric-proposed; urgency=low + + * pkg_resources.py: + - add declare_namespace fix from 0.6.18 (LP: #938786) + + -- Bobby R. Ward Sun, 26 Feb 2012 16:34:13 -0600 + +distribute (0.6.16-1ubuntu0.1) oneiric-proposed; urgency=low + + * setuptools/package_index.py: + - add easy_install HTTPMessage fix from 0.6.19 (LP: #910965) + + -- Julian Taylor Tue, 14 Feb 2012 23:28:12 -0800 + +distribute (0.6.16-1) unstable; urgency=medium + + * New upstream version. + * Support Python >=3.1.4 and >=3.2.1. + + -- Matthias Klose Fri, 20 May 2011 11:30:25 +0200 + +distribute (0.6.15-2) unstable; urgency=low + + * Stop building for python2.5 and python3.1. + + -- Matthias Klose Mon, 18 Apr 2011 21:58:45 +0200 + +distribute (0.6.15-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 21 Mar 2011 01:37:31 +0100 + +distribute (0.6.14-5) experimental; urgency=low + + * Build for python 2.7 and 3.2. + + -- Matthias Klose Thu, 14 Oct 2010 15:45:57 +0200 + +distribute (0.6.14-4) unstable; urgency=low + + * Upload to unstable. + + -- Matthias Klose Wed, 06 Oct 2010 01:54:38 +0200 + +distribute (0.6.14-3) experimental; urgency=low + + * Tighten build dependency on python3, remove b-d on python-central. + + -- Matthias Klose Sun, 12 Sep 2010 16:56:04 +0200 + +distribute (0.6.14-2) experimental; urgency=low + + * For python3, install into /usr/lib/python3/dist-packages by + default, when setup.py install is called with --install-layout=deb. + + -- Matthias Klose Thu, 09 Sep 2010 19:04:09 +0200 + +distribute (0.6.14-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 17 Jul 2010 13:41:28 +0200 + +distribute (0.6.10-4) unstable; urgency=low + + * Don't include 3.1 related files in the filelists of python-* packages. + Closes: #574153. + + -- Matthias Klose Thu, 18 Mar 2010 12:27:47 +0100 + +distribute (0.6.10-3) unstable; urgency=low + + * Don't ship the python3 files in the python-* packages. Closes: #574079. + + -- Matthias Klose Tue, 16 Mar 2010 08:23:18 +0100 + +distribute (0.6.10-2) unstable; urgency=low + + * Build packages for python3.1. + + -- Matthias Klose Sun, 14 Mar 2010 16:51:00 +0100 + +distribute (0.6.10-1) unstable; urgency=low + + * New upstream version. + * Stop building for python2.4. Closes: #557000. + + -- Matthias Klose Mon, 28 Dec 2009 23:52:40 +0100 + +distribute (0.6.8-1) unstable; urgency=low + + * New upstream version. + * Stop building for python2.4. Closes: #557000. + + -- Matthias Klose Thu, 12 Nov 2009 02:12:16 +0100 + +distribute (0.6.6-1) unstable; urgency=low + + * New upstream version. + * Don't build python-distribute (yet). Move the egg-info into + python-setuptools. Closes: #552154. + + -- Matthias Klose Sat, 24 Oct 2009 13:13:23 +0200 + +distribute (0.6.4-1) unstable; urgency=low + + * Build python-setuptools from the `distribute' fork. + + -- Matthias Klose Tue, 20 Oct 2009 00:12:26 +0200 + +python-setuptools (0.6c9-0ubuntu5) karmic; urgency=low + + * Fix building extensions with recent python 2.6.2+. Patch taken from + http://bitbucket.org/tarek/distribute/issue/41/. LP: #428004. + + -- Matthias Klose Sun, 13 Sep 2009 12:11:58 +0200 + +python-setuptools (0.6c9-0ubuntu4) jaunty; urgency=low + + * Update the installation schemes in easy_install to follow the modified + distutils install command: + - When the --prefix option is used for setup.py install, Use the + `posix' scheme. LP: #344410. + - Use the `deb_system' scheme if --install-layout=deb is specified. + - Use the the `unix_local' scheme if neither --install-layout=deb + nor --prefix is specified. + * Always use the `posix' scheme for setup.py install in a virtualenv + setup. LP: #339904. + * Error out when easy_install tries to install into /usr, unless the + (new) option --force-installation-into-system-dir is given (heh, this + option name is even longer than --single-version-externally-managed). + + -- Matthias Klose Sat, 04 Apr 2009 13:13:59 +0200 + +python-setuptools (0.6c9-0ubuntu3) jaunty; urgency=low + + * Fix interpreter name for the easy_install-2.6 script. LP: #332656. + + -- Matthias Klose Sun, 22 Feb 2009 22:25:32 +0100 + +python-setuptools (0.6c9-0ubuntu2) jaunty; urgency=low + + * Rebuild to add python2.6 support. + + -- Matthias Klose Wed, 18 Feb 2009 19:05:11 +0100 + +python-setuptools (0.6c9-0ubuntu1) intrepid; urgency=low + + * New upstream version (bug fixes from the stable branch). + - Adds subversion 1.5 compatibility. LP: #262636. + + -- Matthias Klose Thu, 25 Sep 2008 10:40:35 +0200 + +python-setuptools (0.6c8-4) unstable; urgency=low + + * Don't break with subversion-1.5. Closes: #489263. + + -- Matthias Klose Sat, 12 Jul 2008 09:25:36 +0200 + +python-setuptools (0.6c8-3) unstable; urgency=low + + * Move site.py into the python-pkg-resources package. + + -- Matthias Klose Wed, 09 Apr 2008 22:44:47 +0200 + +python-setuptools (0.6c8-2) unstable; urgency=low + + * python-pkg-resources: Conflict with python-setuptools. Closes: #468944. + + -- Matthias Klose Sun, 02 Mar 2008 15:34:10 +0100 + +python-setuptools (0.6c8-1) unstable; urgency=low + + * New upstream version. Closes: #467012. + * Split out a python-pkg-resources package (to be used as a runtime + dependency instead of python-setuptools). + + -- Matthias Klose Fri, 29 Feb 2008 01:20:15 +0100 + +python-setuptools (0.6c7-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Fri, 02 Nov 2007 10:57:34 -0400 + +python-setuptools (0.6c6-1) unstable; urgency=low + + * New upstream version (release candidate 6). Closes: #433556. + + -- Matthias Klose Wed, 25 Jul 2007 02:11:49 +0200 + +python-setuptools (0.6c5-1ubuntu1) feisty; urgency=low + + * Use the unversioned interpreter name for scripts without + version suffix. Ubuntu #94309. + + -- Matthias Klose Thu, 29 Mar 2007 10:18:33 +0000 + +python-setuptools (0.6c5-1) unstable; urgency=low + + * New upstream version (release candidate 5). + + -- Matthias Klose Wed, 17 Jan 2007 18:00:39 +0000 + +python-setuptools (0.6c3-3) unstable; urgency=low + + * Drop 2.3. + + -- Matthias Klose Tue, 24 Oct 2006 00:47:58 +0200 + +python-setuptools (0.6c3-2) unstable; urgency=low + + * Build for 2.3, 2.4, 2.5. + + -- Matthias Klose Sun, 22 Oct 2006 22:03:03 +0000 + +python-setuptools (0.6c3-1) unstable; urgency=medium + + * New upstream version (release candidate 3). Closes: #389780. + + -- Matthias Klose Wed, 4 Oct 2006 00:49:36 +0200 + +python-setuptools (0.6c2-1) unstable; urgency=low + + * New upstream version (release candidate 2). Closes: #382573. + * /usr/bin/easy_install-2.3: Use python2.3 s interpreter. Closes: #386318. + + -- Matthias Klose Fri, 8 Sep 2006 03:19:43 +0200 + +python-setuptools (0.6b3-3) unstable; urgency=low + + * Workaround #375437. + + -- Matthias Klose Mon, 3 Jul 2006 14:08:53 +0000 + +python-setuptools (0.6b3-2) unstable; urgency=low + + * Add entry points for all versioned console scripts. Closes: #375975. + + -- Matthias Klose Sun, 2 Jul 2006 15:14:35 +0000 + +python-setuptools (0.6b3-1) unstable; urgency=low + + * New upstream version (closes: #354621). + - OverflowError for amd64 build fixed (closes: #352176). + + -- Matthias Klose Fri, 9 Jun 2006 22:14:10 +0200 + +python-setuptools (0.6a8-0.1) unstable; urgency=low + + * NMU with maintainer approval + * New upstream release + * debian/rules: Create setuptools.pth to instruct python where the + module is located. Closes: #330562 + + -- Otavio Salvador Thu, 24 Nov 2005 19:26:43 -0200 + +python-setuptools (0.6a6-1) unstable; urgency=low + + * New upstream version (closes: #335101). + + -- Matthias Klose Sun, 23 Oct 2005 13:14:22 +0000 + +python-setuptools (0.6a2-0.1) unstable; urgency=low + + * NMU with maintainer approval + * New upstream release + * Include a watch file to be easier to upgrade next time + * Bump Standards-Version to 3.6.2 (no changes need) + * Use Build-Depends-Indep since we don't build architecture dependent + packages + * Don't remove setuptools.egg-info directory on clean target since it's + used now on building system since it use entry_points feature to its + install + + -- Otavio Salvador Sat, 24 Sep 2005 17:00:56 -0300 + +python-setuptools (0.5a13-1) unstable; urgency=low + + * New upstream version 0.5a13. + + -- Matthias Klose Mon, 18 Jul 2005 12:58:21 +0200 + +python-setuptools (0.0.1.041214-0ubuntu1) hoary; urgency=low + + * Initial Release. + + -- Matthias Klose Tue, 14 Dec 2004 12:45:14 +0100 + --- distribute-0.6.16.orig/debian/compat +++ distribute-0.6.16/debian/compat @@ -0,0 +1 @@ +5 --- distribute-0.6.16.orig/debian/README.Debian +++ distribute-0.6.16/debian/README.Debian @@ -0,0 +1,6 @@ +python-setuptools for Debian +---------------------------- + +Snapshot, taken from the sandbox CVS. + + -- Matthias Klose , Tue, 14 Dec 2004 12:45:14 +0100 --- distribute-0.6.16.orig/docs/setuptools.txt +++ distribute-0.6.16/docs/setuptools.txt @@ -2519,7 +2519,7 @@ Your function should accept three arguments: the ``Distribution`` object, the attribute name, and the attribute value. It should raise a -``DistutilsSetupError`` (from the ``distutils.error`` module) if the argument +``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument is invalid. Remember, your function will only be called with non-None values, and the default value of arguments defined this way is always None. So, your commands should always be prepared for the possibility that the attribute will --- distribute-0.6.16.orig/setuptools/package_index.py +++ distribute-0.6.16/setuptools/package_index.py @@ -579,7 +579,9 @@ bs = self.dl_blocksize size = -1 if "content-length" in headers: - size = int(headers["Content-Length"]) + # Some servers return multiple Content-Length headers :( + content_length = headers.get("Content-Length") + size = int(content_length) self.reporthook(url, filename, blocknum, bs, size) tfp = open(filename,'wb') while True: --- distribute-0.6.16.orig/setuptools/command/install_egg_info.py +++ distribute-0.6.16/setuptools/command/install_egg_info.py @@ -1,7 +1,7 @@ from setuptools import Command from setuptools.archive_util import unpack_archive from distutils import log, dir_util -import os, shutil, pkg_resources +import os, sys, shutil, pkg_resources class install_egg_info(Command): """Install an .egg-info directory for the package""" @@ -14,13 +14,30 @@ def initialize_options(self): self.install_dir = None + self.install_layout = None + self.prefix_option = None def finalize_options(self): self.set_undefined_options('install_lib',('install_dir','install_dir')) + self.set_undefined_options('install',('install_layout','install_layout')) + if sys.hexversion > 0x2060000: + self.set_undefined_options('install',('prefix_option','prefix_option')) ei_cmd = self.get_finalized_command("egg_info") basename = pkg_resources.Distribution( None, None, ei_cmd.egg_name, ei_cmd.egg_version ).egg_name()+'.egg-info' + + if self.install_layout: + if not self.install_layout.lower() in ['deb']: + raise DistutilsOptionError( + "unknown value for --install-layout") + basename = basename.replace('-py%s' % pkg_resources.PY_MAJOR, '') + elif self.prefix_option or 'real_prefix' in sys.__dict__: + # don't modify for virtualenv + pass + else: + basename = basename.replace('-py%s' % pkg_resources.PY_MAJOR, '') + self.source = ei_cmd.egg_info self.target = os.path.join(self.install_dir, basename) self.outputs = [self.target] --- distribute-0.6.16.orig/setuptools/command/easy_install.py +++ distribute-0.6.16/setuptools/command/easy_install.py @@ -104,13 +104,15 @@ ('allow-hosts=', 'H', "pattern(s) that hostnames must match"), ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"), ('version', None, "print version information and exit"), + ('install-layout=', None, "installation layout to choose (known values: deb)"), + ('force-installation-into-system-dir', '0', "force installation into /usr"), ('no-find-links', None, "Don't load find-links defined in packages being installed") ] boolean_options = [ 'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy', 'delete-conflicting', 'ignore-conflicts-at-my-risk', 'editable', - 'no-deps', 'local-snapshots-ok', 'version' + 'no-deps', 'local-snapshots-ok', 'version', 'force-installation-into-system-dir' ] if HAS_USER_SITE: @@ -164,6 +166,10 @@ self.site_dirs = None self.installed_projects = {} self.sitepy_installed = False + # enable custom installation, known values: deb + self.install_layout = None + self.force_installation_into_system_dir = None + # Always read easy_install options, even if we are subclassed, or have # an independent instance created. This ensures that defaults will # always come from the standard configuration file(s)' "easy_install" @@ -227,6 +233,10 @@ self.expand_basedirs() self.expand_dirs() + if self.install_layout: + if not self.install_layout.lower() in ['deb']: + raise DistutilsOptionError("unknown value for --install-layout") + self._expand('install_dir','script_dir','build_directory','site_dirs') # If a non-default installation directory was specified, default the # script directory to match it. @@ -250,6 +260,15 @@ if self.user and self.install_purelib: self.install_dir = self.install_purelib self.script_dir = self.install_scripts + + if self.prefix == '/usr' and not self.force_installation_into_system_dir: + raise DistutilsOptionError("""installation into /usr + +Trying to install into the system managed parts of the file system. Please +consider to install to another location, or use the option +--force-installation-into-system-dir to overwrite this warning. +""") + # default --record from the install command self.set_undefined_options('install', ('record', 'record')) normpath = map(normalize_path, sys.path) @@ -1274,11 +1293,28 @@ + if sys.version[:3] in ('2.3', '2.4', '2.5') or 'real_prefix' in sys.__dict__: + sitedir_name = 'site-packages' + else: + sitedir_name = 'dist-packages' + INSTALL_SCHEMES = dict( posix = dict( install_dir = '$base/lib/python$py_version_short/site-packages', script_dir = '$base/bin', ), + unix_local = dict( + install_dir = '$base/local/lib/python$py_version_short/%s' % sitedir_name, + script_dir = '$base/local/bin', + ), + posix_local = dict( + install_dir = '$base/local/lib/python$py_version_short/%s' % sitedir_name, + script_dir = '$base/local/bin', + ), + deb_system = dict( + install_dir = '$base/lib/python3/%s' % sitedir_name, + script_dir = '$base/bin', + ), ) DEFAULT_SCHEME = dict( @@ -1289,11 +1325,18 @@ def _expand(self, *attrs): config_vars = self.get_finalized_command('install').config_vars - if self.prefix: + if self.prefix or self.install_layout: + if self.install_layout and self.install_layout.lower() in ['deb']: + scheme_name = "deb_system" + self.prefix = '/usr' + elif self.prefix or 'real_prefix' in sys.__dict__: + scheme_name = os.name + else: + scheme_name = "posix_local" # Set default install_dir/scripts from --prefix config_vars = config_vars.copy() config_vars['base'] = self.prefix - scheme = self.INSTALL_SCHEMES.get(os.name,self.DEFAULT_SCHEME) + scheme = self.INSTALL_SCHEMES.get(scheme_name,self.DEFAULT_SCHEME) for attr,val in scheme.items(): if getattr(self,attr,None) is None: setattr(self,attr,val) @@ -1332,9 +1375,14 @@ "site-packages"), os.path.join(prefix, "lib", "site-python")]) else: + if sys.version[:3] in ('2.3', '2.4', '2.5'): + sdir = "site-packages" + else: + sdir = "dist-packages" sitedirs.extend( - [prefix, os.path.join(prefix, "lib", "site-packages")] - ) + [os.path.join(prefix, "local/lib", "python" + sys.version[:3], sdir), + os.path.join(prefix, "lib", "python" + sys.version[:3], sdir)] + ) if sys.platform == 'darwin': # for framework builds *only* we add the standard Apple # locations. Currently only per-user, but /Library and @@ -1590,6 +1638,11 @@ def get_script_header(script_text, executable=sys_executable, wininst=False): """Create a #! line, getting options (if any) from script_text""" from distutils.command.build_scripts import first_line_re + + # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern. + if not isinstance(first_line_re.pattern, str): + first_line_re = re.compile(first_line_re.pattern.decode()) + first = (script_text+'\n').splitlines()[0] match = first_line_re.match(first) options = '' --- distribute-0.6.16.orig/setuptools/tests/test_resources.py +++ distribute-0.6.16/setuptools/tests/test_resources.py @@ -3,7 +3,7 @@ # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove from unittest import TestCase, makeSuite; from pkg_resources import * from setuptools.command.easy_install import get_script_header, is_sh -import os, pkg_resources, sys, StringIO +import os, pkg_resources, sys, StringIO, tempfile, shutil try: frozenset except NameError: from sets import ImmutableSet as frozenset @@ -563,3 +563,29 @@ sys.platform = platform sys.stdout = stdout + + + +class NamespaceTests(TestCase): + + def setUp(self): + self._ns_pkgs = pkg_resources._namespace_packages.copy() + self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-") + sys.path.append(self._tmpdir) + + def tearDown(self): + shutil.rmtree(self._tmpdir) + pkg_resources._namespace_packages = self._ns_pkgs.copy() + sys.path.remove(self._tmpdir) + + def test_two_levels_deep(self): + os.makedirs(os.path.join(self._tmpdir, "pkg1", "pkg2")) + declare_namespace("pkg1") + self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys()) + try: + declare_namespace("pkg1.pkg2") + except ImportError, e: + self.fail("Distribute tried to import the parent namespace package") + self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys()) + self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"]) + --- distribute-0.6.16.orig/distribute.egg-info/PKG-INFO +++ distribute-0.6.16/distribute.egg-info/PKG-INFO @@ -1,549 +1,549 @@ -Metadata-Version: 1.0 -Name: distribute -Version: 0.6.16 -Summary: Easily download, build, install, upgrade, and uninstall Python packages -Home-page: http://packages.python.org/distribute -Author: The fellowship of the packaging -Author-email: distutils-sig@python.org -License: PSF or ZPL -Description: =============================== - Installing and Using Distribute - =============================== - - .. contents:: **Table of Contents** - - ----------- - Disclaimers - ----------- - - About the fork - ============== - - `Distribute` is a fork of the `Setuptools` project. - - Distribute is intended to replace Setuptools as the standard method - for working with Python module distributions. - - The fork has two goals: - - - Providing a backward compatible version to replace Setuptools - and make all distributions that depend on Setuptools work as - before, but with less bugs and behaviorial issues. - - This work is done in the 0.6.x series. - - Starting with version 0.6.2, Distribute supports Python 3. - Installing and using distribute for Python 3 code works exactly - the same as for Python 2 code, but Distribute also helps you to support - Python 2 and Python 3 from the same source code by letting you run 2to3 - on the code as a part of the build process, by setting the keyword parameter - ``use_2to3`` to True. See http://packages.python.org/distribute for more - information. - - - Refactoring the code, and releasing it in several distributions. - This work is being done in the 0.7.x series but not yet released. - - The roadmap is still evolving, and the page that is up-to-date is - located at : `http://packages.python.org/distribute/roadmap`. - - If you install `Distribute` and want to switch back for any reason to - `Setuptools`, get to the `Uninstallation instructions`_ section. - - More documentation - ================== - - You can get more information in the Sphinx-based documentation, located - at http://packages.python.org/distribute. This documentation includes the old - Setuptools documentation that is slowly replaced, and brand new content. - - About the installation process - ============================== - - The `Distribute` installer modifies your installation by de-activating an - existing installation of `Setuptools` in a bootstrap process. This process - has been tested in various installation schemes and contexts but in case of a - bug during this process your Python installation might be left in a broken - state. Since all modified files and directories are copied before the - installation starts, you will be able to get back to a normal state by reading - the instructions in the `Uninstallation instructions`_ section. - - In any case, it is recommended to save you `site-packages` directory before - you start the installation of `Distribute`. - - ------------------------- - Installation Instructions - ------------------------- - - Distribute is only released as a source distribution. - - It can be installed using pip, and can be done so with the source tarball, - or by using the ``distribute_setup.py`` script provided online. - - ``distribute_setup.py`` is the simplest and preferred way on all systems. - - distribute_setup.py - =================== - - Download - `distribute_setup.py `_ - and execute it, using the Python interpreter of your choice. - - If your shell has the ``curl`` program you can do:: - - $ curl -O http://python-distribute.org/distribute_setup.py - $ python distribute_setup.py - - Notice this file is also provided in the source release. - - pip - === - - Run easy_install or pip:: - - $ pip install distribute - - Source installation - =================== - - Download the source tarball, uncompress it, then run the install command:: - - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.15.tar.gz - $ tar -xzvf distribute-0.6.15.tar.gz - $ cd distribute-0.6.15 - $ python setup.py install - - --------------------------- - Uninstallation Instructions - --------------------------- - - Like other distutils-based distributions, Distribute doesn't provide an - uninstaller yet. It's all done manually! We are all waiting for PEP 376 - support in Python. - - Distribute is installed in three steps: - - 1. it gets out of the way an existing installation of Setuptools - 2. it installs a `fake` setuptools installation - 3. it installs distribute - - Distribute can be removed like this: - - - remove the ``distribute*.egg`` file located in your site-packages directory - - remove the ``setuptools.pth`` file located in you site-packages directory - - remove the easy_install script located in you ``sys.prefix/bin`` directory - - remove the ``setuptools*.egg`` directory located in your site-packages directory, - if any. - - If you want to get back to setuptools: - - - reinstall setuptools using its instruction. - - Lastly: - - - remove the *.OLD.* directory located in your site-packages directory if any, - **once you have checked everything was working correctly again**. - - ------------------------- - Quick help for developers - ------------------------- - - To create an egg which is compatible with Distribute, use the same - practice as with Setuptools, e.g.:: - - from setuptools import setup - - setup(... - ) - - To use `pkg_resources` to access data files in the egg, you should - require the Setuptools distribution explicitly:: - - from setuptools import setup - - setup(... - install_requires=['setuptools'] - ) - - Only if you need Distribute-specific functionality should you depend - on it explicitly. In this case, replace the Setuptools dependency:: - - from setuptools import setup - - setup(... - install_requires=['distribute'] - ) - - ----------- - Install FAQ - ----------- - - - **Why is Distribute wrapping my Setuptools installation?** - - Since Distribute is a fork, and since it provides the same package - and modules, it renames the existing Setuptools egg and inserts a - new one which merely wraps the Distribute code. This way, full - backwards compatibility is kept for packages which rely on the - Setuptools modules. - - At the same time, packages can meet their dependency on Setuptools - without actually installing it (which would disable Distribute). - - - **How does Distribute interact with virtualenv?** - - Everytime you create a virtualenv it will install setuptools by default. - You either need to re-install Distribute in it right after or pass the - ``--distribute`` option when creating it. - - Once installed, your virtualenv will use Distribute transparently. - - Although, if you have Setuptools installed in your system-wide Python, - and if the virtualenv you are in was generated without the `--no-site-packages` - option, the Distribute installation will stop. - - You need in this case to build a virtualenv with the `--no-site-packages` - option or to install `Distribute` globally. - - - **How does Distribute interacts with zc.buildout?** - - You can use Distribute in your zc.buildout, with the --distribute option, - starting at zc.buildout 1.4.2:: - - $ python bootstrap.py --distribute - - For previous zc.buildout versions, *the only thing* you need to do - is use the bootstrap at `http://python-distribute.org/bootstrap.py`. Run - that bootstrap and ``bin/buildout`` (and all other buildout-generated - scripts) will transparently use distribute instead of setuptools. You do - not need a specific buildout release. - - A shared eggs directory is no problem (since 0.6.6): the setuptools egg is - left in place unmodified. So other buildouts that do not yet use the new - bootstrap continue to work just fine. And there is no need to list - ``distribute`` somewhere in your eggs: using the bootstrap is enough. - - The source code for the bootstrap script is located at - `http://bitbucket.org/tarek/buildout-distribute`. - - - - ----------------------------- - Feedback and getting involved - ----------------------------- - - - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig - - Issue tracker: http://bitbucket.org/tarek/distribute/issues/ - - Code Repository: http://bitbucket.org/tarek/distribute - - ======= - CHANGES - ======= - - ------ - 0.6.16 - ------ - - * Builds sdist gztar even on Windows (avoiding Issue 193). - * Issue 192: Fixed metadata omitted on Windows when package_dir - specified with forward-slash. - * Issue 195: Cython build support. - * Issue 200: Issues with recognizing 64-bit packages on Windows. - - ------ - 0.6.15 - ------ - - * Fixed typo in bdist_egg - * Several issues under Python 3 has been solved. - * Issue 146: Fixed missing DLL files after easy_install of windows exe package. - - ------ - 0.6.14 - ------ - - * Issue 170: Fixed unittest failure. Thanks to Toshio. - * Issue 171: Fixed race condition in unittests cause deadlocks in test suite. - * Issue 143: Fixed a lookup issue with easy_install. - Thanks to David and Zooko. - * Issue 174: Fixed the edit mode when its used with setuptools itself - - ------ - 0.6.13 - ------ - - * Issue 160: 2.7 gives ValueError("Invalid IPv6 URL") - * Issue 150: Fixed using ~/.local even in a --no-site-packages virtualenv - * Issue 163: scan index links before external links, and don't use the md5 when - comparing two distributions - - ------ - 0.6.12 - ------ - - * Issue 149: Fixed various failures on 2.3/2.4 - - ------ - 0.6.11 - ------ - - * Found another case of SandboxViolation - fixed - * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings - * Added indexsidebar.html into MANIFEST.in - * Issue 108: Fixed TypeError with Python3.1 - * Issue 121: Fixed --help install command trying to actually install. - * Issue 112: Added an os.makedirs so that Tarek's solution will work. - * Issue 133: Added --no-find-links to easy_install - * Added easy_install --user - * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account - * Issue 134: removed spurious UserWarnings. Patch by VanLindberg - * Issue 138: cant_write_to_target error when setup_requires is used. - * Issue 147: respect the sys.dont_write_bytecode flag - - ------ - 0.6.10 - ------ - - * Reverted change made for the DistributionNotFound exception because - zc.buildout uses the exception message to get the name of the - distribution. - - ----- - 0.6.9 - ----- - - * Issue 90: unknown setuptools version can be added in the working set - * Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore - Initial Patch by arfrever. - * Issue 89: added a side bar with a download link to the doc. - * Issue 86: fixed missing sentence in pkg_resources doc. - * Added a nicer error message when a DistributionNotFound is raised. - * Issue 80: test_develop now works with Python 3.1 - * Issue 93: upload_docs now works if there is an empty sub-directory. - * Issue 70: exec bit on non-exec files - * Issue 99: now the standalone easy_install command doesn't uses a - "setup.cfg" if any exists in the working directory. It will use it - only if triggered by ``install_requires`` from a setup.py call - (install, develop, etc). - * Issue 101: Allowing ``os.devnull`` in Sandbox - * Issue 92: Fixed the "no eggs" found error with MacPort - (platform.mac_ver() fails) - * Issue 103: test_get_script_header_jython_workaround not run - anymore under py3 with C or POSIX local. Contributed by Arfrever. - * Issue 104: remvoved the assertion when the installation fails, - with a nicer message for the end user. - * Issue 100: making sure there's no SandboxViolation when - the setup script patches setuptools. - - ----- - 0.6.8 - ----- - - * Added "check_packages" in dist. (added in Setuptools 0.6c11) - * Fixed the DONT_PATCH_SETUPTOOLS state. - - ----- - 0.6.7 - ----- - - * Issue 58: Added --user support to the develop command - * Issue 11: Generated scripts now wrap their call to the script entry point - in the standard "if name == 'main'" - * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv - can drive an installation that doesn't patch a global setuptools. - * Reviewed unladen-swallow specific change from - http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719 - and determined that it no longer applies. Distribute should work fine with - Unladen Swallow 2009Q3. - * Issue 21: Allow PackageIndex.open_url to gracefully handle all cases of a - httplib.HTTPException instead of just InvalidURL and BadStatusLine. - * Removed virtual-python.py from this distribution and updated documentation - to point to the actively maintained virtualenv instead. - * Issue 64: use_setuptools no longer rebuilds the distribute egg every - time it is run - * use_setuptools now properly respects the requested version - * use_setuptools will no longer try to import a distribute egg for the - wrong Python version - * Issue 74: no_fake should be True by default. - * Issue 72: avoid a bootstrapping issue with easy_install -U - - ----- - 0.6.6 - ----- - - * Unified the bootstrap file so it works on both py2.x and py3k without 2to3 - (patch by Holger Krekel) - - ----- - 0.6.5 - ----- - - * Issue 65: cli.exe and gui.exe are now generated at build time, - depending on the platform in use. - - * Issue 67: Fixed doc typo (PEP 381/382) - - * Distribute no longer shadows setuptools if we require a 0.7-series - setuptools. And an error is raised when installing a 0.7 setuptools with - distribute. - - * When run from within buildout, no attempt is made to modify an existing - setuptools egg, whether in a shared egg directory or a system setuptools. - - * Fixed a hole in sandboxing allowing builtin file to write outside of - the sandbox. - - ----- - 0.6.4 - ----- - - * Added the generation of `distribute_setup_3k.py` during the release. - This close http://bitbucket.org/tarek/distribute/issue/52. - - * Added an upload_docs command to easily upload project documentation to - PyPI's http://packages.python.org. - This close http://bitbucket.org/tarek/distribute/issue/56. - - * Fixed a bootstrap bug on the use_setuptools() API. - - ----- - 0.6.3 - ----- - - setuptools - ========== - - * Fixed a bunch of calls to file() that caused crashes on Python 3. - - bootstrapping - ============= - - * Fixed a bug in sorting that caused bootstrap to fail on Python 3. - - ----- - 0.6.2 - ----- - - setuptools - ========== - - * Added Python 3 support; see docs/python3.txt. - This closes http://bugs.python.org/setuptools/issue39. - - * Added option to run 2to3 automatically when installing on Python 3. - This closes http://bitbucket.org/tarek/distribute/issue/31. - - * Fixed invalid usage of requirement.parse, that broke develop -d. - This closes http://bugs.python.org/setuptools/issue44. - - * Fixed script launcher for 64-bit Windows. - This closes http://bugs.python.org/setuptools/issue2. - - * KeyError when compiling extensions. - This closes http://bugs.python.org/setuptools/issue41. - - bootstrapping - ============= - - * Fixed bootstrap not working on Windows. - This closes http://bitbucket.org/tarek/distribute/issue/49. - - * Fixed 2.6 dependencies. - This closes http://bitbucket.org/tarek/distribute/issue/50. - - * Make sure setuptools is patched when running through easy_install - This closes http://bugs.python.org/setuptools/issue40. - - ----- - 0.6.1 - ----- - - setuptools - ========== - - * package_index.urlopen now catches BadStatusLine and malformed url errors. - This closes http://bitbucket.org/tarek/distribute/issue/16 and - http://bitbucket.org/tarek/distribute/issue/18. - - * zip_ok is now False by default. This closes - http://bugs.python.org/setuptools/issue33. - - * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20. - - * Fixed invalid bootstraping with easy_install installation - http://bitbucket.org/tarek/distribute/issue/40. - Thanks to Florian Schulze for the help. - - * Removed buildout/bootstrap.py. A new repository will create a specific - bootstrap.py script. - - - bootstrapping - ============= - - * The boostrap process leave setuptools alone if detected in the system - and --root or --prefix is provided, but is not in the same location. - This closes http://bitbucket.org/tarek/distribute/issue/10. - - --- - 0.6 - --- - - setuptools - ========== - - * Packages required at build time where not fully present at install time. - This closes http://bitbucket.org/tarek/distribute/issue/12. - - * Protected against failures in tarfile extraction. This closes - http://bitbucket.org/tarek/distribute/issue/10. - - * Made Jython api_tests.txt doctest compatible. This closes - http://bitbucket.org/tarek/distribute/issue/7. - - * sandbox.py replaced builtin type file with builtin function open. This - closes http://bitbucket.org/tarek/distribute/issue/6. - - * Immediately close all file handles. This closes - http://bitbucket.org/tarek/distribute/issue/3. - - * Added compatibility with Subversion 1.6. This references - http://bitbucket.org/tarek/distribute/issue/1. - - pkg_resources - ============= - - * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API - instead. Based on a patch from ronaldoussoren. This closes - http://bitbucket.org/tarek/distribute/issue/5. - - * Fixed a SandboxViolation for mkdir that could occur in certain cases. - This closes http://bitbucket.org/tarek/distribute/issue/13. - - * Allow to find_on_path on systems with tight permissions to fail gracefully. - This closes http://bitbucket.org/tarek/distribute/issue/9. - - * Corrected inconsistency between documentation and code of add_entry. - This closes http://bitbucket.org/tarek/distribute/issue/8. - - * Immediately close all file handles. This closes - http://bitbucket.org/tarek/distribute/issue/3. - - easy_install - ============ - - * Immediately close all file handles. This closes - http://bitbucket.org/tarek/distribute/issue/3. - - -Keywords: CPAN PyPI distutils eggs package management -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Python Software Foundation License -Classifier: License :: OSI Approved :: Zope Public License -Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 3 -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: System :: Archiving :: Packaging -Classifier: Topic :: System :: Systems Administration -Classifier: Topic :: Utilities +Metadata-Version: 1.0 +Name: distribute +Version: 0.6.16dev-r0 +Summary: Easily download, build, install, upgrade, and uninstall Python packages +Home-page: http://packages.python.org/distribute +Author: The fellowship of the packaging +Author-email: distutils-sig@python.org +License: PSF or ZPL +Description: =============================== + Installing and Using Distribute + =============================== + + .. contents:: **Table of Contents** + + ----------- + Disclaimers + ----------- + + About the fork + ============== + + `Distribute` is a fork of the `Setuptools` project. + + Distribute is intended to replace Setuptools as the standard method + for working with Python module distributions. + + The fork has two goals: + + - Providing a backward compatible version to replace Setuptools + and make all distributions that depend on Setuptools work as + before, but with less bugs and behaviorial issues. + + This work is done in the 0.6.x series. + + Starting with version 0.6.2, Distribute supports Python 3. + Installing and using distribute for Python 3 code works exactly + the same as for Python 2 code, but Distribute also helps you to support + Python 2 and Python 3 from the same source code by letting you run 2to3 + on the code as a part of the build process, by setting the keyword parameter + ``use_2to3`` to True. See http://packages.python.org/distribute for more + information. + + - Refactoring the code, and releasing it in several distributions. + This work is being done in the 0.7.x series but not yet released. + + The roadmap is still evolving, and the page that is up-to-date is + located at : `http://packages.python.org/distribute/roadmap`. + + If you install `Distribute` and want to switch back for any reason to + `Setuptools`, get to the `Uninstallation instructions`_ section. + + More documentation + ================== + + You can get more information in the Sphinx-based documentation, located + at http://packages.python.org/distribute. This documentation includes the old + Setuptools documentation that is slowly replaced, and brand new content. + + About the installation process + ============================== + + The `Distribute` installer modifies your installation by de-activating an + existing installation of `Setuptools` in a bootstrap process. This process + has been tested in various installation schemes and contexts but in case of a + bug during this process your Python installation might be left in a broken + state. Since all modified files and directories are copied before the + installation starts, you will be able to get back to a normal state by reading + the instructions in the `Uninstallation instructions`_ section. + + In any case, it is recommended to save you `site-packages` directory before + you start the installation of `Distribute`. + + ------------------------- + Installation Instructions + ------------------------- + + Distribute is only released as a source distribution. + + It can be installed using pip, and can be done so with the source tarball, + or by using the ``distribute_setup.py`` script provided online. + + ``distribute_setup.py`` is the simplest and preferred way on all systems. + + distribute_setup.py + =================== + + Download + `distribute_setup.py `_ + and execute it, using the Python interpreter of your choice. + + If your shell has the ``curl`` program you can do:: + + $ curl -O http://python-distribute.org/distribute_setup.py + $ python distribute_setup.py + + Notice this file is also provided in the source release. + + pip + === + + Run easy_install or pip:: + + $ pip install distribute + + Source installation + =================== + + Download the source tarball, uncompress it, then run the install command:: + + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.15.tar.gz + $ tar -xzvf distribute-0.6.15.tar.gz + $ cd distribute-0.6.15 + $ python setup.py install + + --------------------------- + Uninstallation Instructions + --------------------------- + + Like other distutils-based distributions, Distribute doesn't provide an + uninstaller yet. It's all done manually! We are all waiting for PEP 376 + support in Python. + + Distribute is installed in three steps: + + 1. it gets out of the way an existing installation of Setuptools + 2. it installs a `fake` setuptools installation + 3. it installs distribute + + Distribute can be removed like this: + + - remove the ``distribute*.egg`` file located in your site-packages directory + - remove the ``setuptools.pth`` file located in you site-packages directory + - remove the easy_install script located in you ``sys.prefix/bin`` directory + - remove the ``setuptools*.egg`` directory located in your site-packages directory, + if any. + + If you want to get back to setuptools: + + - reinstall setuptools using its instruction. + + Lastly: + + - remove the *.OLD.* directory located in your site-packages directory if any, + **once you have checked everything was working correctly again**. + + ------------------------- + Quick help for developers + ------------------------- + + To create an egg which is compatible with Distribute, use the same + practice as with Setuptools, e.g.:: + + from setuptools import setup + + setup(... + ) + + To use `pkg_resources` to access data files in the egg, you should + require the Setuptools distribution explicitly:: + + from setuptools import setup + + setup(... + install_requires=['setuptools'] + ) + + Only if you need Distribute-specific functionality should you depend + on it explicitly. In this case, replace the Setuptools dependency:: + + from setuptools import setup + + setup(... + install_requires=['distribute'] + ) + + ----------- + Install FAQ + ----------- + + - **Why is Distribute wrapping my Setuptools installation?** + + Since Distribute is a fork, and since it provides the same package + and modules, it renames the existing Setuptools egg and inserts a + new one which merely wraps the Distribute code. This way, full + backwards compatibility is kept for packages which rely on the + Setuptools modules. + + At the same time, packages can meet their dependency on Setuptools + without actually installing it (which would disable Distribute). + + - **How does Distribute interact with virtualenv?** + + Everytime you create a virtualenv it will install setuptools by default. + You either need to re-install Distribute in it right after or pass the + ``--distribute`` option when creating it. + + Once installed, your virtualenv will use Distribute transparently. + + Although, if you have Setuptools installed in your system-wide Python, + and if the virtualenv you are in was generated without the `--no-site-packages` + option, the Distribute installation will stop. + + You need in this case to build a virtualenv with the `--no-site-packages` + option or to install `Distribute` globally. + + - **How does Distribute interacts with zc.buildout?** + + You can use Distribute in your zc.buildout, with the --distribute option, + starting at zc.buildout 1.4.2:: + + $ python bootstrap.py --distribute + + For previous zc.buildout versions, *the only thing* you need to do + is use the bootstrap at `http://python-distribute.org/bootstrap.py`. Run + that bootstrap and ``bin/buildout`` (and all other buildout-generated + scripts) will transparently use distribute instead of setuptools. You do + not need a specific buildout release. + + A shared eggs directory is no problem (since 0.6.6): the setuptools egg is + left in place unmodified. So other buildouts that do not yet use the new + bootstrap continue to work just fine. And there is no need to list + ``distribute`` somewhere in your eggs: using the bootstrap is enough. + + The source code for the bootstrap script is located at + `http://bitbucket.org/tarek/buildout-distribute`. + + + + ----------------------------- + Feedback and getting involved + ----------------------------- + + - Mailing list: http://mail.python.org/mailman/listinfo/distutils-sig + - Issue tracker: http://bitbucket.org/tarek/distribute/issues/ + - Code Repository: http://bitbucket.org/tarek/distribute + + ======= + CHANGES + ======= + + ------ + 0.6.16 + ------ + + * Builds sdist gztar even on Windows (avoiding Issue 193). + * Issue 192: Fixed metadata omitted on Windows when package_dir + specified with forward-slash. + * Issue 195: Cython build support. + * Issue 200: Issues with recognizing 64-bit packages on Windows. + + ------ + 0.6.15 + ------ + + * Fixed typo in bdist_egg + * Several issues under Python 3 has been solved. + * Issue 146: Fixed missing DLL files after easy_install of windows exe package. + + ------ + 0.6.14 + ------ + + * Issue 170: Fixed unittest failure. Thanks to Toshio. + * Issue 171: Fixed race condition in unittests cause deadlocks in test suite. + * Issue 143: Fixed a lookup issue with easy_install. + Thanks to David and Zooko. + * Issue 174: Fixed the edit mode when its used with setuptools itself + + ------ + 0.6.13 + ------ + + * Issue 160: 2.7 gives ValueError("Invalid IPv6 URL") + * Issue 150: Fixed using ~/.local even in a --no-site-packages virtualenv + * Issue 163: scan index links before external links, and don't use the md5 when + comparing two distributions + + ------ + 0.6.12 + ------ + + * Issue 149: Fixed various failures on 2.3/2.4 + + ------ + 0.6.11 + ------ + + * Found another case of SandboxViolation - fixed + * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings + * Added indexsidebar.html into MANIFEST.in + * Issue 108: Fixed TypeError with Python3.1 + * Issue 121: Fixed --help install command trying to actually install. + * Issue 112: Added an os.makedirs so that Tarek's solution will work. + * Issue 133: Added --no-find-links to easy_install + * Added easy_install --user + * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account + * Issue 134: removed spurious UserWarnings. Patch by VanLindberg + * Issue 138: cant_write_to_target error when setup_requires is used. + * Issue 147: respect the sys.dont_write_bytecode flag + + ------ + 0.6.10 + ------ + + * Reverted change made for the DistributionNotFound exception because + zc.buildout uses the exception message to get the name of the + distribution. + + ----- + 0.6.9 + ----- + + * Issue 90: unknown setuptools version can be added in the working set + * Issue 87: setupt.py doesn't try to convert distribute_setup.py anymore + Initial Patch by arfrever. + * Issue 89: added a side bar with a download link to the doc. + * Issue 86: fixed missing sentence in pkg_resources doc. + * Added a nicer error message when a DistributionNotFound is raised. + * Issue 80: test_develop now works with Python 3.1 + * Issue 93: upload_docs now works if there is an empty sub-directory. + * Issue 70: exec bit on non-exec files + * Issue 99: now the standalone easy_install command doesn't uses a + "setup.cfg" if any exists in the working directory. It will use it + only if triggered by ``install_requires`` from a setup.py call + (install, develop, etc). + * Issue 101: Allowing ``os.devnull`` in Sandbox + * Issue 92: Fixed the "no eggs" found error with MacPort + (platform.mac_ver() fails) + * Issue 103: test_get_script_header_jython_workaround not run + anymore under py3 with C or POSIX local. Contributed by Arfrever. + * Issue 104: remvoved the assertion when the installation fails, + with a nicer message for the end user. + * Issue 100: making sure there's no SandboxViolation when + the setup script patches setuptools. + + ----- + 0.6.8 + ----- + + * Added "check_packages" in dist. (added in Setuptools 0.6c11) + * Fixed the DONT_PATCH_SETUPTOOLS state. + + ----- + 0.6.7 + ----- + + * Issue 58: Added --user support to the develop command + * Issue 11: Generated scripts now wrap their call to the script entry point + in the standard "if name == 'main'" + * Added the 'DONT_PATCH_SETUPTOOLS' environment variable, so virtualenv + can drive an installation that doesn't patch a global setuptools. + * Reviewed unladen-swallow specific change from + http://code.google.com/p/unladen-swallow/source/detail?spec=svn875&r=719 + and determined that it no longer applies. Distribute should work fine with + Unladen Swallow 2009Q3. + * Issue 21: Allow PackageIndex.open_url to gracefully handle all cases of a + httplib.HTTPException instead of just InvalidURL and BadStatusLine. + * Removed virtual-python.py from this distribution and updated documentation + to point to the actively maintained virtualenv instead. + * Issue 64: use_setuptools no longer rebuilds the distribute egg every + time it is run + * use_setuptools now properly respects the requested version + * use_setuptools will no longer try to import a distribute egg for the + wrong Python version + * Issue 74: no_fake should be True by default. + * Issue 72: avoid a bootstrapping issue with easy_install -U + + ----- + 0.6.6 + ----- + + * Unified the bootstrap file so it works on both py2.x and py3k without 2to3 + (patch by Holger Krekel) + + ----- + 0.6.5 + ----- + + * Issue 65: cli.exe and gui.exe are now generated at build time, + depending on the platform in use. + + * Issue 67: Fixed doc typo (PEP 381/382) + + * Distribute no longer shadows setuptools if we require a 0.7-series + setuptools. And an error is raised when installing a 0.7 setuptools with + distribute. + + * When run from within buildout, no attempt is made to modify an existing + setuptools egg, whether in a shared egg directory or a system setuptools. + + * Fixed a hole in sandboxing allowing builtin file to write outside of + the sandbox. + + ----- + 0.6.4 + ----- + + * Added the generation of `distribute_setup_3k.py` during the release. + This close http://bitbucket.org/tarek/distribute/issue/52. + + * Added an upload_docs command to easily upload project documentation to + PyPI's http://packages.python.org. + This close http://bitbucket.org/tarek/distribute/issue/56. + + * Fixed a bootstrap bug on the use_setuptools() API. + + ----- + 0.6.3 + ----- + + setuptools + ========== + + * Fixed a bunch of calls to file() that caused crashes on Python 3. + + bootstrapping + ============= + + * Fixed a bug in sorting that caused bootstrap to fail on Python 3. + + ----- + 0.6.2 + ----- + + setuptools + ========== + + * Added Python 3 support; see docs/python3.txt. + This closes http://bugs.python.org/setuptools/issue39. + + * Added option to run 2to3 automatically when installing on Python 3. + This closes http://bitbucket.org/tarek/distribute/issue/31. + + * Fixed invalid usage of requirement.parse, that broke develop -d. + This closes http://bugs.python.org/setuptools/issue44. + + * Fixed script launcher for 64-bit Windows. + This closes http://bugs.python.org/setuptools/issue2. + + * KeyError when compiling extensions. + This closes http://bugs.python.org/setuptools/issue41. + + bootstrapping + ============= + + * Fixed bootstrap not working on Windows. + This closes http://bitbucket.org/tarek/distribute/issue/49. + + * Fixed 2.6 dependencies. + This closes http://bitbucket.org/tarek/distribute/issue/50. + + * Make sure setuptools is patched when running through easy_install + This closes http://bugs.python.org/setuptools/issue40. + + ----- + 0.6.1 + ----- + + setuptools + ========== + + * package_index.urlopen now catches BadStatusLine and malformed url errors. + This closes http://bitbucket.org/tarek/distribute/issue/16 and + http://bitbucket.org/tarek/distribute/issue/18. + + * zip_ok is now False by default. This closes + http://bugs.python.org/setuptools/issue33. + + * Fixed invalid URL error catching. http://bugs.python.org/setuptools/issue20. + + * Fixed invalid bootstraping with easy_install installation + http://bitbucket.org/tarek/distribute/issue/40. + Thanks to Florian Schulze for the help. + + * Removed buildout/bootstrap.py. A new repository will create a specific + bootstrap.py script. + + + bootstrapping + ============= + + * The boostrap process leave setuptools alone if detected in the system + and --root or --prefix is provided, but is not in the same location. + This closes http://bitbucket.org/tarek/distribute/issue/10. + + --- + 0.6 + --- + + setuptools + ========== + + * Packages required at build time where not fully present at install time. + This closes http://bitbucket.org/tarek/distribute/issue/12. + + * Protected against failures in tarfile extraction. This closes + http://bitbucket.org/tarek/distribute/issue/10. + + * Made Jython api_tests.txt doctest compatible. This closes + http://bitbucket.org/tarek/distribute/issue/7. + + * sandbox.py replaced builtin type file with builtin function open. This + closes http://bitbucket.org/tarek/distribute/issue/6. + + * Immediately close all file handles. This closes + http://bitbucket.org/tarek/distribute/issue/3. + + * Added compatibility with Subversion 1.6. This references + http://bitbucket.org/tarek/distribute/issue/1. + + pkg_resources + ============= + + * Avoid a call to /usr/bin/sw_vers on OSX and use the official platform API + instead. Based on a patch from ronaldoussoren. This closes + http://bitbucket.org/tarek/distribute/issue/5. + + * Fixed a SandboxViolation for mkdir that could occur in certain cases. + This closes http://bitbucket.org/tarek/distribute/issue/13. + + * Allow to find_on_path on systems with tight permissions to fail gracefully. + This closes http://bitbucket.org/tarek/distribute/issue/9. + + * Corrected inconsistency between documentation and code of add_entry. + This closes http://bitbucket.org/tarek/distribute/issue/8. + + * Immediately close all file handles. This closes + http://bitbucket.org/tarek/distribute/issue/3. + + easy_install + ============ + + * Immediately close all file handles. This closes + http://bitbucket.org/tarek/distribute/issue/3. + + +Keywords: CPAN PyPI distutils eggs package management +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: Python Software Foundation License +Classifier: License :: OSI Approved :: Zope Public License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 3 +Classifier: Topic :: Software Development :: Libraries :: Python Modules +Classifier: Topic :: System :: Archiving :: Packaging +Classifier: Topic :: System :: Systems Administration +Classifier: Topic :: Utilities --- distribute-0.6.16.orig/distribute.egg-info/entry_points.txt +++ distribute-0.6.16/distribute.egg-info/entry_points.txt @@ -33,6 +33,7 @@ [console_scripts] easy_install = setuptools.command.easy_install:main easy_install-2.7 = setuptools.command.easy_install:main +easy_install-2.6 = setuptools.command.easy_install:main [setuptools.file_finders] svn_cvs = setuptools.command.sdist:_default_revctrl --- distribute-0.6.16.orig/distribute.egg-info/SOURCES.txt +++ distribute-0.6.16/distribute.egg-info/SOURCES.txt @@ -35,9 +35,16 @@ docs/_theme/nature/theme.conf docs/_theme/nature/static/nature.css_t docs/_theme/nature/static/pygments.css -docs/_theme/nature/theme.conf -docs/_theme/nature/static/nature.css_t -docs/_theme/nature/static/pygments.css +docs/build/html/_sources/easy_install.txt +docs/build/html/_sources/index.txt +docs/build/html/_sources/pkg_resources.txt +docs/build/html/_sources/python3.txt +docs/build/html/_sources/roadmap.txt +docs/build/html/_sources/setuptools.txt +docs/build/html/_sources/using.txt +docs/build/html/_static/basic.css +docs/build/html/_static/nature.css +docs/build/html/_static/pygments.css setuptools/__init__.py setuptools/archive_util.py setuptools/cli.exe @@ -82,41 +89,6 @@ setuptools/tests/win_script_wrapper.txt setuptools/tests/indexes/test_links_priority/external.html setuptools/tests/indexes/test_links_priority/simple/foobar/index.html -setuptools/command/__init__.py -setuptools/command/alias.py -setuptools/command/bdist_egg.py -setuptools/command/bdist_rpm.py -setuptools/command/bdist_wininst.py -setuptools/command/build_ext.py -setuptools/command/build_py.py -setuptools/command/develop.py -setuptools/command/easy_install.py -setuptools/command/egg_info.py -setuptools/command/install.py -setuptools/command/install_egg_info.py -setuptools/command/install_lib.py -setuptools/command/install_scripts.py -setuptools/command/register.py -setuptools/command/rotate.py -setuptools/command/saveopts.py -setuptools/command/sdist.py -setuptools/command/setopt.py -setuptools/command/test.py -setuptools/command/upload.py -setuptools/command/upload_docs.py -setuptools/tests/__init__.py -setuptools/tests/doctest.py -setuptools/tests/server.py -setuptools/tests/test_build_ext.py -setuptools/tests/test_develop.py -setuptools/tests/test_easy_install.py -setuptools/tests/test_packageindex.py -setuptools/tests/test_resources.py -setuptools/tests/test_sandbox.py -setuptools/tests/test_upload_docs.py -setuptools/tests/win_script_wrapper.txt -setuptools/tests/indexes/test_links_priority/external.html -setuptools/tests/indexes/test_links_priority/simple/foobar/index.html tests/api_tests.txt tests/install_test.py tests/manual_test.py @@ -124,10 +96,5 @@ tests/shlib_test/hello.c tests/shlib_test/hello.pyx tests/shlib_test/hellolib.c -tests/shlib_test/setup.py -tests/shlib_test/test_hello.py -tests/shlib_test/hello.c -tests/shlib_test/hello.pyx -tests/shlib_test/hellolib.c tests/shlib_test/setup.py tests/shlib_test/test_hello.py \ No newline at end of file