[Python-modules-commits] r28325 - in packages/python-pip/trunk/debian (7 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Tue Mar 25 15:32:44 UTC 2014 

    Date: Tuesday, March 25, 2014 @ 15:32:43
  Author: barry
Revision: 28325

* Team upload.
* New upstream release.
* d/patches:
  - system-ca-certificates.patch: Removed.  This is obsoleted by the
    vendorizing (and on Debian, de-vendorizing) of the requests library.
  - no-python-specific-scripts.patch: Removed.  Upstream renamed pip-X.Y
    to pipX.Y but adopts our pipX name as well.  I don't think it hurts
    to also have pipX.Y.
  - de-vendorize.patch: Added, in order to use Debian packages instead
    of vendorized packages.
* d/control:
  - Bump Standards-Version to 3.9.5 with no other changes needed.
  - Update Depends for the vendorized packages.
* d/python{,3}-pip.pyremove: Remove pip/_vendor directory from binary
  packages.

Added:
  packages/python-pip/trunk/debian/patches/de-vendorize.patch
  packages/python-pip/trunk/debian/python-pip.pyremove
  packages/python-pip/trunk/debian/python3-pip.pyremove
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/control
  packages/python-pip/trunk/debian/patches/format_egg_string.patch
  packages/python-pip/trunk/debian/patches/series

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2014-03-25 09:08:37 UTC (rev 28324)
+++ packages/python-pip/trunk/debian/changelog	2014-03-25 15:32:43 UTC (rev 28325)
@@ -1,3 +1,23 @@
+python-pip (1.5.4-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * d/patches:
+    - system-ca-certificates.patch: Removed.  This is obsoleted by the
+      vendorizing (and on Debian, de-vendorizing) of the requests library.
+    - no-python-specific-scripts.patch: Removed.  Upstream renamed pip-X.Y
+      to pipX.Y but adopts our pipX name as well.  I don't think it hurts
+      to also have pipX.Y.
+    - de-vendorize.patch: Added, in order to use Debian packages instead
+      of vendorized packages.
+  * d/control:
+    - Bump Standards-Version to 3.9.5 with no other changes needed.
+    - Update Depends for the vendorized packages.
+  * d/python{,3}-pip.pyremove: Remove pip/_vendor directory from binary
+    packages.
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 25 Mar 2014 10:21:09 -0400
+
 python-pip (1.4.1-2) unstable; urgency=low
 
   * Team upload.

Modified: packages/python-pip/trunk/debian/control
===================================================================
--- packages/python-pip/trunk/debian/control	2014-03-25 09:08:37 UTC (rev 28324)
+++ packages/python-pip/trunk/debian/control	2014-03-25 15:32:43 UTC (rev 28325)
@@ -4,9 +4,11 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Carl Chenet <chaica at debian.org>, Jeff Licquia <licquia at debian.org>
 Homepage: http://www.pip-installer.org/
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6), python3-all (>= 3.2)
+Build-Depends: debhelper (>= 7.0.50~),
+               python-all (>= 2.6),
+               python3-all (>= 3.2)
 Build-Depends-Indep: python-setuptools (>= 0.6c1), python3-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pip/trunk/
@@ -14,11 +16,16 @@
 
 Package: python-pip
 Architecture: all
-Depends: ca-certificates,
+Depends: ${misc:Depends},
+         ${python:Depends},
+         ca-certificates,
+         python-colorama,
+         python-distlib,
+         python-html5lib,
          python-pkg-resources,
          python-setuptools (>= 0.6c1),
-         ${misc:Depends},
-         ${python:Depends}
+         python-six,
+         python-requests,
 Recommends: build-essential, python-dev-all (>= 2.6)
 Description: alternative Python package installer
  pip is a replacement for easy_install, and is intended to be an improved
@@ -28,11 +35,16 @@
 
 Package: python3-pip
 Architecture: all
-Depends: ca-certificates,
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ca-certificates,
+         python3-colorama,
+         python3-distlib,
+         python3-html5lib,
          python3-pkg-resources,
          python3-setuptools,
-         ${misc:Depends},
-         ${python3:Depends}
+         python3-six,
+         python3-requests,
 Recommends: build-essential, python3-dev (>= 3.2)
 Description: alternative Python package installer - Python 3 version of the package
  pip is a replacement for easy_install, and is intended to be an improved

Added: packages/python-pip/trunk/debian/patches/de-vendorize.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/de-vendorize.patch	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/de-vendorize.patch	2014-03-25 15:32:43 UTC (rev 28325)
@@ -0,0 +1,340 @@
+Description: Use Debian packages instead of vendorized versions.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/pip/baseparser.py
++++ b/pip/baseparser.py
+@@ -9,7 +9,6 @@
+ from pip.backwardcompat import ConfigParser, string_types
+ from pip.locations import default_config_file
+ from pip.util import get_terminal_size, get_prog
+-from pip._vendor import pkg_resources
+ 
+ 
+ class PrettyHelpFormatter(optparse.IndentedHelpFormatter):
+--- a/pip/download.py
++++ b/pip/download.py
+@@ -19,13 +19,13 @@
+                       create_download_cache_folder, cache_download)
+ from pip.vcs import vcs
+ from pip.log import logger
+-from pip._vendor import requests, six
+-from pip._vendor.requests.adapters import BaseAdapter
+-from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
+-from pip._vendor.requests.compat import IncompleteRead
+-from pip._vendor.requests.exceptions import InvalidURL, ChunkedEncodingError
+-from pip._vendor.requests.models import Response
+-from pip._vendor.requests.structures import CaseInsensitiveDict
++import requests, six
++from requests.adapters import BaseAdapter
++from requests.auth import AuthBase, HTTPBasicAuth
++from requests.compat import IncompleteRead
++from requests.exceptions import InvalidURL, ChunkedEncodingError
++from requests.models import Response
++from requests.structures import CaseInsensitiveDict
+ 
+ __all__ = ['get_file_content',
+            'is_url', 'url_to_path', 'path_to_url',
+--- a/pip/commands/show.py
++++ b/pip/commands/show.py
+@@ -2,7 +2,7 @@
+ 
+ from pip.basecommand import Command
+ from pip.log import logger
+-from pip._vendor import pkg_resources
++import pkg_resources
+ 
+ 
+ class ShowCommand(Command):
+--- a/pip/commands/freeze.py
++++ b/pip/commands/freeze.py
+@@ -6,7 +6,7 @@
+ from pip.log import logger
+ from pip.basecommand import Command
+ from pip.util import get_installed_distributions
+-from pip._vendor import pkg_resources
++import pkg_resources
+ 
+ 
+ class FreezeCommand(Command):
+--- a/pip/commands/search.py
++++ b/pip/commands/search.py
+@@ -9,7 +9,7 @@
+ from pip.backwardcompat import xmlrpclib, reduce, cmp
+ from pip.exceptions import CommandError
+ from pip.status_codes import NO_MATCHES_FOUND
+-from pip._vendor import pkg_resources
++import pkg_resources
+ from distutils.version import StrictVersion, LooseVersion
+ 
+ 
+--- a/pip/log.py
++++ b/pip/log.py
+@@ -6,7 +6,7 @@
+ import logging
+ 
+ from pip import backwardcompat
+-from pip._vendor import colorama, pkg_resources
++import colorama, pkg_resources
+ 
+ 
+ def _color_wrap(*colors):
+--- a/pip/req.py
++++ b/pip/req.py
+@@ -33,7 +33,7 @@
+                           unpack_file_url, unpack_http_url)
+ import pip.wheel
+ from pip.wheel import move_wheel_files, Wheel, wheel_ext
+-from pip._vendor import pkg_resources, six
++import pkg_resources, six
+ 
+ 
+ def read_text_file(filename):
+--- a/pip/util.py
++++ b/pip/util.py
+@@ -14,8 +14,8 @@
+                                 console_to_str, user_site, PermissionError)
+ from pip.locations import site_packages, running_under_virtualenv, virtualenv_no_global
+ from pip.log import logger
+-from pip._vendor import pkg_resources
+-from pip._vendor.distlib import version
++import pkg_resources
++from distlib import version
+ 
+ __all__ = ['rmtree', 'display_path', 'backup_dir',
+            'find_command', 'ask', 'Inf',
+--- a/pip/index.py
++++ b/pip/index.py
+@@ -14,8 +14,8 @@
+ from pip.download import PipSession, url_to_path, path_to_url
+ from pip.wheel import Wheel, wheel_ext
+ from pip.pep425tags import supported_tags, supported_tags_noarch, get_platform
+-from pip._vendor import html5lib, requests, pkg_resources
+-from pip._vendor.requests.exceptions import SSLError
++import html5lib, requests, pkg_resources
++from requests.exceptions import SSLError
+ 
+ 
+ __all__ = ['PackageFinder']
+--- a/pip/wheel.py
++++ b/pip/wheel.py
+@@ -21,9 +21,8 @@
+ from pip.log import logger
+ from pip import pep425tags
+ from pip.util import call_subprocess, normalize_path, make_path_relative
+-from pip._vendor import pkg_resources
+-from pip._vendor.distlib.scripts import ScriptMaker
+-from pip._vendor import pkg_resources
++import pkg_resources
++from distlib.scripts import ScriptMaker
+ 
+ 
+ wheel_ext = '.whl'
+--- a/setup.py
++++ b/setup.py
+@@ -67,9 +67,6 @@
+       license='MIT',
+       packages=find_packages(exclude=["contrib", "docs", "tests*"]),
+       package_data={
+-          'pip._vendor.requests': ['*.pem'],
+-          'pip._vendor.distlib._backport': ['sysconfig.cfg'],
+-          'pip._vendor.distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
+       },
+       entry_points=dict(console_scripts=['pip=pip:main', 'pip%s=pip:main' % sys.version[:1],
+           'pip%s=pip:main' % sys.version[:3]]),
+--- a/pip.egg-info/SOURCES.txt
++++ b/pip.egg-info/SOURCES.txt
+@@ -49,186 +49,6 @@
+ pip.egg-info/not-zip-safe
+ pip.egg-info/requires.txt
+ pip.egg-info/top_level.txt
+-pip/_vendor/__init__.py
+-pip/_vendor/pkg_resources.py
+-pip/_vendor/re-vendor.py
+-pip/_vendor/six.py
+-pip/_vendor/_markerlib/__init__.py
+-pip/_vendor/_markerlib/markers.py
+-pip/_vendor/colorama/__init__.py
+-pip/_vendor/colorama/ansi.py
+-pip/_vendor/colorama/ansitowin32.py
+-pip/_vendor/colorama/initialise.py
+-pip/_vendor/colorama/win32.py
+-pip/_vendor/colorama/winterm.py
+-pip/_vendor/distlib/__init__.py
+-pip/_vendor/distlib/compat.py
+-pip/_vendor/distlib/database.py
+-pip/_vendor/distlib/index.py
+-pip/_vendor/distlib/locators.py
+-pip/_vendor/distlib/manifest.py
+-pip/_vendor/distlib/markers.py
+-pip/_vendor/distlib/metadata.py
+-pip/_vendor/distlib/resources.py
+-pip/_vendor/distlib/scripts.py
+-pip/_vendor/distlib/t32.exe
+-pip/_vendor/distlib/t64.exe
+-pip/_vendor/distlib/util.py
+-pip/_vendor/distlib/version.py
+-pip/_vendor/distlib/w32.exe
+-pip/_vendor/distlib/w64.exe
+-pip/_vendor/distlib/wheel.py
+-pip/_vendor/distlib/_backport/__init__.py
+-pip/_vendor/distlib/_backport/misc.py
+-pip/_vendor/distlib/_backport/shutil.py
+-pip/_vendor/distlib/_backport/sysconfig.cfg
+-pip/_vendor/distlib/_backport/sysconfig.py
+-pip/_vendor/distlib/_backport/tarfile.py
+-pip/_vendor/html5lib/__init__.py
+-pip/_vendor/html5lib/constants.py
+-pip/_vendor/html5lib/html5parser.py
+-pip/_vendor/html5lib/ihatexml.py
+-pip/_vendor/html5lib/inputstream.py
+-pip/_vendor/html5lib/sanitizer.py
+-pip/_vendor/html5lib/tokenizer.py
+-pip/_vendor/html5lib/utils.py
+-pip/_vendor/html5lib/filters/__init__.py
+-pip/_vendor/html5lib/filters/_base.py
+-pip/_vendor/html5lib/filters/alphabeticalattributes.py
+-pip/_vendor/html5lib/filters/inject_meta_charset.py
+-pip/_vendor/html5lib/filters/lint.py
+-pip/_vendor/html5lib/filters/optionaltags.py
+-pip/_vendor/html5lib/filters/sanitizer.py
+-pip/_vendor/html5lib/filters/whitespace.py
+-pip/_vendor/html5lib/serializer/__init__.py
+-pip/_vendor/html5lib/serializer/htmlserializer.py
+-pip/_vendor/html5lib/treebuilders/__init__.py
+-pip/_vendor/html5lib/treebuilders/_base.py
+-pip/_vendor/html5lib/treebuilders/dom.py
+-pip/_vendor/html5lib/treebuilders/etree.py
+-pip/_vendor/html5lib/treebuilders/etree_lxml.py
+-pip/_vendor/html5lib/treewalkers/__init__.py
+-pip/_vendor/html5lib/treewalkers/_base.py
+-pip/_vendor/html5lib/treewalkers/dom.py
+-pip/_vendor/html5lib/treewalkers/etree.py
+-pip/_vendor/html5lib/treewalkers/genshistream.py
+-pip/_vendor/html5lib/treewalkers/lxmletree.py
+-pip/_vendor/html5lib/treewalkers/pulldom.py
+-pip/_vendor/html5lib/trie/__init__.py
+-pip/_vendor/html5lib/trie/_base.py
+-pip/_vendor/html5lib/trie/datrie.py
+-pip/_vendor/html5lib/trie/py.py
+-pip/_vendor/requests/__init__.py
+-pip/_vendor/requests/adapters.py
+-pip/_vendor/requests/api.py
+-pip/_vendor/requests/auth.py
+-pip/_vendor/requests/cacert.pem
+-pip/_vendor/requests/certs.py
+-pip/_vendor/requests/compat.py
+-pip/_vendor/requests/cookies.py
+-pip/_vendor/requests/exceptions.py
+-pip/_vendor/requests/hooks.py
+-pip/_vendor/requests/models.py
+-pip/_vendor/requests/sessions.py
+-pip/_vendor/requests/status_codes.py
+-pip/_vendor/requests/structures.py
+-pip/_vendor/requests/utils.py
+-pip/_vendor/requests/packages/__init__.py
+-pip/_vendor/requests/packages/charade/__init__.py
+-pip/_vendor/requests/packages/charade/__main__.py
+-pip/_vendor/requests/packages/charade/big5freq.py
+-pip/_vendor/requests/packages/charade/big5prober.py
+-pip/_vendor/requests/packages/charade/chardistribution.py
+-pip/_vendor/requests/packages/charade/charsetgroupprober.py
+-pip/_vendor/requests/packages/charade/charsetprober.py
+-pip/_vendor/requests/packages/charade/codingstatemachine.py
+-pip/_vendor/requests/packages/charade/compat.py
+-pip/_vendor/requests/packages/charade/constants.py
+-pip/_vendor/requests/packages/charade/cp949prober.py
+-pip/_vendor/requests/packages/charade/escprober.py
+-pip/_vendor/requests/packages/charade/escsm.py
+-pip/_vendor/requests/packages/charade/eucjpprober.py
+-pip/_vendor/requests/packages/charade/euckrfreq.py
+-pip/_vendor/requests/packages/charade/euckrprober.py
+-pip/_vendor/requests/packages/charade/euctwfreq.py
+-pip/_vendor/requests/packages/charade/euctwprober.py
+-pip/_vendor/requests/packages/charade/gb2312freq.py
+-pip/_vendor/requests/packages/charade/gb2312prober.py
+-pip/_vendor/requests/packages/charade/hebrewprober.py
+-pip/_vendor/requests/packages/charade/jisfreq.py
+-pip/_vendor/requests/packages/charade/jpcntx.py
+-pip/_vendor/requests/packages/charade/langbulgarianmodel.py
+-pip/_vendor/requests/packages/charade/langcyrillicmodel.py
+-pip/_vendor/requests/packages/charade/langgreekmodel.py
+-pip/_vendor/requests/packages/charade/langhebrewmodel.py
+-pip/_vendor/requests/packages/charade/langhungarianmodel.py
+-pip/_vendor/requests/packages/charade/langthaimodel.py
+-pip/_vendor/requests/packages/charade/latin1prober.py
+-pip/_vendor/requests/packages/charade/mbcharsetprober.py
+-pip/_vendor/requests/packages/charade/mbcsgroupprober.py
+-pip/_vendor/requests/packages/charade/mbcssm.py
+-pip/_vendor/requests/packages/charade/sbcharsetprober.py
+-pip/_vendor/requests/packages/charade/sbcsgroupprober.py
+-pip/_vendor/requests/packages/charade/sjisprober.py
+-pip/_vendor/requests/packages/charade/universaldetector.py
+-pip/_vendor/requests/packages/charade/utf8prober.py
+-pip/_vendor/requests/packages/chardet/__init__.py
+-pip/_vendor/requests/packages/chardet/big5freq.py
+-pip/_vendor/requests/packages/chardet/big5prober.py
+-pip/_vendor/requests/packages/chardet/chardetect.py
+-pip/_vendor/requests/packages/chardet/chardistribution.py
+-pip/_vendor/requests/packages/chardet/charsetgroupprober.py
+-pip/_vendor/requests/packages/chardet/charsetprober.py
+-pip/_vendor/requests/packages/chardet/codingstatemachine.py
+-pip/_vendor/requests/packages/chardet/compat.py
+-pip/_vendor/requests/packages/chardet/constants.py
+-pip/_vendor/requests/packages/chardet/cp949prober.py
+-pip/_vendor/requests/packages/chardet/escprober.py
+-pip/_vendor/requests/packages/chardet/escsm.py
+-pip/_vendor/requests/packages/chardet/eucjpprober.py
+-pip/_vendor/requests/packages/chardet/euckrfreq.py
+-pip/_vendor/requests/packages/chardet/euckrprober.py
+-pip/_vendor/requests/packages/chardet/euctwfreq.py
+-pip/_vendor/requests/packages/chardet/euctwprober.py
+-pip/_vendor/requests/packages/chardet/gb2312freq.py
+-pip/_vendor/requests/packages/chardet/gb2312prober.py
+-pip/_vendor/requests/packages/chardet/hebrewprober.py
+-pip/_vendor/requests/packages/chardet/jisfreq.py
+-pip/_vendor/requests/packages/chardet/jpcntx.py
+-pip/_vendor/requests/packages/chardet/langbulgarianmodel.py
+-pip/_vendor/requests/packages/chardet/langcyrillicmodel.py
+-pip/_vendor/requests/packages/chardet/langgreekmodel.py
+-pip/_vendor/requests/packages/chardet/langhebrewmodel.py
+-pip/_vendor/requests/packages/chardet/langhungarianmodel.py
+-pip/_vendor/requests/packages/chardet/langthaimodel.py
+-pip/_vendor/requests/packages/chardet/latin1prober.py
+-pip/_vendor/requests/packages/chardet/mbcharsetprober.py
+-pip/_vendor/requests/packages/chardet/mbcsgroupprober.py
+-pip/_vendor/requests/packages/chardet/mbcssm.py
+-pip/_vendor/requests/packages/chardet/sbcharsetprober.py
+-pip/_vendor/requests/packages/chardet/sbcsgroupprober.py
+-pip/_vendor/requests/packages/chardet/sjisprober.py
+-pip/_vendor/requests/packages/chardet/universaldetector.py
+-pip/_vendor/requests/packages/chardet/utf8prober.py
+-pip/_vendor/requests/packages/urllib3/__init__.py
+-pip/_vendor/requests/packages/urllib3/_collections.py
+-pip/_vendor/requests/packages/urllib3/connection.py
+-pip/_vendor/requests/packages/urllib3/connectionpool.py
+-pip/_vendor/requests/packages/urllib3/exceptions.py
+-pip/_vendor/requests/packages/urllib3/fields.py
+-pip/_vendor/requests/packages/urllib3/filepost.py
+-pip/_vendor/requests/packages/urllib3/poolmanager.py
+-pip/_vendor/requests/packages/urllib3/request.py
+-pip/_vendor/requests/packages/urllib3/response.py
+-pip/_vendor/requests/packages/urllib3/util.py
+-pip/_vendor/requests/packages/urllib3/contrib/__init__.py
+-pip/_vendor/requests/packages/urllib3/contrib/ntlmpool.py
+-pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py
+-pip/_vendor/requests/packages/urllib3/packages/__init__.py
+-pip/_vendor/requests/packages/urllib3/packages/ordered_dict.py
+-pip/_vendor/requests/packages/urllib3/packages/six.py
+-pip/_vendor/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+-pip/_vendor/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
+ pip/backwardcompat/__init__.py
+ pip/commands/__init__.py
+ pip/commands/bundle.py
+@@ -247,4 +67,4 @@
+ pip/vcs/bazaar.py
+ pip/vcs/git.py
+ pip/vcs/mercurial.py
+-pip/vcs/subversion.py
+\ No newline at end of file
++pip/vcs/subversion.py

Modified: packages/python-pip/trunk/debian/patches/format_egg_string.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string.patch	2014-03-25 09:08:37 UTC (rev 28324)
+++ packages/python-pip/trunk/debian/patches/format_egg_string.patch	2014-03-25 15:32:43 UTC (rev 28325)
@@ -4,7 +4,7 @@
 
 --- a/pip/req.py
 +++ b/pip/req.py
-@@ -443,7 +443,7 @@
+@@ -508,7 +508,7 @@
          paths_to_remove = UninstallPathSet(dist)
  
          pip_egg_info_path = os.path.join(dist.location,

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2014-03-25 09:08:37 UTC (rev 28324)
+++ packages/python-pip/trunk/debian/patches/series	2014-03-25 15:32:43 UTC (rev 28325)
@@ -1,3 +1,2 @@
 format_egg_string.patch
-system-ca-certificates.patch
-no-python-specific-scripts.patch
+de-vendorize.patch

Added: packages/python-pip/trunk/debian/python-pip.pyremove
===================================================================
--- packages/python-pip/trunk/debian/python-pip.pyremove	                        (rev 0)
+++ packages/python-pip/trunk/debian/python-pip.pyremove	2014-03-25 15:32:43 UTC (rev 28325)
@@ -0,0 +1 @@
+pip/_vendor

Added: packages/python-pip/trunk/debian/python3-pip.pyremove
===================================================================
--- packages/python-pip/trunk/debian/python3-pip.pyremove	                        (rev 0)
+++ packages/python-pip/trunk/debian/python3-pip.pyremove	2014-03-25 15:32:43 UTC (rev 28325)
@@ -0,0 +1 @@
+pip/_vendor

More information about the Python-modules-commits mailing list