diff --git a/.gitignore b/.gitignore index 30051b9..28bb3f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /Sphinx-1.6.6.tar.gz /Sphinx-1.7.1.tar.gz /Sphinx-1.7.2.tar.gz +/Sphinx-1.7.5.tar.gz diff --git a/fix-test_autodoc.patch b/fix-test_autodoc.patch deleted file mode 100644 index f3d969b..0000000 --- a/fix-test_autodoc.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py -index e8427fd84..492db8700 100644 ---- a/sphinx/util/inspect.py -+++ b/sphinx/util/inspect.py -@@ -313,7 +313,10 @@ def __init__(self, subject, bound_method=False): - try: - self.signature = inspect.signature(subject) - except IndexError: -- if hasattr(subject, '_partialmethod'): # partialmethod with no argument -+ # Until python 3.6.4, cpython has been crashed on inspection for -+ # partialmethods not having any arguments. -+ # https://bugs.python.org/issue33009 -+ if hasattr(subject, '_partialmethod'): - self.signature = None - self.partialmethod_with_noargs = True - else: -diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py -index 9398edc34..ed6d050fa 100644 ---- a/tests/test_autodoc.py -+++ b/tests/test_autodoc.py -@@ -952,7 +952,10 @@ def call_autodoc(objtype, name): - ' Update state of cell to *state*.', - ' ', - ] -- if sys.version_info < (3, 5, 4): -+ if (sys.version_info < (3, 5, 4) or -+ (3, 6, 5) <= sys.version_info < (3, 7) or -+ (3, 7, 0, 'beta', 3) <= sys.version_info): -+ # TODO: this condition should be updated after 3.7-final release. - expected = '\n'.join(expected).replace(' -> None', '').split('\n') - - assert call_autodoc('class', 'target.partialmethod.Cell') == expected diff --git a/python-sphinx.spec b/python-sphinx.spec index 7cd8b00..0d5f7f4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -26,8 +26,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.7.2 -Release: 5%{?dist} +Version: 1.7.5 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -54,10 +54,6 @@ Source6: default-sphinx-command.in # to fetch images, which is not possible in koji or mock. Patch0: xfail-test_latex_remote_images.patch -# Fix test_autodoc failure with Python 3.6.5 -# Fixed upstream: https://github.com/sphinx-doc/sphinx/pull/4822 -patch1: fix-test_autodoc.patch - BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python2-babel @@ -622,6 +618,9 @@ popd %changelog +* Tue Jun 19 2018 Charalampos Stratakis - 1:1.7.5-1 +- Update to 1.7.5 (bz#1570451) + * Mon Jun 18 2018 Miro HronĨok - 1:1.7.2-5 - Rebuilt for Python 3.7 diff --git a/sources b/sources index cbcc203..bf910c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.7.2.tar.gz) = 6cb055d969227c727e1cdd8865ddef700d72217e0ef3700383449921e9310f7ed6266d62cf1928ad64372f93468d457c584fac34f6583714cc8a9a3627785ac3 +SHA512 (Sphinx-1.7.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8