[Python-modules-commits] [sphinx] 03/03: Update patches for the new release.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Jan 9 16:02:36 UTC 2018
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch debian/master
in repository sphinx.
commit 039030286642eccfbf914fde75a2cf9313c85ba8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Jan 9 18:57:35 2018 +0300
Update patches for the new release.
---
debian/changelog | 9 +++++++
debian/patches/disable_js_version_check.diff | 4 +--
debian/patches/reproducible_dicts.diff | 31 ----------------------
debian/patches/reproducible_htmlhelp.diff | 39 ----------------------------
debian/patches/series | 2 --
debian/patches/skip_tests_network.diff | 6 ++---
6 files changed, 14 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c0213f2..9a08a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sphinx (1.6.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop reproducible_dicts.diff and reproducible_htmlhelp.diff, applied
+ in the new release.
+ * Refresh other patches.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 09 Jan 2018 18:56:50 +0300
+
sphinx (1.6.5-4) unstable; urgency=medium
* Change python3.6-2to3 dependencies to python3-lib2to3.
diff --git a/debian/patches/disable_js_version_check.diff b/debian/patches/disable_js_version_check.diff
index 0c5a4bf..c411d8a 100644
--- a/debian/patches/disable_js_version_check.diff
+++ b/debian/patches/disable_js_version_check.diff
@@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+)
diff --git a/tests/test_theming.py b/tests/test_theming.py
-index ef9656b..14a95f1 100644
+index 48a4e18..2606ec7 100644
--- a/tests/test_theming.py
+++ b/tests/test_theming.py
-@@ -58,6 +58,7 @@ def test_theme_api(app, status, warning):
+@@ -60,6 +60,7 @@ def test_theme_api(app, status, warning):
assert not os.path.exists(themedir)
diff --git a/debian/patches/reproducible_dicts.diff b/debian/patches/reproducible_dicts.diff
deleted file mode 100644
index 7c2efa3..0000000
--- a/debian/patches/reproducible_dicts.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Sun, 22 Oct 2017 21:51:47 +0300
-Subject: inspect: Sort dictionary keys when possible
-
-This should help for reproducible builds and for finding items in large
-dictionaries.
-
-(cherry picked from commit 49e486ff47780a3113a98512a88086ffab0e1854)
----
- sphinx/util/inspect.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
-index 5e0d219..f29cd9a 100644
---- a/sphinx/util/inspect.py
-+++ b/sphinx/util/inspect.py
-@@ -203,6 +203,14 @@ def safe_getmembers(object, predicate=None, attr_getter=safe_getattr):
- def object_description(object):
- # type: (Any) -> unicode
- """A repr() implementation that returns text safe to use in reST context."""
-+ if isinstance(object, dict):
-+ try:
-+ sorted_keys = sorted(object)
-+ except TypeError:
-+ pass # Cannot sort dict keys, fall back to generic repr
-+ else:
-+ items = ("%r: %r" % (key, object[key]) for key in sorted_keys)
-+ return "{%s}" % ", ".join(items)
- try:
- s = repr(object)
- except Exception:
diff --git a/debian/patches/reproducible_htmlhelp.diff b/debian/patches/reproducible_htmlhelp.diff
deleted file mode 100644
index fe221d1..0000000
--- a/debian/patches/reproducible_htmlhelp.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Tue, 12 Dec 2017 00:12:45 +0300
-Subject: Fix for reproducibility of htmlhelp and qthelp builds
-
-Make sure the generated list of files is sorted.
-This is similar to what was applied to EPub builder in 0b7c73a981.
-
-(cherry picked from commit 1502fbda61240aae8ee799dc67c0536e0a210327)
----
- sphinx/builders/htmlhelp.py | 2 +-
- sphinx/builders/qthelp.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
-index 764b01a..c2e3bbe 100644
---- a/sphinx/builders/htmlhelp.py
-+++ b/sphinx/builders/htmlhelp.py
-@@ -246,7 +246,7 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
- olen = len(outdir)
- for root, dirs, files in os.walk(outdir):
- staticdir = root.startswith(path.join(outdir, '_static'))
-- for fn in files:
-+ for fn in sorted(files):
- if (staticdir and not fn.endswith('.js')) or \
- fn.endswith('.html'):
- print(path.join(root, fn)[olen:].replace(os.sep, '\\'),
-diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
-index b1c94c5..14979fe 100644
---- a/sphinx/builders/qthelp.py
-+++ b/sphinx/builders/qthelp.py
-@@ -188,7 +188,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
- for root, dirs, files in os.walk(outdir):
- resourcedir = root.startswith(staticdir) or \
- root.startswith(imagesdir)
-- for fn in files:
-+ for fn in sorted(files):
- if (resourcedir and not fn.endswith('.js')) or \
- fn.endswith('.html'):
- filename = path.join(root, fn)[olen:]
diff --git a/debian/patches/series b/debian/patches/series
index 9a89940..610993d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,4 @@ disable_js_version_check.diff
no_snowballstemmer.diff
skip_tests_network.diff
no_require_websupport.diff
-reproducible_dicts.diff
reproducible_epub.diff
-reproducible_htmlhelp.diff
diff --git a/debian/patches/skip_tests_network.diff b/debian/patches/skip_tests_network.diff
index d7d8057..151d4c7 100644
--- a/debian/patches/skip_tests_network.diff
+++ b/debian/patches/skip_tests_network.diff
@@ -9,10 +9,10 @@ Forwarded: not-needed
2 files changed, 3 insertions(+)
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
-index 55f48cd..229f83e 100644
+index 0c95a0c..c977311 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
-@@ -1010,6 +1010,7 @@ def test_latex_raw_directive(app, status, warning):
+@@ -1042,6 +1042,7 @@ def test_latex_raw_directive(app, status, warning):
assert 'LaTeX: abc def ghi' in result
@@ -21,7 +21,7 @@ index 55f48cd..229f83e 100644
def test_latex_remote_images(app, status, warning):
app.builder.build_all()
diff --git a/tests/test_build_linkcheck.py b/tests/test_build_linkcheck.py
-index f776f77..b2951a7 100644
+index 839a156..4fb97e7 100644
--- a/tests/test_build_linkcheck.py
+++ b/tests/test_build_linkcheck.py
@@ -13,6 +13,7 @@ from __future__ import print_function
--
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