[Python-modules-commits] [python-virtualenv] 06/07: merge patched into master

Barry Warsaw barry at moszumanska.debian.org
Thu Dec 1 23:08:03 UTC 2016


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-virtualenv.

commit 40c0c410e33ea9f395df3895767633c36c062a37
Merge: 89c6ee4 66f66d7
Author: Barry Warsaw <barry at python.org>
Date:   Thu Dec 1 17:38:04 2016 -0500

    merge patched into master

 PKG-INFO                             | 23 ++++++++++++-----------
 debian/.git-dpm                      |  6 +++---
 debian/patches/python2-default.patch |  6 +++---
 debian/patches/system-python.patch   |  2 +-
 debian/patches/use-wheels.patch      | 22 +++++++++++-----------
 docs/changes.rst                     | 12 ++++++++++++
 virtualenv.egg-info/PKG-INFO         | 23 ++++++++++++-----------
 virtualenv.egg-info/SOURCES.txt      |  4 ++--
 virtualenv.py                        |  5 +++--
 9 files changed, 59 insertions(+), 44 deletions(-)

diff --cc debian/.git-dpm
index 1acdb6f,0000000..accd870
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- f71c8f8e68870960f52602d23a0fe56fa6a1431f
- f71c8f8e68870960f52602d23a0fe56fa6a1431f
- 72e282aa85135921129990c97c95b4da9eb66bbd
++66f66d7d96bc2596acaa6e36ac30483bded3d01a
++66f66d7d96bc2596acaa6e36ac30483bded3d01a
++6feb59786db60b88c1771f1d787175a9cfc5e3f1
 +6feb59786db60b88c1771f1d787175a9cfc5e3f1
 +python-virtualenv_15.1.0+ds.orig.tar.gz
 +9494e534dac0f4208063b3831415f8a6a47ba3a6
 +88232
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/python2-default.patch
index b6cb83f,0000000..e5ccd5b
mode 100644,000000..100644
--- a/debian/patches/python2-default.patch
+++ b/debian/patches/python2-default.patch
@@@ -1,31 -1,0 +1,31 @@@
- From f71c8f8e68870960f52602d23a0fe56fa6a1431f Mon Sep 17 00:00:00 2001
++From 66f66d7d96bc2596acaa6e36ac30483bded3d01a Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Fri, 9 Oct 2015 22:23:59 +0200
 +Subject: Even though /usr/bin/virtualenv is a Python 3 script now, in
 +
 + Debian we still want to default to using Python 2 unless the -p/--python
 + argument is given.
 +Forwarded: not-needed
 +
 +Patch-Name: python2-default.patch
 +---
 + virtualenv.py | 5 +++--
 + 1 file changed, 3 insertions(+), 2 deletions(-)
 +
 +diff --git a/virtualenv.py b/virtualenv.py
- index 7db92a9..bea02bb 100755
++index 0e1d03f..61fe544 100755
 +--- a/virtualenv.py
 ++++ b/virtualenv.py
- @@ -546,9 +546,10 @@ def main():
++@@ -548,9 +548,10 @@ def main():
 +         '-p', '--python',
 +         dest='python',
 +         metavar='PYTHON_EXE',
 ++        default='python2',
 +         help='The Python interpreter to use, e.g., --python=python2.5 will use the python2.5 '
 +-        'interpreter to create the new environment.  The default is the interpreter that '
 +-        'virtualenv was installed with (%s)' % sys.executable)
 ++        'interpreter to create the new environment.  The default is the python2 '
 ++        'interpreter on your path (e.g. /usr/bin/python2)')
 + 
 +     parser.add_option(
 +         '--clear',
diff --cc debian/patches/system-python.patch
index 92f8cc7,0000000..930910f
mode 100644,000000..100644
--- a/debian/patches/system-python.patch
+++ b/debian/patches/system-python.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 9f137467843b1e6f7943d50cafba687773497a85 Mon Sep 17 00:00:00 2001
++From 5212e71ea4e0e71e94ced21931422f87d3d00e5e Mon Sep 17 00:00:00 2001
 +From: Stefano Rivera <stefanor at debian.org>
 +Date: Fri, 9 Oct 2015 22:23:56 +0200
 +Subject: Use /usr/bin/python3 in the shebang.
 +
 +Bug-Debian: #663228
 +Forwarded: not-needed
 +Last-Update: 2014-06-02
 +
 +Patch-Name: system-python.patch
 +---
 + scripts/virtualenv | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/scripts/virtualenv b/scripts/virtualenv
 +index c961dd7..418bd79 100644
 +--- a/scripts/virtualenv
 ++++ b/scripts/virtualenv
 +@@ -1,3 +1,3 @@
 +-#!/usr/bin/env python
 ++#!/usr/bin/python3
 + import virtualenv
 + virtualenv.main()
diff --cc debian/patches/use-wheels.patch
index 42e398e,0000000..293b719
mode 100644,000000..100644
--- a/debian/patches/use-wheels.patch
+++ b/debian/patches/use-wheels.patch
@@@ -1,163 -1,0 +1,163 @@@
- From 724eee2ee5c9296efdc10ca07d6c916705e96bc4 Mon Sep 17 00:00:00 2001
++From 622ffb4f43d102425b9fbf60897f403433e06a44 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Fri, 9 Oct 2015 22:23:58 +0200
 +Subject: Use distro wheels instead of the bundled wheels.
 +
 +Prepend the wheel paths onto the front of sys.path.  Also, when the venv
 +is created, copy the system wheels into <venv>/lib/python-wheels for use
 +by our patched pip wheel.  Make sure the command line script uses the
 +system wheels first.
 +
 +Under Debian, we also have to install pkg_resources and _markerlib.
 +Since these get installed from distro wheels, and since Debian splits
 +setuptools and pkg_resources into separate binary packages, they get
 +built into separate wheels.  Thus we have to explicitly install
 +pkg_resources from wheel or assumptions made by Python packages that the
 +two always go together will be broken.
 +
 +Forwarded: not-needed
 +
 +Patch-Name: use-wheels.patch
 +---
 + scripts/virtualenv              |  9 +++++++
 + setup.py                        |  4 ++--
 + virtualenv.egg-info/SOURCES.txt |  4 ++--
 + virtualenv.py                   | 52 ++++++++++++++++++++++++++++++++++++++---
 + 4 files changed, 62 insertions(+), 7 deletions(-)
 +
 +diff --git a/scripts/virtualenv b/scripts/virtualenv
 +index 418bd79..7dd0203 100644
 +--- a/scripts/virtualenv
 ++++ b/scripts/virtualenv
 +@@ -1,3 +1,12 @@
 + #!/usr/bin/python3
 + import virtualenv
 ++
 ++# Debian: Barry Warsaw <barry at debian.org> 2014-06-02
 ++# Instead of using the bundled wheels, use the ones in the archive.
 ++import sys
 ++for path in virtualenv.find_wheels(virtualenv.DEBIAN_WHEEL_DEPS,
 ++                                   ['/usr/share/python-wheels']):
 ++    if path not in sys.path:
 ++        sys.path.insert(0, path)
 ++
 + virtualenv.main()
 +diff --git a/setup.py b/setup.py
 +index ee03bc5..978f1db 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -118,6 +118,6 @@ setup(
 +     url='https://virtualenv.pypa.io/',
 +     license='MIT',
 +     py_modules=['virtualenv'],
 +-    packages=['virtualenv_support'],
 +-    package_data={'virtualenv_support': ['*.whl']},
 ++    #packages=['virtualenv_support'],
 ++    #package_data={'virtualenv_support': ['*.whl']},
 +     **setup_params)
 +diff --git a/virtualenv.egg-info/SOURCES.txt b/virtualenv.egg-info/SOURCES.txt
- index 25b9437..963bead 100644
++index 40ba997..7018270 100644
 +--- a/virtualenv.egg-info/SOURCES.txt
 ++++ b/virtualenv.egg-info/SOURCES.txt
 +@@ -41,5 +41,5 @@ virtualenv_embedded/site.py
 + virtualenv_support/__init__.py
 + virtualenv_support/argparse-1.4.0-py2.py3-none-any.whl
-  virtualenv_support/pip-8.1.2-py2.py3-none-any.whl
- -virtualenv_support/setuptools-22.0.5-py2.py3-none-any.whl
++ virtualenv_support/pip-9.0.1-py2.py3-none-any.whl
++-virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl
 +-virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl
 +\ No newline at end of file
- +virtualenv_support/setuptools-25.2.0-py2.py3-none-any.whl
+++virtualenv_support/setuptools-28.7.1-py2.py3-none-any.whl
 ++virtualenv_support/wheel-0.29.0-py2.py3-none-any.whl
 +diff --git a/virtualenv.py b/virtualenv.py
- index 14706b0..7db92a9 100755
++index 42cd1f4..0e1d03f 100755
 +--- a/virtualenv.py
 ++++ b/virtualenv.py
 +@@ -39,6 +39,12 @@ except ImportError:
-  __version__ = "15.0.3"
++ __version__ = "15.1.0"
 + virtualenv_version = __version__  # legacy
 + 
 ++# Debian: Barry Warsaw <barry at debian.org> 2014-06-06
 ++DEBIAN_WHEEL_DEPS = [
 ++    os.path.basename(whl).split('-')[0]
 ++    for whl in glob.glob('/usr/share/python-wheels/*.whl')
 ++    ]
 ++
 + if sys.version_info < (2, 6):
 +     print('ERROR: %s' % sys.exc_info()[1])
 +     print('ERROR: this script requires Python 2.6 or greater.')
- @@ -396,7 +402,11 @@ def _find_file(filename, dirs):
++@@ -398,7 +404,11 @@ def _find_file(filename, dirs):
 + 
 + def file_search_dirs():
 +     here = os.path.dirname(os.path.abspath(__file__))
 +-    dirs = [here, join(here, 'virtualenv_support')]
 ++    # Debian: Barry Warsaw <barry at debian.org> 2015-06-11
 ++    # Don't include the bundled wheels in the search dirs, since we strip them
 ++    # out in favor of the system wheels.
 ++    #dirs = [here, join(here, 'virtualenv_support')]
 ++    dirs = [here, '/usr/share/python-wheels/']
 +     if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
 +         # Probably some boot script; just in case virtualenv is installed...
 +         try:
- @@ -742,7 +752,16 @@ def call_subprocess(cmd, show_stdout=True,
++@@ -744,7 +754,16 @@ def call_subprocess(cmd, show_stdout=True,
 +             for varname in remove_from_env:
 +                 env.pop(varname, None)
 +     else:
 +-        env = None
 ++        env = {}
 ++    # Debian: Barry Warsaw <barry at debian.org> 2014-06-06
 ++    # We're about to execute $python -c "import sys, pip ..." and run
 ++    # pip.main().  We have to make sure to find pip and setuptools via the
 ++    # wheels if they exist.
 ++    syspath_parts = env.get('PYTHONPATH', '').split(os.pathsep)
 ++    for path in find_wheels(DEBIAN_WHEEL_DEPS, ['/usr/share/python-wheels']):
 ++        if path not in syspath_parts:
 ++            syspath_parts.insert(0, path)
 ++    env['PYTHONPATH'] = os.pathsep.join(syspath_parts)
 +     try:
 +         proc = subprocess.Popen(
 +             cmd, stderr=subprocess.STDOUT,
- @@ -859,7 +878,8 @@ def install_wheel(project_names, py_executable, search_dirs=None,
++@@ -861,7 +880,8 @@ def install_wheel(project_names, py_executable, search_dirs=None,
 + 
 +         import pip
 + 
 +-        cert_data = pkgutil.get_data("pip._vendor.requests", "cacert.pem")
 ++        #cert_data = pkgutil.get_data("pip._vendor.requests", "cacert.pem")
 ++        cert_data = None
 +         if cert_data is not None:
 +             cert_file = tempfile.NamedTemporaryFile(delete=False)
 +             cert_file.write(cert_data)
- @@ -927,8 +947,34 @@ def create_environment(home_dir, site_packages=False, clear=False,
++@@ -928,8 +948,34 @@ def create_environment(home_dir, site_packages=False, clear=False,
 + 
 +     to_install = []
 + 
 ++    # Debian: Barry Warsaw <barry at debian.org> 2014-06-06
 ++    # Copy system wheels into the venv directory where our hacked pip will
 ++    # search, i.e. <venv>/share/python-wheels.
 ++    destdir = os.path.join(home_dir, 'share', 'python-wheels')
 ++    try:
 ++        # The directory could exist.  Because this code may run under Python
 ++        # 2, we can't use `exist_ok=True`.  Catch and ignore the old way.
 ++        os.makedirs(destdir)
 ++    except OSError as error:
 ++        if error.errno != errno.EEXIST:
 ++            raise
 ++    for project in DEBIAN_WHEEL_DEPS:
 ++        wheel_names = glob.glob(
 ++            '/usr/share/python-wheels/{0}-*.whl'.format(project))
 ++        if len(wheel_names) == 0:
 ++            raise RuntimeError('missing dependency wheel %s' % project)
 ++        assert len(wheel_names) == 1, wheel_names
 ++        wheel_name = os.path.basename(wheel_names[0])
 ++        path = os.path.join('/usr/share/python-wheels', wheel_name)
 ++        with open(path, 'rb') as fp:
 ++            whl = fp.read()
 ++        dest = os.path.join(destdir, wheel_name)
 ++        with open(dest, 'wb') as fp:
 ++            fp.write(whl)
 ++
 +     if not no_setuptools:
 +         to_install.append('setuptools')
 ++        to_install.append('pkg_resources')
 + 
 +     if not no_pip:
 +         to_install.append('pip')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-virtualenv.git



More information about the Python-modules-commits mailing list