[Python-modules-commits] r27913 - in packages/python-virtualenv/trunk/debian (4 files)

[barry at users.alioth.debian.org]

    Date: Monday, February 24, 2014 @ 15:43:00
  Author: barry
Revision: 27913

* Team upload.
* New upstream release.
  - Fixed an issue where pip and setuptools were not getting
    installed when using the --system-site-packages flag.
  - Updated pip to 1.5.4.
  - Updated setuptools to 2.2.
  - Fixed an issue with Python 3.4 and sys.stdout encoding being set to
    ascii.
* d/patches: Quilt refreshed.
* d/rules: Removed application of pip_non-writable-home.patch;
  applied upstream.

Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch
  packages/python-virtualenv/trunk/debian/patches/pip_non-writeable-home.patch
  packages/python-virtualenv/trunk/debian/rules

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2014-02-24 14:05:12 UTC (rev 27912)
+++ packages/python-virtualenv/trunk/debian/changelog	2014-02-24 15:43:00 UTC (rev 27913)
@@ -1,3 +1,19 @@
+python-virtualenv (1.11.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+    - Fixed an issue where pip and setuptools were not getting
+      installed when using the --system-site-packages flag.
+    - Updated pip to 1.5.4.
+    - Updated setuptools to 2.2.
+    - Fixed an issue with Python 3.4 and sys.stdout encoding being set to
+      ascii.
+  * d/patches: Quilt refreshed.
+  * d/rules: Removed application of pip_non-writable-home.patch;
+    applied upstream.
+
+ -- Barry Warsaw <barry at debian.org>  Mon, 24 Feb 2014 10:38:54 -0500
+
 python-virtualenv (1.11-2) unstable; urgency=medium
 
   * Patch the bundled pip to handle a missing/non-writeable $HOME.

Modified: packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch	2014-02-24 14:05:12 UTC (rev 27912)
+++ packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch	2014-02-24 15:43:00 UTC (rev 27913)
@@ -3,7 +3,7 @@
 
 --- a/virtualenv.py
 +++ b/virtualenv.py
-@@ -522,7 +522,8 @@
+@@ -526,7 +526,8 @@
  def file_search_dirs():
      here = os.path.dirname(os.path.abspath(__file__))
      dirs = ['.', here,

Modified: packages/python-virtualenv/trunk/debian/patches/pip_non-writeable-home.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/pip_non-writeable-home.patch	2014-02-24 14:05:12 UTC (rev 27912)
+++ packages/python-virtualenv/trunk/debian/patches/pip_non-writeable-home.patch	2014-02-24 15:43:00 UTC (rev 27913)
@@ -1,33 +0,0 @@
-Description: pip: Handle a non-writeable $HOME
-Author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
-Bug-Debian: http://bugs.debian.org/735806
-Bug-Upstream: https://github.com/pypa/virtualenv/issues/535
-Bug-Distlib: https://bitbucket.org/pypa/distlib/issue/39/using-distlib-with-pip-fails-when-user-has
-Origin: upstream, https://bitbucket.org/pypa/distlib/commits/049d8d7703c1d69ddff3afcfc3f727a6db6bc1b8 https://bitbucket.org/pypa/distlib/commits/6237bf7072edaa0695f02b718ac90532e95b46ca
-Last-Update: 2014-01-18
-
---- pip-1.5/pip/_vendor/distlib/util.py
-+++ pip-1.5.1rc1/pip/_vendor/distlib/util.py
-@@ -598,8 +598,20 @@
-     result = os.path.join(result, suffix)
-     # we use 'isdir' instead of 'exists', because we want to
-     # fail if there's a file with that name
--    if not os.path.isdir(result):
--        os.makedirs(result)
-+    if os.path.isdir(result):
-+        usable = os.access(result, os.W_OK)
-+        if not usable:
-+            logger.warning('Directory exists but is not writable: %s', result)
-+    else:
-+        try:
-+            os.makedirs(result)
-+            usable = True
-+        except OSError:
-+            logger.warning('Unable to create %s', result, exc_info=True)
-+            usable = False
-+    if not usable:
-+        result = tempfile.mkdtemp()
-+        logger.warning('Default location unusable, using %s', result)
-     return result
- 
- 

Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules	2014-02-24 14:05:12 UTC (rev 27912)
+++ packages/python-virtualenv/trunk/debian/rules	2014-02-24 15:43:00 UTC (rev 27913)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-PIP_WHL=$(CURDIR)/virtualenv_support/pip-1.5-py2.py3-none-any.whl
+PIP_WHL=$(CURDIR)/virtualenv_support/pip-1.5.4-py2.py3-none-any.whl
 PIP_WHL_PATCHED=$(CURDIR)/virtualenv_support/pip-1.5debian1-py2.py3-none-any.whl
 
 %:
@@ -11,7 +11,8 @@
 	[ -e $(PIP_WHL).orig ] || mv $(PIP_WHL) $(PIP_WHL).orig
 	mkdir -p debian/pip
 	unzip -d debian/pip $(PIP_WHL).orig
-	patch -d debian/pip -p1 < debian/patches/pip_non-writeable-home.patch
+	# Add any necessary embedded pip patch applications here, e.g.
+	#patch -d debian/pip -p1 < debian/patches/pip_non-writeable-home.patch
 	cd debian/pip && zip -r $(PIP_WHL_PATCHED) .
 	# Rebuild the embedded parts, we may be quilt patching their sources
 	[ -e virtualenv.py.orig ] || cp virtualenv.py virtualenv.py.orig