[Python-modules-commits] r26068 - in packages/sphinx/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Sunday, October 6, 2013 @ 08:39:29
  Author: mitya57-guest
Revision: 26068

Add a patch to make sure setup_command tests can import sphinx module.

Added:
  packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-10-06 08:39:13 UTC (rev 26067)
+++ packages/sphinx/trunk/debian/changelog	2013-10-06 08:39:29 UTC (rev 26068)
@@ -5,6 +5,7 @@
     - Correctly handles errors when repr()-ing objects (closes: #706581).
   * Drop upstream patches.
   * Refresh and rebase other patches.
+  * Add a patch to make sure setup_command tests can import sphinx module.
   * Switch debian/watch to use HTTPS.
   * JS tests:
     - Port from deprecated static bindings and Python 2 to PyGI and
@@ -20,7 +21,7 @@
   [ Jakub Wilk ]
   * Remove myself from Uploaders.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 07 Aug 2013 18:54:40 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 05 Oct 2013 19:29:41 +0400
 
 sphinx (1.2~b1+dfsg-2) experimental; urgency=low
 

Added: packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff	2013-10-06 08:39:29 UTC (rev 26068)
@@ -0,0 +1,31 @@
+Description: make sure setup_command test finds Sphinx
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: yes, https://bitbucket.org/birkenfeld/sphinx/pull-request/176
+Last-Update: 2013-10-05
+
+--- a/tests/test_setup_command.py
++++ b/tests/test_setup_command.py
+@@ -14,6 +14,7 @@
+ import subprocess
+ from functools import wraps
+ import tempfile
++import sphinx
+ 
+ from util import with_tempdir, test_roots, SkipTest
+ from path import path
+@@ -35,11 +36,15 @@
+             root.copytree(pkgrootdir)
+             cwd = os.getcwd()
+             os.chdir(pkgrootdir)
++            pythonpath = os.path.dirname(os.path.dirname(sphinx.__file__))
++            if os.getenv('PYTHONPATH'):
++                pythonpath = os.getenv('PYTHONPATH') + os.pathsep + pythonpath
+             command = [sys.executable, 'setup.py', 'build_sphinx']
+             command.extend(args)
+             try:
+                 proc = subprocess.Popen(
+                     command,
++                    env=dict(os.environ, PYTHONPATH=pythonpath),
+                     stdout=subprocess.PIPE,
+                     stderr=subprocess.PIPE)
+                 func(pkgrootdir, proc, *args, **kwds)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2013-10-06 08:39:13 UTC (rev 26067)
+++ packages/sphinx/trunk/debian/patches/series	2013-10-06 08:39:29 UTC (rev 26068)
@@ -5,3 +5,4 @@
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff
+fix_setup_command_test.diff