[Python-modules-commits] [python-virtualenv] 13/17: merge patched into master

Barry Warsaw barry at moszumanska.debian.org
Sun Jan 31 22:20:52 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 ed95318690f05768d98da3a1ffd0fe0bd5f83096
Merge: df6909b 7f718af
Author: Barry Warsaw <barry at python.org>
Date:   Sat Jan 30 15:24:19 2016 -0500

    merge patched into master

 debian/.git-dpm                      |  4 ++--
 debian/patches/python2-default.patch |  6 +++---
 debian/patches/use-wheels.patch      | 21 +++++++++++----------
 virtualenv.py                        |  5 +++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --cc debian/.git-dpm
index 9ed0cf8,0000000..3dce7bb
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
- 6ca0ec986bab79a34d52f137961d65a64922eb0a
- 6ca0ec986bab79a34d52f137961d65a64922eb0a
++7f718af36d4ef0a7a592f3c37a889a057fcb8411
++7f718af36d4ef0a7a592f3c37a889a057fcb8411
 +b97fe01129d70ed8267857e5ca9963c10ebcedd7
 +b97fe01129d70ed8267857e5ca9963c10ebcedd7
 +python-virtualenv_14.0.3+ds.orig.tar.gz
 +d6806f6d8f740202b894c438cb2dac6dc62526f2
 +96239
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/python2-default.patch
index fdae360,0000000..8c8d232
mode 100644,000000..100644
--- a/debian/patches/python2-default.patch
+++ b/debian/patches/python2-default.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 6ca0ec986bab79a34d52f137961d65a64922eb0a Mon Sep 17 00:00:00 2001
++From 7f718af36d4ef0a7a592f3c37a889a057fcb8411 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 869c060..aafb674 100755
++index e5e8c3b..0c9bf9a 100755
 +--- a/virtualenv.py
 ++++ b/virtualenv.py
- @@ -541,9 +541,10 @@ def main():
++@@ -542,9 +542,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/use-wheels.patch
index b3aba65,0000000..65150b4
mode 100644,000000..100644
--- a/debian/patches/use-wheels.patch
+++ b/debian/patches/use-wheels.patch
@@@ -1,126 -1,0 +1,127 @@@
- From a89a9c81c6cb021643ccedb810b422f0fdb8eee7 Mon Sep 17 00:00:00 2001
++From 3d99af8cfa1efe15d2ba59580a5445c9abe85b8b 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 the archive's wheels instead of the bundled wheels, by
 +
 + prepending their 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.
 +Forwarded: not-needed
 +
 +Patch-Name: use-wheels.patch
 +---
 + scripts/virtualenv |  9 +++++++++
 + setup.py           |  4 ++--
-  virtualenv.py      | 46 ++++++++++++++++++++++++++++++++++++++++++++--
-  3 files changed, 55 insertions(+), 4 deletions(-)
++ virtualenv.py      | 47 +++++++++++++++++++++++++++++++++++++++++++++--
++ 3 files changed, 56 insertions(+), 4 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 69e072c..8e16ced 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -122,6 +122,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.py b/virtualenv.py
- index 4589dd9..869c060 100755
++index 4589dd9..e5e8c3b 100755
 +--- a/virtualenv.py
 ++++ b/virtualenv.py
- @@ -36,6 +36,10 @@ except ImportError:
++@@ -36,6 +36,11 @@ except ImportError:
 + __version__ = "14.0.3"
 + virtualenv_version = __version__  # legacy
 + 
 ++# Debian: Barry Warsaw <barry at debian.org> 2014-06-06
- +DEBIAN_WHEEL_DEPS = ['chardet', 'colorama', 'distlib', 'html5lib',
- +                     'pip', 'requests', 'setuptools', 'six', 'urllib3']
+++DEBIAN_WHEEL_DEPS = [
+++    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.')
- @@ -393,7 +397,11 @@ def _find_file(filename, dirs):
++@@ -393,7 +398,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:
- @@ -734,7 +742,16 @@ def call_subprocess(cmd, show_stdout=True,
++@@ -734,7 +743,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, stdin=None, stdout=stdout,
- @@ -887,6 +904,31 @@ def create_environment(home_dir, site_packages=False, clear=False,
++@@ -887,6 +905,31 @@ 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/{}-*.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')
 + 

-- 
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