Update to 1.7.6

This commit is contained in:
Marcel Plch 2018-07-23 18:00:01 +02:00
parent 9622ed923e
commit 644e00c17b
4 changed files with 17 additions and 14 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/Sphinx-1.7.1.tar.gz
/Sphinx-1.7.2.tar.gz
/Sphinx-1.7.5.tar.gz
/Sphinx-1.7.6.tar.gz

View File

@ -26,8 +26,8 @@
%global upstream_name Sphinx
Name: python-sphinx
Version: 1.7.5
Release: 6%{?dist}
Version: 1.7.6
Release: 1%{?dist}
Epoch: 1
Summary: Python documentation generator
@ -58,8 +58,6 @@ Patch0: xfail-test_latex_remote_images.patch
# which causes that test to fail.
Patch1: sphinx-test_theming.diff
Patch2: https://github.com/sphinx-doc/sphinx/commit/b553c23ab1cadfe75db6637ca95daa11abc87049.patch
BuildArch: noarch
BuildRequires: python2-devel >= 2.4
BuildRequires: python2-babel
@ -620,6 +618,9 @@ popd
%changelog
* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1
- Update to 1.7.6
* Fri Jul 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-6
- Remove unused dependencies on xapian and simplejson

View File

@ -1 +1 @@
SHA512 (Sphinx-1.7.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
SHA512 (Sphinx-1.7.6.tar.gz) = 505c4e92c1a09c48a50d8bd0ec86089bd3f0f5352302ae330e2fba6e61316f40c6ec3726e2cfaeb54de0818127a26ef5364ac92bcf254283022c38c4e95d419c

View File

@ -1,11 +1,12 @@
--- Sphinx-1.7.5/tests/test_theming.py~ 2018-05-28 16:04:20.000000000 +0200
+++ Sphinx-1.7.5/tests/test_theming.py 2018-07-05 16:24:46.454357525 +0200
@@ -24,7 +24,7 @@
cfg = app.config
diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
--- Sphinx-1.7.6/tests/test_theming.py 2018-07-16 11:24:40.000000000 +0200
+++ Sphinx-1.7.6_patched/tests/test_theming.py 2018-07-20 15:17:35.049263077 +0200
@@ -31,7 +31,7 @@
themes.append('alabaster')
# test Theme class API
- assert set(app.html_themes.keys()) == \
+ assert set(app.html_themes.keys()) >= \
set(['basic', 'default', 'scrolls', 'agogo', 'sphinxdoc', 'haiku',
'traditional', 'epub', 'nature', 'pyramid', 'bizstyle', 'classic', 'nonav',
'test-theme', 'ziptheme', 'staticfiles', 'parent', 'child'])
- assert set(app.html_themes.keys()) == set(themes)
+ assert set(app.html_themes.keys()) >= set(themes)
assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'