[Python-modules-commits] [python-virtualenv] 06/08: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Jun 20 13:44:00 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 e2d839cb08abed6c99c33b8615a37aca34a50a00
Merge: d55cf97 a845361
Author: Barry Warsaw <barry at python.org>
Date: Mon Jun 20 09:40:14 2016 -0400
merge patched into master
PKG-INFO | 24 +++++++---------
bin/rebuild-script.py | 13 +++++++--
debian/.git-dpm | 6 ++--
debian/patches/python2-default.patch | 6 ++--
debian/patches/system-python.patch | 2 +-
debian/patches/use-wheels.patch | 28 ++++++++++---------
docs/changes.rst | 11 ++++++++
docs/userguide.rst | 2 +-
setup.cfg | 2 +-
virtualenv.egg-info/PKG-INFO | 24 +++++++---------
virtualenv.egg-info/SOURCES.txt | 4 +--
virtualenv.py | 54 +++++++++++++++++++++++-------------
virtualenv_embedded/activate.fish | 2 +-
13 files changed, 103 insertions(+), 75 deletions(-)
diff --cc debian/.git-dpm
index e3f5b6f,0000000..e8661f8
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
- e916dfa6310918b1f08f2e9595a4f88b3e3294f6
- e916dfa6310918b1f08f2e9595a4f88b3e3294f6
- 2459ce7f242fb3a71c5639aacf77b833191d1be4
++a845361e5cb0fcbd42c35cc63cfff80be6badbbd
++a845361e5cb0fcbd42c35cc63cfff80be6badbbd
++1175831e56a1b3ff31efe3b94b91b9752f3275ff
+1175831e56a1b3ff31efe3b94b91b9752f3275ff
+python-virtualenv_15.0.2+ds.orig.tar.gz
+be1715d96d11f6426ffe9206895eaa7ba19eef96
+87897
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/python2-default.patch
index e4d936d,0000000..a9f4400
mode 100644,000000..100644
--- a/debian/patches/python2-default.patch
+++ b/debian/patches/python2-default.patch
@@@ -1,31 -1,0 +1,31 @@@
- From e916dfa6310918b1f08f2e9595a4f88b3e3294f6 Mon Sep 17 00:00:00 2001
++From a845361e5cb0fcbd42c35cc63cfff80be6badbbd 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 8a558ee..009d077 100755
++index 03927d2..2b6d16a 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
- @@ -543,9 +543,10 @@ def main():
++@@ -546,9 +546,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 c97109d,0000000..6840c94
mode 100644,000000..100644
--- a/debian/patches/system-python.patch
+++ b/debian/patches/system-python.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 69df027d6232f1efee4175503671b3b4e0512af4 Mon Sep 17 00:00:00 2001
++From 2f70aa8df9c47bfd59a541a2f6407f9ee9a6338d 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 5d17acc,0000000..1f9461d
mode 100644,000000..100644
--- a/debian/patches/use-wheels.patch
+++ b/debian/patches/use-wheels.patch
@@@ -1,161 -1,0 +1,163 @@@
- From f7942140118c4135d0ec8822452224461508941d Mon Sep 17 00:00:00 2001
++From 7c071768179604860a6289714f1f17df17dec54c 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 | 2 +-
++ virtualenv.egg-info/SOURCES.txt | 4 ++--
+ virtualenv.py | 52 ++++++++++++++++++++++++++++++++++++++---
- 4 files changed, 61 insertions(+), 6 deletions(-)
++ 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 2524b15..2a2a13d 100644
++index 18ebd31..3c2c9e7 100644
+--- a/virtualenv.egg-info/SOURCES.txt
++++ b/virtualenv.egg-info/SOURCES.txt
- @@ -42,4 +42,4 @@ virtualenv_support/__init__.py
++@@ -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.1-py2.py3-none-any.whl
- virtualenv_support/setuptools-20.3-py2.py3-none-any.whl
++ virtualenv_support/pip-8.1.2-py2.py3-none-any.whl
++-virtualenv_support/setuptools-21.2.1-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-20.10.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 13146f6..8a558ee 100755
++index fb9337f..03927d2 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -39,6 +39,12 @@ except ImportError:
- __version__ = "15.0.1"
++ __version__ = "15.0.2"
+ 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.')
- @@ -393,7 +399,11 @@ def _find_file(filename, dirs):
++@@ -396,7 +402,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:
- @@ -739,7 +749,16 @@ def call_subprocess(cmd, show_stdout=True,
++@@ -742,7 +752,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,
- @@ -856,7 +875,8 @@ def install_wheel(project_names, py_executable, search_dirs=None,
++@@ -859,7 +878,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)
- @@ -924,8 +944,34 @@ def create_environment(home_dir, site_packages=False, clear=False,
++@@ -927,8 +947,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/{}-*.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