[Python-modules-commits] [sphinx] 12/13: merge patched into master
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Dec 3 15:36:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sphinx.
commit 04efb4565704b20cfa4d9ecdf7d8196c3e27b25c
Merge: 31617ca 34b8575
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Dec 3 18:32:05 2015 +0300
merge patched into master
CHANGES | 14 +-
MANIFEST.in | 1 +
PKG-INFO | 2 +-
Sphinx.egg-info/PKG-INFO | 2 +-
Sphinx.egg-info/SOURCES.txt | 15 +
debian/.git-dpm | 6 +-
debian/patches/disable_distribute_setup.diff | 2 +-
debian/patches/disable_js_version_check.diff | 2 +-
debian/patches/no_external_css.diff | 2 +-
debian/patches/no_snowballstemmer.diff | 2 +-
debian/patches/reproducible_grammar.diff | 2 +-
debian/patches/reproducible_inventory.diff | 2 +-
debian/patches/reproducible_js_locale.diff | 2 +-
debian/patches/reproducible_searchindex.diff | 2 +-
debian/patches/source_date_epoch.diff | 2 +-
sphinx/__init__.py | 6 +-
sphinx/builders/devhelp.py | 4 +-
sphinx/domains/std.py | 7 +-
sphinx/search/non-minified-js/danish-stemmer.js | 1873 ++++++
sphinx/search/non-minified-js/dutch-stemmer.js | 2637 ++++++++
sphinx/search/non-minified-js/finnish-stemmer.js | 2812 ++++++++
sphinx/search/non-minified-js/french-stemmer.js | 3667 +++++++++++
sphinx/search/non-minified-js/german-stemmer.js | 2506 ++++++++
sphinx/search/non-minified-js/hungarian-stemmer.js | 2893 +++++++++
sphinx/search/non-minified-js/italian-stemmer.js | 2978 +++++++++
sphinx/search/non-minified-js/norwegian-stemmer.js | 1771 ++++++
sphinx/search/non-minified-js/porter-stemmer.js | 2518 ++++++++
.../search/non-minified-js/portuguese-stemmer.js | 2817 ++++++++
sphinx/search/non-minified-js/romanian-stemmer.js | 2694 ++++++++
sphinx/search/non-minified-js/russian-stemmer.js | 2232 +++++++
sphinx/search/non-minified-js/spanish-stemmer.js | 2938 +++++++++
sphinx/search/non-minified-js/swedish-stemmer.js | 1743 +++++
sphinx/search/non-minified-js/turkish-stemmer.js | 6721 ++++++++++++++++++++
tests/roots/test-numfig/index.rst | 2 +
tests/test_build_html.py | 15 +
35 files changed, 42871 insertions(+), 21 deletions(-)
diff --cc debian/.git-dpm
index 5e56387,0000000..c432019
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
- 515524e3e9135ddf35191c646437ef65df99b745
- 515524e3e9135ddf35191c646437ef65df99b745
- ded891849d330349aeb9f9f1ae21ab9f54460338
++34b8575ce2dce459aa29179c9ea4f45351ddc8c8
++34b8575ce2dce459aa29179c9ea4f45351ddc8c8
++0d21a8c899c1d9102b90b3243f9fec4c9e7a8f3d
+0d21a8c899c1d9102b90b3243f9fec4c9e7a8f3d
+sphinx_1.3.3.orig.tar.gz
+5f946babc72e24d458ee2d293dd63207a6ab1470
+3602492
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/disable_distribute_setup.diff
index 97281ec,0000000..c36c008
mode 100644,000000..100644
--- a/debian/patches/disable_distribute_setup.diff
+++ b/debian/patches/disable_distribute_setup.diff
@@@ -1,26 -1,0 +1,26 @@@
- From 4da2ea430f6b1804bc7884be834e4638e30b02a7 Mon Sep 17 00:00:00 2001
++From 9336ac3e36d1b2ed061cecf7bf03812108c38640 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk at debian.org>
+Date: Thu, 8 Oct 2015 13:58:02 -0700
+Subject: disable use of distribute_setup, which bootstraps distribute
+ installation
+
+Forwarded: not-needed
+Last-Update: 2013-10-05
+
+Patch-Name: disable_distribute_setup.diff
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 6bc2887..d44e8a9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2,6 +2,7 @@
+ try:
+ from setuptools import setup, find_packages
+ except ImportError:
++ raise
+ import ez_setup
+ ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
diff --cc debian/patches/disable_js_version_check.diff
index a08f28d,0000000..707e8d5
mode 100644,000000..100644
--- a/debian/patches/disable_js_version_check.diff
+++ b/debian/patches/disable_js_version_check.diff
@@@ -1,33 -1,0 +1,33 @@@
- From 6d00b53139d12656d6ff38f8a1791edb9f3e9957 Mon Sep 17 00:00:00 2001
++From 6cdc150881d7826db2a93993e4ec0bc266e53757 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Thu, 8 Oct 2015 13:58:04 -0700
+Subject: disable a test that checks versions of JS libraries
+
+Forwarded: not-needed
+Last-Update: 2015-04-10
+
+Patch-Name: disable_js_version_check.diff
+---
+ tests/test_theming.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test_theming.py b/tests/test_theming.py
+index 3467ca2..db5c527 100644
+--- a/tests/test_theming.py
++++ b/tests/test_theming.py
+@@ -11,6 +11,7 @@
+
+ import os
+ import zipfile
++import unittest
+
+ from sphinx.theming import Theme, ThemeError
+
+@@ -57,6 +58,7 @@ def test_theme_api(app, status, warning):
+ assert not os.path.exists(themedir)
+
+
++ at unittest.skip('In Debian we use packaged JS libraries')
+ @with_app(testroot='tocdepth') # a minimal root
+ def test_js_source(app, status, warning):
+ # Now sphinx provides non-minified JS files for jquery.js and underscore.js
diff --cc debian/patches/no_external_css.diff
index d46ba0b,0000000..dcb838b
mode 100644,000000..100644
--- a/debian/patches/no_external_css.diff
+++ b/debian/patches/no_external_css.diff
@@@ -1,40 -1,0 +1,40 @@@
- From ce1dff8cf21413e31a5fa287468a49947e940759 Mon Sep 17 00:00:00 2001
++From 9a8b47596dc973b6bd54f2abb569eae9c0048e04 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk at debian.org>
+Date: Thu, 8 Oct 2015 13:58:03 -0700
+Subject: don't use CSS files hosted on external sites
+
+Forwarded: no
+Last-Update: 2013-04-08
+
+Patch-Name: no_external_css.diff
+---
+ doc/_themes/sphinx13/layout.html | 2 --
+ sphinx/themes/pyramid/layout.html | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
+index 0e6294c..3c2a2db 100644
+--- a/doc/_themes/sphinx13/layout.html
++++ b/doc/_themes/sphinx13/layout.html
+@@ -14,8 +14,6 @@
+ {% block sidebar2 %}{% endblock %}
+
+ {% block extrahead %}
+- <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700'
+- rel='stylesheet' type='text/css' />
+ {{ super() }}
+ {%- if not embedded %}
+ <style type="text/css">
+diff --git a/sphinx/themes/pyramid/layout.html b/sphinx/themes/pyramid/layout.html
+index 318a366..be95248 100644
+--- a/sphinx/themes/pyramid/layout.html
++++ b/sphinx/themes/pyramid/layout.html
+@@ -1,8 +1,6 @@
+ {%- extends "basic/layout.html" %}
+
+ {%- block extrahead %}
+-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton&subset=latin" type="text/css" media="screen" charset="utf-8" />
+-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic&subset=latin" type="text/css" media="screen" charset="utf-8" />
+ <!--[if lte IE 6]>
+ <link rel="stylesheet" href="{{ pathto('_static/ie6.css', 1) }}" type="text/css" media="screen" charset="utf-8" />
+ <![endif]-->
diff --cc debian/patches/no_snowballstemmer.diff
index d6abd21,0000000..ff2dd10
mode 100644,000000..100644
--- a/debian/patches/no_snowballstemmer.diff
+++ b/debian/patches/no_snowballstemmer.diff
@@@ -1,80 -1,0 +1,80 @@@
- From c757399c3f8fb33b6a791ce50f91799cc7c302b2 Mon Sep 17 00:00:00 2001
++From 419947c3e66ccc86a7d215002a4c15f7a0f039e0 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Thu, 8 Oct 2015 13:58:05 -0700
+Subject: do not support snowballstemmer-based search for now
+
+Forwarded: not-needed
+Last-Update: 2015-05-08
+
+Patch-Name: no_snowballstemmer.diff
+---
+ Sphinx.egg-info/requires.txt | 1 -
+ setup.py | 1 -
+ sphinx/search/__init__.py | 14 --------------
+ tests/run.py | 2 +-
+ 4 files changed, 1 insertion(+), 17 deletions(-)
+
+diff --git a/Sphinx.egg-info/requires.txt b/Sphinx.egg-info/requires.txt
+index 5100b88..db64611 100644
+--- a/Sphinx.egg-info/requires.txt
++++ b/Sphinx.egg-info/requires.txt
+@@ -2,7 +2,6 @@ six>=1.4
+ Jinja2>=2.3
+ Pygments>=2.0
+ docutils>=0.11
+-snowballstemmer>=1.1
+ babel>=1.3,!=2.0
+ alabaster>=0.7,<0.8
+ sphinx_rtd_theme>=0.1,<2.0
+diff --git a/setup.py b/setup.py
+index d44e8a9..d0d4bb6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -51,7 +51,6 @@ requires = [
+ 'Jinja2>=2.3',
+ 'Pygments>=2.0',
+ 'docutils>=0.11',
+- 'snowballstemmer>=1.1',
+ 'babel>=1.3,!=2.0',
+ 'alabaster>=0.7,<0.8',
+ 'sphinx_rtd_theme>=0.1,<2.0',
+diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py
+index e248088..d83d1f6 100644
+--- a/sphinx/search/__init__.py
++++ b/sphinx/search/__init__.py
+@@ -119,22 +119,8 @@ def parse_stop_word(source):
+
+ # maps language name to module.class or directly a class
+ languages = {
+- 'da': 'sphinx.search.da.SearchDanish',
+- 'de': 'sphinx.search.de.SearchGerman',
+ 'en': SearchEnglish,
+- 'es': 'sphinx.search.es.SearchSpanish',
+- 'fi': 'sphinx.search.fi.SearchFinnish',
+- 'fr': 'sphinx.search.fr.SearchFrench',
+- 'hu': 'sphinx.search.hu.SearchHungarian',
+- 'it': 'sphinx.search.it.SearchItalian',
+ 'ja': 'sphinx.search.ja.SearchJapanese',
+- 'nl': 'sphinx.search.nl.SearchDutch',
+- 'no': 'sphinx.search.no.SearchNorwegian',
+- 'pt': 'sphinx.search.pt.SearchPortuguese',
+- 'ro': 'sphinx.search.ro.SearchRomanian',
+- 'ru': 'sphinx.search.ru.SearchRussian',
+- 'sv': 'sphinx.search.sv.SearchSwedish',
+- 'tr': 'sphinx.search.tr.SearchTurkish',
+ }
+
+
+diff --git a/tests/run.py b/tests/run.py
+index 432e231..6d22e9d 100755
+--- a/tests/run.py
++++ b/tests/run.py
+@@ -23,7 +23,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(testroot, os.path.pardir)))
+ # check dependencies before testing
+ print('Checking dependencies...')
+ for modname in ('nose', 'mock', 'six', 'docutils', 'jinja2', 'pygments',
+- 'snowballstemmer', 'babel'):
++ 'babel'):
+ try:
+ __import__(modname)
+ except ImportError as err:
diff --cc debian/patches/reproducible_grammar.diff
index f1b7918,0000000..80f3016
mode 100644,000000..100644
--- a/debian/patches/reproducible_grammar.diff
+++ b/debian/patches/reproducible_grammar.diff
@@@ -1,70 -1,0 +1,70 @@@
- From 148e2a3cb0920a63958211053818b682328c5054 Mon Sep 17 00:00:00 2001
++From 9490c2555e33c85dff9313d8287829a8f8bb286f Mon Sep 17 00:00:00 2001
+From: Val Lorentz <progval at progval.net>
+Date: Thu, 8 Oct 2015 13:58:13 -0700
+Subject: make grammar generation deterministic
+
+Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
+Last-Update: 2015-09-03
+
+Patch-Name: reproducible_grammar.diff
+---
+ sphinx/pycode/pgen2/pgen.py | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/sphinx/pycode/pgen2/pgen.py b/sphinx/pycode/pgen2/pgen.py
+index e199ed8..85a1bcc 100644
+--- a/sphinx/pycode/pgen2/pgen.py
++++ b/sphinx/pycode/pgen2/pgen.py
+@@ -4,6 +4,10 @@
+ from __future__ import print_function
+
+ from six import iteritems
++try:
++ from collections import OrderedDict
++except ImportError: # Fallback for Python 2.6
++ OrderedDict = dict
+
+ # Pgen imports
+
+@@ -57,7 +61,7 @@ class ParserGenerator(object):
+ def make_first(self, c, name):
+ rawfirst = self.first[name]
+ first = {}
+- for label in rawfirst:
++ for label in sorted(rawfirst):
+ ilabel = self.make_label(c, label)
+ ##assert ilabel not in first # X X X failed on <> ... !=
+ first[ilabel] = 1
+@@ -138,8 +142,8 @@ class ParserGenerator(object):
+ totalset[label] = 1
+ overlapcheck[label] = {label: 1}
+ inverse = {}
+- for label, itsfirst in iteritems(overlapcheck):
+- for symbol in itsfirst:
++ for label, itsfirst in sorted(overlapcheck.items()):
++ for symbol in sorted(itsfirst):
+ if symbol in inverse:
+ raise ValueError("rule %s is ambiguous; %s is in the"
+ " first sets of %s as well as %s" %
+@@ -349,6 +353,9 @@ class NFAState(object):
+ assert isinstance(next, NFAState)
+ self.arcs.append((label, next))
+
++ def __hash__(self):
++ return hash(tuple(x[0] for x in self.arcs))
++
+ class DFAState(object):
+
+ def __init__(self, nfaset, final):
+@@ -357,7 +364,10 @@ class DFAState(object):
+ assert isinstance(final, NFAState)
+ self.nfaset = nfaset
+ self.isfinal = final in nfaset
+- self.arcs = {} # map from label to DFAState
++ self.arcs = OrderedDict() # map from label to DFAState
++
++ def __hash__(self):
++ return hash(tuple(self.arcs))
+
+ def addarc(self, next, label):
+ assert isinstance(label, str)
diff --cc debian/patches/reproducible_inventory.diff
index f0b14d1,0000000..0efe5b3
mode 100644,000000..100644
--- a/debian/patches/reproducible_inventory.diff
+++ b/debian/patches/reproducible_inventory.diff
@@@ -1,26 -1,0 +1,26 @@@
- From b694ca253577e3f29b8d42530ab1d58aafb8c0ca Mon Sep 17 00:00:00 2001
++From 2362dbfc62ce1079e78e1708df89e9d238f3ccac Mon Sep 17 00:00:00 2001
+From: Val Lorentz <progval at progval.net>
+Date: Thu, 8 Oct 2015 13:58:14 -0700
+Subject: make inventory generation deterministic
+
+Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
+Last-Update: 2015-08-20
+
+Patch-Name: reproducible_inventory.diff
+---
+ sphinx/builders/html.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
+index 7006eff..d4487fc 100644
+--- a/sphinx/builders/html.py
++++ b/sphinx/builders/html.py
+@@ -830,7 +830,7 @@ class StandaloneHTMLBuilder(Builder):
+ u'# The remainder of this file is compressed using zlib.\n'
+ % (self.config.project, self.config.version)).encode('utf-8'))
+ compressor = zlib.compressobj(9)
+- for domainname, domain in iteritems(self.env.domains):
++ for domainname, domain in sorted(self.env.domains.items()):
+ for name, dispname, type, docname, anchor, prio in \
+ sorted(domain.get_objects()):
+ if anchor.endswith(name):
diff --cc debian/patches/reproducible_js_locale.diff
index ca7905a,0000000..b81ec1e
mode 100644,000000..100644
--- a/debian/patches/reproducible_js_locale.diff
+++ b/debian/patches/reproducible_js_locale.diff
@@@ -1,26 -1,0 +1,26 @@@
- From d6270fd53db3b1d411a9b4c0d0ae8f61c0532e6e Mon Sep 17 00:00:00 2001
++From a991d42676c88a6e7e3b0597e354c1a3a76cb7db Mon Sep 17 00:00:00 2001
+From: Val Lorentz <progval at progval.net>
+Date: Thu, 8 Oct 2015 13:58:15 -0700
+Subject: make JavaScript locale generation deterministic
+
+Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
+Last-Update: 2015-08-20
+
+Patch-Name: reproducible_js_locale.diff
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index d0d4bb6..bd8ac93 100644
+--- a/setup.py
++++ b/setup.py
+@@ -162,7 +162,7 @@ else:
+ messages=jscatalog,
+ plural_expr=catalog.plural_expr,
+ locale=str(catalog.locale)
+- ), outfile)
++ ), outfile, sort_keys=True)
+ outfile.write(');')
+ finally:
+ outfile.close()
diff --cc debian/patches/reproducible_searchindex.diff
index d668d4a,0000000..c2698a3
mode 100644,000000..100644
--- a/debian/patches/reproducible_searchindex.diff
+++ b/debian/patches/reproducible_searchindex.diff
@@@ -1,29 -1,0 +1,29 @@@
- From 515524e3e9135ddf35191c646437ef65df99b745 Mon Sep 17 00:00:00 2001
++From 34b8575ce2dce459aa29179c9ea4f45351ddc8c8 Mon Sep 17 00:00:00 2001
+From: Val Lorentz <progval at progval.net>
+Date: Thu, 8 Oct 2015 13:58:16 -0700
+Subject: make searchindex generation deterministic
+
+Forwarded: https://github.com/sphinx-doc/sphinx/pull/2009
+Last-Update: 2015-09-03
+
+Patch-Name: reproducible_searchindex.diff
+---
+ sphinx/search/__init__.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py
+index d83d1f6..ba25497 100644
+--- a/sphinx/search/__init__.py
++++ b/sphinx/search/__init__.py
+@@ -261,9 +261,9 @@ class IndexBuilder(object):
+ rv = {}
+ otypes = self._objtypes
+ onames = self._objnames
+- for domainname, domain in iteritems(self.env.domains):
++ for domainname, domain in sorted(iteritems(self.env.domains)):
+ for fullname, dispname, type, docname, anchor, prio in \
+- domain.get_objects():
++ sorted(domain.get_objects()):
+ # XXX use dispname?
+ if docname not in fn2index:
+ continue
diff --cc debian/patches/source_date_epoch.diff
index 7a87c34,0000000..3ca7995
mode 100644,000000..100644
--- a/debian/patches/source_date_epoch.diff
+++ b/debian/patches/source_date_epoch.diff
@@@ -1,44 -1,0 +1,44 @@@
- From 0e2eb0485f4b8c743732e4803d8e36aacfe3032b Mon Sep 17 00:00:00 2001
++From bc3fb77d1916c23ed758be45b0c212100845fcf4 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at gmail.com>
+Date: Thu, 8 Oct 2015 13:58:08 -0700
+Subject: add support for $SOURCE_DATE_EPOCH env variable
+
+Origin: upstream, https://github.com/sphinx-doc/sphinx/commit/71bac48e03d07f61
+Last-Update: 2015-07-25
+
+Patch-Name: source_date_epoch.diff
+---
+ sphinx/util/osutil.py | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
+index b4488b5..a56da44 100644
+--- a/sphinx/util/osutil.py
++++ b/sphinx/util/osutil.py
+@@ -151,15 +151,22 @@ no_fn_re = re.compile(r'[^a-zA-Z0-9_-]')
+ def make_filename(string):
+ return no_fn_re.sub('', string) or 'sphinx'
+
+-if PY2:
++
++def ustrftime(format, *args):
+ # strftime for unicode strings
+- def ustrftime(format, *args):
++ if not args:
++ # If time is not specified, try to use $SOURCE_DATE_EPOCH variable
++ # See https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal
++ source_date_epoch = os.getenv('SOURCE_DATE_EPOCH')
++ if source_date_epoch is not None:
++ time_struct = time.gmtime(float(source_date_epoch))
++ args = [time_struct]
++ if PY2:
+ # if a locale is set, the time strings are encoded in the encoding
+ # given by LC_TIME; if that is available, use it
+ enc = locale.getlocale(locale.LC_TIME)[1] or 'utf-8'
+ return time.strftime(text_type(format).encode(enc), *args).decode(enc)
+-else: # Py3
+- def ustrftime(format, *args):
++ else: # Py3
+ # On Windows, time.strftime() and Unicode characters will raise UnicodeEncodeError.
+ # http://bugs.python.org/issue8304
+ try:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git
More information about the Python-modules-commits
mailing list