20281422 Update pip to 6.0.8 s11u2-sru
authorDrew Fisher <drew.fisher@oracle.com>
Fri, 12 Jun 2015 07:10:21 -0600
branchs11u2-sru
changeset 4470 3e9a30f6ae2f
parent 4466 a276a7815539
child 4471 22a03badd2b2
20281422 Update pip to 6.0.8 20281406 problem in UTILITY/PIP 20689913 pip-2.7 return CertificateError when using http proxy
components/python/pip/Makefile
components/python/pip/patches/01-unbundle-requests.patch
components/python/pip/pip-PYVER.p5m
components/python/pip/pip.license
components/python/pip/resolve.deps
--- a/components/python/pip/Makefile	Thu Jun 11 06:36:56 2015 -0700
+++ b/components/python/pip/Makefile	Fri Jun 12 07:10:21 2015 -0600
@@ -19,16 +19,16 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         pip
-COMPONENT_VERSION=      1.4.1
+COMPONENT_VERSION=      6.0.8
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:4e7a06554711a624c35d0c646f63674b7f6bfc7f80221bf1eb1f631bd890d04e
+    sha256:0d58487a1b7f5be2e5e965c11afbea1dc44ecec8069de03491a4d0d6c85f4551
 COMPONENT_ARCHIVE_URL=  $(call pypi_url)
 COMPONENT_PROJECT_URL=  https://github.com/pypa/pip
 COMPONENT_BUGDB=	utility/pip
@@ -41,15 +41,15 @@
 
 # allow pkg to create the mediated link
 COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(PROTO_DIR)/usr/bin ; $(RM) -f pip)
+	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f pip pip-$(PYTHON_VERSION))
 
 # common targets
 build:          $(BUILD_NO_ARCH)
 
 install:        $(INSTALL_NO_ARCH)
 
-# pip requires virtualenv 1.10 and scripttest 1.1.1 to execute tests.
-# When these are available, update this directive to test pip.
+# pip requires scripttest >= 1.3 to execute tests.
+# When this module is available, update this directive to test pip.
 test:           $(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pip/patches/01-unbundle-requests.patch	Fri Jun 12 07:10:21 2015 -0600
@@ -0,0 +1,125 @@
+In-house patch to 'unbundle' requests v2.5.1 (which has a known CVE) to
+instead use requests v2.6.0 which is already available in Solaris.
+
+--- pip-6.0.8/pip/__init__.py.orig	2015-06-03 20:10:13.002501253 -0700
++++ pip-6.0.8/pip/__init__.py	2015-06-03 20:10:57.018903229 -0700
[email protected]@ -16,9 +16,7 @@ from pip.vcs import git, mercurial, subv
+ from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter
+ from pip.commands import get_summaries, get_similar_commands
+ from pip.commands import commands_dict
+-from pip._vendor.requests.packages.urllib3.exceptions import (
+-    InsecureRequestWarning,
+-)
++from requests.packages.urllib3.exceptions import InsecureRequestWarning
+ 
+ 
+ # assignment for flake8 to be happy
+
+--- pip-6.0.8/pip/_vendor/cachecontrol/adapter.py.orig    2015-06-03 20:13:32.884043045 -0700
++++ pip-6.0.8/pip/_vendor/cachecontrol/adapter.py  2015-06-03 20:13:51.401124573 -0700
[email protected]@ -1,6 +1,6 @@
+ import functools
+
+-from pip._vendor.requests.adapters import HTTPAdapter
++from requests.adapters import HTTPAdapter
+
+ from .controller import CacheController
+ from .cache import DictCache
+
+--- pip-6.0.8/pip/_vendor/cachecontrol/compat.py.orig       2015-06-03 20:14:32.456221635 -0700
++++ pip-6.0.8/pip/_vendor/cachecontrol/compat.py   2015-06-03 20:15:13.070994049 -0700
[email protected]@ -12,5 +12,5 @@ except ImportError:
+
+ # Handle the case where the requests has been patched to not have urllib3
+ # bundled as part of it's source.
+-from pip._vendor.requests.packages.urllib3.response import HTTPResponse
+-from pip._vendor.requests.packages.urllib3.util import is_fp_closed
++from requests.packages.urllib3.response import HTTPResponse
++from requests.packages.urllib3.util import is_fp_closed
+
+--- pip-6.0.8/pip/_vendor/cachecontrol/controller.py.orig   2015-06-03 20:15:52.523400877 -0700
++++ pip-6.0.8/pip/_vendor/cachecontrol/controller.py       2015-06-03 20:16:13.267223970 -0700
[email protected]@ -6,7 +6,7 @@ import calendar
+ import time
+ from email.utils import parsedate_tz
+
+-from pip._vendor.requests.structures import CaseInsensitiveDict
++from requests.structures import CaseInsensitiveDict
+
+ from .cache import DictCache
+ from .serialize import Serializer
+
+--- pip-6.0.8/pip/_vendor/cachecontrol/serialize.py.orig      2015-06-03 20:17:00.074044178 -0700
++++ pip-6.0.8/pip/_vendor/cachecontrol/serialize.py        2015-06-03 20:17:09.414723163 -0700
[email protected]@ -3,7 +3,7 @@ import io
+ import json
+ import zlib
+
+-from pip._vendor.requests.structures import CaseInsensitiveDict
++from requests.structures import CaseInsensitiveDict
+
+ from .compat import HTTPResponse, pickle
+
+--- pip-6.0.8/pip/download.py.orig 2015-06-03 20:19:11.208085248 -0700
++++ pip-6.0.8/pip/download.py 2015-06-03 20:21:09.714266385 -0700
[email protected]@ -27,17 +27,19 @@ from pip.utils.filesystem import check_p
+ from pip.utils.ui import DownloadProgressBar, DownloadProgressSpinner
+ from pip.locations import write_delete_marker_file
+ from pip.vcs import vcs
+-from pip._vendor import requests, six
+-from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter
+-from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
+-from pip._vendor.requests.models import Response
+-from pip._vendor.requests.structures import CaseInsensitiveDict
+-from pip._vendor.requests.packages import urllib3
++from pip._vendor import six
+ from pip._vendor.cachecontrol import CacheControlAdapter
+ from pip._vendor.cachecontrol.caches import FileCache
+ from pip._vendor.lockfile import LockError
+ from pip._vendor.six.moves import xmlrpc_client
+
++import requests
++from requests.adapters import BaseAdapter, HTTPAdapter
++from requests.auth import AuthBase, HTTPBasicAuth
++from requests.models import Response
++from requests.structures import CaseInsensitiveDict
++from requests.packages import urllib3
++
+
+ __all__ = ['get_file_content',
+            'is_url', 'url_to_path', 'path_to_url',
+
+--- pip-6.0.8/pip/index.py.orig  2015-06-03 20:21:43.458489848 -0700
++++ pip-6.0.8/pip/index.py    2015-06-03 20:22:16.929267163 -0700
[email protected]@ -26,9 +26,10 @@ from pip.models import PyPI
+ from pip.wheel import Wheel, wheel_ext
+ from pip.pep425tags import supported_tags, supported_tags_noarch, get_platform
+ from pip.req.req_requirement import InstallationCandidate
+-from pip._vendor import html5lib, requests, pkg_resources, six
++from pip._vendor import html5lib, pkg_resources, six
+ from pip._vendor.packaging.version import parse as parse_version
+-from pip._vendor.requests.exceptions import SSLError
++import requests
++from requests.exceptions import SSLError
+
+
+ __all__ = ['PackageFinder']
+
+--- pip-6.0.8/pip/req/req_set.py.orig    2015-06-03 20:23:31.735567930 -0700
++++ pip-6.0.8/pip/req/req_set.py  2015-06-03 20:23:55.732059685 -0700
[email protected]@ -4,7 +4,6 @@ import logging
+ import os
+
+ from pip._vendor import pkg_resources
+-from pip._vendor import requests
+
+ from pip.download import (url_to_path, unpack_url)
+ from pip.exceptions import (InstallationError, BestVersionAlreadyInstalled,
[email protected]@ -16,6 +15,7 @@ from pip.utils import (display_path, rmt
+ from pip.utils.logging import indent_log
+ from pip.vcs import vcs
+ from pip.wheel import wheel_ext
++import requests
+
+
+ logger = logging.getLogger(__name__)
--- a/components/python/pip/pip-PYVER.p5m	Thu Jun 11 06:36:56 2015 -0700
+++ b/components/python/pip/pip-PYVER.p5m	Fri Jun 12 07:10:21 2015 -0600
@@ -18,21 +18,26 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/python-2/pip-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A tool for installing and managing Python packages"
-set name=com.oracle.info.description \
+set name=pkg.description \
     value="Pip is a tool which can install Python packages from a variety of sources including PyPI (and other indexes) using requirement specifiers, VCS project URLs, local project directories, local or remote source archives and requirement files which provide an easy way to specify a whole installation environment."
-set name=com.oracle.info.tpno value=15181
+set name=com.oracle.info.description \
+    value="pip, a tool for installing and managing Python packages"
+set name=com.oracle.info.tpno value=21944
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 link path=usr/bin/pip target=pip-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/pip-$(PYVER)
@@ -41,18 +46,121 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/__main__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/backwardcompat/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/backwardcompat/ssl_match_hostname.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/_markerlib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/_markerlib/markers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/adapter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/caches/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/caches/file_cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/caches/redis_cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/controller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/filewrapper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/heuristics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/serialize.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/wrapper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/__main__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/cacert.pem
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/ansi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/ansitowin32.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/initialise.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/win32.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/winterm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/misc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/shutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/sysconfig.cfg
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/sysconfig.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/_backport/tarfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/database.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/locators.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/manifest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/markers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/scripts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/t32.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/t64.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/w32.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/w64.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/distlib/wheel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/constants.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/alphabeticalattributes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/inject_meta_charset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/lint.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/optionaltags.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/sanitizer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/filters/whitespace.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/html5parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/ihatexml.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/inputstream.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/sanitizer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/serializer/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/serializer/htmlserializer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/tokenizer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treeadapters/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treeadapters/sax.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treebuilders/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treebuilders/_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treebuilders/dom.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treebuilders/etree.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treebuilders/etree_lxml.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/dom.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/etree.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/genshistream.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/lxmletree.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/treewalkers/pulldom.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/trie/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/trie/_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/trie/datrie.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/trie/py.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/html5lib/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/ipaddress.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/linklockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/mkdirlockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/pidlockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/sqlitelockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/lockfile/symlinklockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/__about__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/_compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/_structures.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/specifiers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/pkg_resources/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/bar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/counter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/helpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/spinner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/re-vendor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/retrying.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/six.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/basecommand.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/baseparser.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/cacert.pem
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/cmdoptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/bundle.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/completion.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/freeze.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/help.py
@@ -64,77 +172,52 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/unzip.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/wheel.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/zip.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/compat/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/compat/dictconfig.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/download.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/index.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/locations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/log.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/models/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/models/index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/operations/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/operations/freeze.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/pep425tags.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/req.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/runner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_file.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_requirement.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_set.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_uninstall.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/status_codes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/appdirs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/build.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/deprecation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/filesystem.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/logging.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/outdated.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/ui.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/bazaar.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/git.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/mercurial.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/subversion.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/_backport/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/_backport/misc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/_backport/shutil.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/_backport/sysconfig.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/_backport/tarfile.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/compat.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/database.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/locators.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/manifest.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/markers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/metadata.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/resources.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/scripts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/version.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/distlib/wheel.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/constants.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/_base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/alphabeticalattributes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/inject_meta_charset.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/lint.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/optionaltags.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/sanitizer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/filters/whitespace.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/html5parser.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/ihatexml.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/inputstream.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/sanitizer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/serializer/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/serializer/htmlserializer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/tokenizer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treebuilders/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treebuilders/_base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treebuilders/dom.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treebuilders/etree.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treebuilders/etree_lxml.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/_base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/dom.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/etree.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/genshistream.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/lxmletree.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/treewalkers/pulldom.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/trie/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/trie/_base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/trie/datrie.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/trie/py.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/html5lib/utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/vendor/six.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/wheel.py
-license pip.license license="MIT, LGPL2.1"
+license LICENSE.txt license=MIT
+
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/simplejson-$(PYV)
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/argparse-$(PYV)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/lxml-$(PYV)
+
+# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/ordereddict-$(PYV)
 
 # force a dependency on the pip package
 depend type=require \
--- a/components/python/pip/pip.license	Thu Jun 11 06:36:56 2015 -0700
+++ b/components/python/pip/pip.license	Fri Jun 12 07:10:21 2015 -0600
@@ -1,4 +1,140 @@
-Copyright (c) 2008-2013 The pip developers (see AUTHORS.txt file)
+===============================================================================
+CacheControl-0.11.1
+===============================================================================
+The MIT License (MIT)
+
+Copyright (c) 2015 Eric Larson 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+certifi-14.05.14
+===============================================================================
+This packge contains a modified version of ca-bundle.crt:
+
+ca-bundle.crt -- Bundle of CA Root Certificates
+
+Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011#
+This is a bundle of X.509 certificates of public Certificate Authorities
+(CA). These were automatically extracted from Mozilla's root certificates
+file (certdata.txt). This file can be found in the mozilla source tree:
+http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
+It contains the certificates in PEM format and therefore
+can be directly used with curl / libcurl / php_curl, or with
+an Apache+mod_ssl webserver for SSL client authentication.
+Just configure this file as the SSLCACertificateFile.#
+
+***** BEGIN LICENSE BLOCK *****
+This Source Code Form is subject to the terms of the Mozilla Public License,
+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
+one at http://mozilla.org/MPL/2.0/.
+
+***** END LICENSE BLOCK *****
[email protected](#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
+
+===============================================================================
+colorama-0.3.3
+===============================================================================
+Copyright (c) 2010 Jonathan Hartley
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holders, nor those of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS 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 HOLDER OR CONTRIBUTORS 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.
+
+===============================================================================
+distlib-0.2.0
+===============================================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") 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 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software
+Foundation; All Rights Reserved" are retained in Python 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 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.
+
+4. PSF is making Python 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 WILL NOT INFRINGE ANY
+THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, 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, Licensee agrees
+to be bound by the terms and conditions of this License Agreement.
+
+===============================================================================
+html5lib-0.999
+===============================================================================
+Copyright (c) 2006-2013 James Graham and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,35 +155,508 @@
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
---------------------------------------------------------------------------
+===============================================================================
+ipaddress-1.0.7
+===============================================================================
+This package is a modified version of cpython's ipaddress module.
+It is therefore distributed under the PSF license, as follows: 
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") 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 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are
+retained in Python 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 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.
+
+4. PSF is making Python 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 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+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, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+===============================================================================
+lockfile-0.10.2
+===============================================================================
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
 
-Copyright (C) 2002 Lars Gustaebel <[email protected]>
-All rights reserved.
+Copyright (c) 2007 Skip Montanaro.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+===============================================================================
+packaging-15.0
+===============================================================================
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
 
-Permission  is  hereby granted,  free  of charge,  to  any person
-obtaining a  copy of  this software  and associated documentation
-files  (the  "Software"),  to   deal  in  the  Software   without
-restriction,  including  without limitation  the  rights to  use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies  of  the  Software,  and to  permit  persons  to  whom the
-Software  is  furnished  to  do  so,  subject  to  the  following
-conditions:
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
 
-The above copyright  notice and this  permission notice shall  be
-included in all copies or substantial portions of the Software.
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS%
+
+===============================================================================
+progress-1.2
+===============================================================================
+# Copyright (c) 2012 Giorgos Verigakis 
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, 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.
+
+===============================================================================
+requests-2.5.1
+===============================================================================
+Copyright 2014 Kenneth Reitz
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+===============================================================================
+retrying-1.3.3
+===============================================================================
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
 
-THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY  KIND,
-EXPRESS OR IMPLIED, INCLUDING  BUT NOT LIMITED TO  THE WARRANTIES
-OF  MERCHANTABILITY,  FITNESS   FOR  A  PARTICULAR   PURPOSE  AND
-NONINFRINGEMENT.  IN  NO  EVENT SHALL  THE  AUTHORS  OR COPYRIGHT
-HOLDERS  BE LIABLE  FOR ANY  CLAIM, DAMAGES  OR OTHER  LIABILITY,
-WHETHER  IN AN  ACTION OF  CONTRACT, TORT  OR OTHERWISE,  ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
 
---------------------------------------------------------------------------
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
 
-Copyright (c) 2010-2013 Benjamin Peterson
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "[]"
+replaced with your own identifying information. (Don't include
+the brackets!) The text should be enclosed in the appropriate
+comment syntax for the file format. We also recommend that a
+file or class name and description of purpose be included on the
+same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.%
+
+===============================================================================
+six-1.9.0
+===============================================================================
+Copyright (c) 2010-2015 Benjamin Peterson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -66,13 +675,14 @@
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
---------------------------------------------------------------------------
-
-                GNU LESSER GENERAL PUBLIC LICENSE
-                   Version 2.1, February 1999 
+===============================================================================
+chardet 2.3.0
+===============================================================================
+		 GNU LESSER GENERAL PUBLIC LICENSE
+		 Version 2.1, February 1999
 
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 
@@ -80,7 +690,7 @@
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]
 
-Preamble
+			 Preamble
 
 The licenses for most software are designed to take away your
 freedom to share and change it. By contrast, the GNU General Public
@@ -182,6 +792,7 @@
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
+		 GNU LESSER GENERAL PUBLIC LICENSE
 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 0. This License Agreement applies to any software library or other
@@ -438,7 +1049,7 @@
 subject to these terms and conditions. You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
-this License. 
+this License.
 
 11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
@@ -501,7 +1112,7 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-NO WARRANTY 
+			 NO WARRANTY
 
 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -524,7 +1135,7 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-END OF TERMS AND CONDITIONS
+		 END OF TERMS AND CONDITIONS
 
 How to Apply These Terms to Your New Libraries
 
@@ -539,8 +1150,8 @@
 convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
-one line to give the library's name and an idea of what it does.
-Copyright (C) year name of author
+
+Copyright (C) 
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -554,7 +1165,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -565,7 +1176,159 @@
 Yoyodyne, Inc., hereby disclaims all copyright interest in the
 library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
-signature of Ty Coon, 1 April 1990
+, 1 April 1990
 Ty Coon, President of Vice
 
 That's all there is to it!
+
+===============================================================================
+urllib3 1.10.1 + dev
+===============================================================================
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright 2008-2014 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+===============================================================================
+ordered_dict.py
+===============================================================================
+Copyright (c) 2009 Raymond Hettinger
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+===============================================================================
+six 1.2.0
+===============================================================================
+Copyright (c) 2010-2011 Benjamin Peterson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===============================================================================
+ssl_match_hostname 3.4.0.2
+===============================================================================
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") 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 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, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software
+Foundation; All Rights Reserved" are retained in Python 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 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.
+
+4. PSF is making Python 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 WILL NOT INFRINGE ANY
+THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, 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, Licensee agrees
+to be bound by the terms and conditions of this License Agreement.
+
+===============================================================================
+pip 6.0.8
+===============================================================================
+Copyright (c) 2008-2014 The pip developers (see AUTHORS.txt file)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
--- a/components/python/pip/resolve.deps	Thu Jun 11 06:36:56 2015 -0700
+++ b/components/python/pip/resolve.deps	Fri Jun 12 07:10:21 2015 -0600
@@ -1,3 +1,5 @@
+library/python-2/requests-26
+library/python-2/requests-27
 library/python-2/setuptools-26
 library/python-2/setuptools-27
 runtime/python-26