[Python-modules-commits] r32003 - in packages/sphinx/trunk/debian (6 files)

Thu Mar 12 08:21:07 UTC 2015

Date: Thursday, March 12, 2015 @ 08:21:04
  Author: mitya57
Revision: 32003

* New upstream release.
  - The codebase now works with Python 3 with no need to run 2to3.
  - Output is now reproducible (closes: #776443).
* Remove patches:
  - python3_test_build_dir.diff (no longer needed)
  - parallel_2to3.diff (no longer needed)
  - fix_latex_hlines.diff (applied upstream)

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/initialize_autodoc.diff
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/fix_latex_hlines.diff
  packages/sphinx/trunk/debian/patches/parallel_2to3.diff
  packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================

--- packages/sphinx/trunk/debian/changelog	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/changelog	2015-03-12 08:21:04 UTC (rev 32003)
@@ -4,6 +4,13 @@
   * Mark libjs-sphinxdoc Multi-Arch: foreign (closes: #779458).
 
   [ Dmitry Shachnev ]
+  * New upstream release.
+    - The codebase now works with Python 3 with no need to run 2to3.
+    - Output is now reproducible (closes: #776443).
+  * Remove patches:
+    - python3_test_build_dir.diff (no longer needed)
+    - parallel_2to3.diff (no longer needed)
+    - fix_latex_hlines.diff (applied upstream)
   * Use upstream tarball, which now contains non-minified versions of
     jquery.js and underscore.js.
   * Update debian/watch to use pypi.debian.net redirector.

Deleted: packages/sphinx/trunk/debian/patches/fix_latex_hlines.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_latex_hlines.diff	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/patches/fix_latex_hlines.diff	2015-03-12 08:21:04 UTC (rev 32003)
@@ -1,32 +0,0 @@
-Description: fix writing table hlines in latex writer
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/91597cc54b0b2e
-Bug-Debian: https://bugs.debian.org/732585
-Last-Update: 2014-03-01
-
---- a/sphinx/writers/latex.py
-+++ b/sphinx/writers/latex.py
-@@ -743,14 +743,14 @@
-         # Redirect head output until header is finished. see visit_tbody.
-         self.body = self.tableheaders
-     def depart_thead(self, node):
--        self.body.append('\\hline')
-+        pass
- 
-     def visit_tbody(self, node):
-         if not self.table.had_head:
-             self.visit_thead(node)
-         self.body = self.tablebody
-     def depart_tbody(self, node):
--        self.body.append('\\hline')
-+        pass
- 
-     def visit_row(self, node):
-         self.table.col = 0
-@@ -758,6 +758,7 @@
-         if self.previous_spanning_row == 1:
-             self.previous_spanning_row = 0
-         self.body.append('\\\\\n')
-+        self.body.append('\\hline')
-         self.table.rowcount += 1
- 
-     def visit_entry(self, node):

Modified: packages/sphinx/trunk/debian/patches/initialize_autodoc.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/patches/initialize_autodoc.diff	2015-03-12 08:21:04 UTC (rev 32003)
@@ -7,7 +7,7 @@
 
 --- a/sphinx/ext/autosummary/generate.py
 +++ b/sphinx/ext/autosummary/generate.py
-@@ -27,6 +27,7 @@
+@@ -29,6 +29,7 @@
  from jinja2 import FileSystemLoader, TemplateNotFound
  from jinja2.sandbox import SandboxedEnvironment
  
@@ -15,7 +15,7 @@
  from sphinx import package_dir
  from sphinx.ext.autosummary import import_by_name, get_documenter
  from sphinx.jinja2glue import BuiltinTemplateLoader
-@@ -65,6 +66,15 @@
+@@ -67,6 +68,15 @@
      if len(args) < 1:
          p.error('no input files given')
  

Deleted: packages/sphinx/trunk/debian/patches/parallel_2to3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2015-03-12 08:21:04 UTC (rev 32003)
@@ -1,31 +0,0 @@
-Description: run 2to3 in parallel
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-12-18
-
---- a/setup.py
-+++ b/setup.py
-@@ -158,6 +158,23 @@
- 
-     cmdclass['compile_catalog'] = compile_catalog_plusjs
- 
-+if sys.version_info >= (3,):
-+
-+    num_processes = 1
-+    for option in os.environ.get('DEB_BUILD_OPTIONS', '').split():
-+        if option.startswith('parallel='):
-+            num_processes = int(option.split('=', 1)[1])
-+    if num_processes > 1:
-+        import lib2to3.refactor
-+        class RefactoringTool(lib2to3.refactor.MultiprocessRefactoringTool):
-+            def refactor(self, items, write=False, doctests_only=False):
-+                return lib2to3.refactor.MultiprocessRefactoringTool.refactor(
-+                    self, items,
-+                    write=write,
-+                    doctests_only=doctests_only,
-+                    num_processes=num_processes
-+                )
-+        lib2to3.refactor.RefactoringTool = RefactoringTool
- 
- setup(
-     name='Sphinx',

Deleted: packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/patches/python3_test_build_dir.diff	2015-03-12 08:21:04 UTC (rev 32003)
@@ -1,30 +0,0 @@
-Description: fix build directory for test runner
- Hardcode Python 3 build directory in the test runner to the one that Debian
- package uses.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-09-18
-
---- a/tests/run.py
-+++ b/tests/run.py
-@@ -21,17 +21,17 @@
-     # tox installs the sphinx package, no need for sys.path.insert
- else:
-     newroot = path.join(testroot, path.pardir, 'build')
--    newroot = path.join(newroot, listdir(newroot)[0], 'tests')
-+    newroot = path.join(newroot, 'py%d' % sys.version_info[0], 'tests')
- 
- shutil.rmtree(newroot, ignore_errors=True)
- 
- if sys.version_info >= (3, 0):
--    print('Copying and converting sources to build/lib/tests...')
-+    print('Copying and converting sources to build/py3/tests...')
-     from distutils.util import copydir_run_2to3
-     copydir_run_2to3(testroot, newroot)
- else:
-     # just copying test directory to parallel testing
--    print('Copying sources to build/lib/tests...')
-+    print('Copying sources to build/py2/tests...')
-     shutil.copytree(testroot, newroot)
- 
- # always test the sphinx package from build/lib/

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-03-12 08:07:20 UTC (rev 32002)
+++ packages/sphinx/trunk/debian/patches/series	2015-03-12 08:21:04 UTC (rev 32003)
@@ -1,6 +1,3 @@
 disable_distribute_setup.diff
 initialize_autodoc.diff
-python3_test_build_dir.diff
-parallel_2to3.diff
 no_external_css.diff
-fix_latex_hlines.diff


