Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Michel Alexandre Salim
|
5ae371b9de | ||
|
Michel Alexandre Salim
|
0cf2bb8ad4 | ||
|
Michel Alexandre Salim
|
08db86ecb6 | ||
|
Michel Alexandre Salim
|
d9e0ae5757 | ||
|
Kevin Fenzi
|
de81e8e7b0 |
@@ -0,0 +1 @@
|
|||||||
|
Sphinx-0.4.3.tar.gz
|
||||||
-34
@@ -1,34 +0,0 @@
|
|||||||
/Sphinx-1.2.3.tar.gz
|
|
||||||
/Sphinx-1.3.1.tar.gz
|
|
||||||
/Sphinx-1.4.4.tar.gz
|
|
||||||
/Sphinx-1.4.5.tar.gz
|
|
||||||
/Sphinx-1.4.6.tar.gz
|
|
||||||
/Sphinx-1.4.8.tar.gz
|
|
||||||
/Sphinx-1.4.9.tar.gz
|
|
||||||
/Sphinx-1.5.1.tar.gz
|
|
||||||
/Sphinx-1.5.2.tar.gz
|
|
||||||
/Sphinx-1.6.3.tar.gz
|
|
||||||
/Sphinx-1.6.4.tar.gz
|
|
||||||
/Sphinx-1.6.5.tar.gz
|
|
||||||
/Sphinx-1.6.6.tar.gz
|
|
||||||
/Sphinx-1.7.1.tar.gz
|
|
||||||
/Sphinx-1.7.2.tar.gz
|
|
||||||
/Sphinx-1.7.5.tar.gz
|
|
||||||
/Sphinx-1.7.6.tar.gz
|
|
||||||
/Sphinx-1.8.4.tar.gz
|
|
||||||
/Sphinx-2.0.0b1.tar.gz
|
|
||||||
/Sphinx-2.0.0b2.tar.gz
|
|
||||||
/Sphinx-2.0.1.tar.gz
|
|
||||||
/Sphinx-2.1.2.tar.gz
|
|
||||||
/Sphinx-2.2.0.tar.gz
|
|
||||||
/Sphinx-2.2.2.tar.gz
|
|
||||||
/Sphinx-3.1.1.tar.gz
|
|
||||||
/Sphinx-3.1.2.tar.gz
|
|
||||||
/Sphinx-3.2.1.tar.gz
|
|
||||||
/Sphinx-3.3.1.tar.gz
|
|
||||||
/Sphinx-3.4.3.tar.gz
|
|
||||||
/Sphinx-3.5.2.tar.gz
|
|
||||||
/Sphinx-3.5.3.tar.gz
|
|
||||||
/Sphinx-3.5.4.tar.gz
|
|
||||||
/Sphinx-4.0.2.tar.gz
|
|
||||||
/Sphinx-4.1.2.tar.gz
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Makefile for source rpm: python-sphinx
|
||||||
|
# $Id$
|
||||||
|
NAME := python-sphinx
|
||||||
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
|
||||||
|
define find-makefile-common
|
||||||
|
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
|
|
||||||
|
ifeq ($(MAKEFILE_COMMON),)
|
||||||
|
# attept a checkout
|
||||||
|
define checkout-makefile-common
|
||||||
|
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(MAKEFILE_COMMON)
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
From 648af37d864b5d76bbe833785d664e40d56d9768 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
||||||
Date: Wed, 11 Aug 2021 01:36:46 +0900
|
|
||||||
Subject: [PATCH] Fix #9537: autodoc: Some typing.* objects are broken
|
|
||||||
|
|
||||||
At the HEAD of 3.10, the implementation of `typing._GenericAlias` has
|
|
||||||
been changed to have correct _name and __name__.
|
|
||||||
---
|
|
||||||
sphinx/util/typing.py | 6 ++++--
|
|
||||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
|
|
||||||
index f856950bf2..df5277ae7b 100644
|
|
||||||
--- a/sphinx/util/typing.py
|
|
||||||
+++ b/sphinx/util/typing.py
|
|
||||||
@@ -148,7 +148,9 @@ def _restify_py37(cls: Optional[Type]) -> str:
|
|
||||||
args = ', '.join(restify(a) for a in cls.__args__)
|
|
||||||
return ':obj:`~typing.Union`\\ [%s]' % args
|
|
||||||
elif inspect.isgenericalias(cls):
|
|
||||||
- if getattr(cls, '_name', None):
|
|
||||||
+ if isinstance(cls.__origin__, typing._SpecialForm):
|
|
||||||
+ text = restify(cls.__origin__) # type: ignore
|
|
||||||
+ elif getattr(cls, '_name', None):
|
|
||||||
if cls.__module__ == 'typing':
|
|
||||||
text = ':class:`~%s.%s`' % (cls.__module__, cls._name)
|
|
||||||
else:
|
|
||||||
@@ -344,7 +346,7 @@ def _stringify_py37(annotation: Any) -> str:
|
|
||||||
if not isinstance(annotation.__args__, (list, tuple)):
|
|
||||||
# broken __args__ found
|
|
||||||
pass
|
|
||||||
- elif qualname == 'Union':
|
|
||||||
+ elif qualname in ('Optional', 'Union'):
|
|
||||||
if len(annotation.__args__) > 1 and annotation.__args__[-1] is NoneType:
|
|
||||||
if len(annotation.__args__) > 2:
|
|
||||||
args = ', '.join(stringify(a) for a in annotation.__args__[:-1])
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
From 06ec5b027d01e8f7717e4687f89f335e83545ff9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
||||||
Date: Wed, 18 Aug 2021 01:50:08 +0900
|
|
||||||
Subject: [PATCH] Fix test: Tests has been broken with pygments-2.10+
|
|
||||||
|
|
||||||
---
|
|
||||||
tests/test_intl.py | 21 +++++++++++++++++----
|
|
||||||
1 file changed, 17 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/test_intl.py b/tests/test_intl.py
|
|
||||||
index 7791b4aeed5..e9e7ee9e24b 100644
|
|
||||||
--- a/tests/test_intl.py
|
|
||||||
+++ b/tests/test_intl.py
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
|
|
||||||
+import pygments
|
|
||||||
import pytest
|
|
||||||
from babel.messages import mofile, pofile
|
|
||||||
from babel.messages.catalog import Catalog
|
|
||||||
@@ -30,6 +31,8 @@
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
+pygments_version = tuple(int(v) for v in pygments.__version__.split('.'))
|
|
||||||
+
|
|
||||||
|
|
||||||
def read_po(pathname):
|
|
||||||
with pathname.open() as f:
|
|
||||||
@@ -1060,8 +1063,13 @@ def test_additional_targets_should_not_be_translated(app):
|
|
||||||
assert_count(expected_expr, result, 1)
|
|
||||||
|
|
||||||
# C code block with lang should not be translated but be *C* highlighted
|
|
||||||
- expected_expr = ("""<span class="cp">#include</span> """
|
|
||||||
- """<span class="cpf"><stdio.h></span>""")
|
|
||||||
+ if pygments_version < (2, 10, 0):
|
|
||||||
+ expected_expr = ("""<span class="cp">#include</span> """
|
|
||||||
+ """<span class="cpf"><stdio.h></span>""")
|
|
||||||
+ else:
|
|
||||||
+ expected_expr = ("""<span class="cp">#include</span>"""
|
|
||||||
+ """<span class="w"> </span>"""
|
|
||||||
+ """<span class="cpf"><stdio.h></span>""")
|
|
||||||
assert_count(expected_expr, result, 1)
|
|
||||||
|
|
||||||
# literal block in list item should not be translated
|
|
||||||
@@ -1138,8 +1146,13 @@ def test_additional_targets_should_be_translated(app):
|
|
||||||
assert_count(expected_expr, result, 1)
|
|
||||||
|
|
||||||
# C code block with lang should be translated and be *C* highlighted
|
|
||||||
- expected_expr = ("""<span class="cp">#include</span> """
|
|
||||||
- """<span class="cpf"><STDIO.H></span>""")
|
|
||||||
+ if pygments_version < (2, 10, 0):
|
|
||||||
+ expected_expr = ("""<span class="cp">#include</span> """
|
|
||||||
+ """<span class="cpf"><STDIO.H></span>""")
|
|
||||||
+ else:
|
|
||||||
+ expected_expr = ("""<span class="cp">#include</span>"""
|
|
||||||
+ """<span class="w"> </span>"""
|
|
||||||
+ """<span class="cpf"><STDIO.H></span>""")
|
|
||||||
assert_count(expected_expr, result, 1)
|
|
||||||
|
|
||||||
# literal block in list item should be translated
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
From d0c97e9eb57126e38b7b018a101df1ecb1ad12b8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
||||||
Date: Sat, 31 Jul 2021 01:41:35 +0900
|
|
||||||
Subject: [PATCH] Fix #9504: autodoc: generate incorrect reference to the
|
|
||||||
parent class
|
|
||||||
|
|
||||||
Autodoc generates incorrect references to the parent class the target
|
|
||||||
class inherites the class having `_name` attribute. It conciders the
|
|
||||||
parent is a kind of SpecialForm'ed class by mistake. This uses
|
|
||||||
`isinstance(X, SpecialForm)` to check that.
|
|
||||||
|
|
||||||
Note: SpecialForm became a class since Python 3.7.
|
|
||||||
---
|
|
||||||
CHANGES | 2 ++
|
|
||||||
sphinx/util/typing.py | 8 ++------
|
|
||||||
2 files changed, 4 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
|
|
||||||
index 012d32e524..f856950bf2 100644
|
|
||||||
--- a/sphinx/util/typing.py
|
|
||||||
+++ b/sphinx/util/typing.py
|
|
||||||
@@ -171,12 +171,8 @@ def _restify_py37(cls: Optional[Type]) -> str:
|
|
||||||
text += r"\ [%s]" % ", ".join(restify(a) for a in cls.__args__)
|
|
||||||
|
|
||||||
return text
|
|
||||||
- elif hasattr(cls, '_name'):
|
|
||||||
- # SpecialForm
|
|
||||||
- if cls.__module__ == 'typing':
|
|
||||||
- return ':obj:`~%s.%s`' % (cls.__module__, cls._name)
|
|
||||||
- else:
|
|
||||||
- return ':obj:`%s.%s`' % (cls.__module__, cls._name)
|
|
||||||
+ elif isinstance(cls, typing._SpecialForm):
|
|
||||||
+ return ':obj:`~%s.%s`' % (cls.__module__, cls._name)
|
|
||||||
elif hasattr(cls, '__qualname__'):
|
|
||||||
if cls.__module__ == 'typing':
|
|
||||||
return ':class:`~%s.%s`' % (cls.__module__, cls.__qualname__)
|
|
||||||
+39
-788
@@ -1,125 +1,22 @@
|
|||||||
# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
|
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||||
# Without it we have warnings in docs, but it's not a hard dependency
|
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
|
||||||
%bcond_without websupport
|
|
||||||
# Also, we don't have all the tests requirements
|
|
||||||
%bcond_without tests
|
|
||||||
|
|
||||||
# Unset -s on python shebang to allow RPM-installed sphinx to be used
|
%define upstream_name Sphinx
|
||||||
# with user-installed modules (#1903763)
|
|
||||||
%global py3_shebang_flags %nil
|
|
||||||
|
|
||||||
# No internet in Koji
|
Name: python-sphinx
|
||||||
%bcond_with internet
|
Version: 0.4.3
|
||||||
|
Release: 1%{?dist}
|
||||||
|
Summary: Python documentation generator
|
||||||
|
|
||||||
%if 0%{?rhel} > 7
|
Group: Development/Tools
|
||||||
# Build without BuildRequires ImageMagick, to skip imgconverter tests
|
License: BSD
|
||||||
%bcond_with imagemagick_tests
|
URL: http://sphinx.pocoo.org/
|
||||||
%else
|
Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
|
||||||
%bcond_without imagemagick_tests
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
%endif
|
|
||||||
|
|
||||||
# During texlive updates, sometimes the latex environment is unstable
|
BuildArch: noarch
|
||||||
%bcond_without latex_tests
|
BuildRequires: python-devel python-docutils python-jinja python-setuptools
|
||||||
|
Requires: python-docutils python-jinja python-pygments
|
||||||
%global upstream_name Sphinx
|
|
||||||
|
|
||||||
Name: python-sphinx
|
|
||||||
%global general_version 4.1.2
|
|
||||||
#global prerel ...
|
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
|
||||||
Release: 3%{?dist}
|
|
||||||
Epoch: 1
|
|
||||||
Summary: Python documentation generator
|
|
||||||
|
|
||||||
# Unless otherwise noted, the license for code is BSD
|
|
||||||
# sphinx/util/inspect.py has bits licensed with PSF license v2 (Python)
|
|
||||||
# sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT
|
|
||||||
# JS: JQuery, Underscore, css3-mediaqueries are available under MIT
|
|
||||||
License: BSD and Python and MIT
|
|
||||||
|
|
||||||
URL: https://www.sphinx-doc.org/
|
|
||||||
Source0: %{pypi_source %{upstream_name} %{upstream_version}}
|
|
||||||
|
|
||||||
# Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster
|
|
||||||
# which causes that test to fail.
|
|
||||||
Patch1: sphinx-test_theming.diff
|
|
||||||
# `types.Union` was renamed to `types.UnionType` on the HEAD of Python 3.10
|
|
||||||
# (refs: python/cpython#27342). Afterwars, sphinx-build crashes because of ImportError
|
|
||||||
# Merged upstream: https://github.com/sphinx-doc/sphinx/pull/9513
|
|
||||||
Patch2: rename-types-Union-to-types-UnionType.patch
|
|
||||||
# Fix test failures with python-pygments 2.10+
|
|
||||||
# https://github.com/sphinx-doc/sphinx/pull/9557
|
|
||||||
Patch3: fix-tests-with-pygments-210.patch
|
|
||||||
# Some objects under ``typing`` module are not displayed well
|
|
||||||
# with the HEAD of Python 3.10.0rc2+
|
|
||||||
# Merged upstream: https://github.com/sphinx-doc/sphinx/pull/9538
|
|
||||||
Patch4: display-typing-objects-correctly-with-Python-310.patch
|
|
||||||
# Render typing.Annotated correctly with Python 3.10
|
|
||||||
# Merged upstream: https://github.com/sphinx-doc/sphinx/pull/9590
|
|
||||||
Patch5: render-typing-Annotated-correctly-with-Python-3.10.patch
|
|
||||||
# Generate correct reference to the parent class
|
|
||||||
# Merged upstream: https://github.com/sphinx-doc/sphinx/pull/9515/
|
|
||||||
Patch6: generate-correct-reference-to-parent-class.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
|
||||||
BuildRequires: pyproject-rpm-macros
|
|
||||||
|
|
||||||
%if %{with websupport}
|
|
||||||
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# for fixes
|
|
||||||
BuildRequires: dos2unix
|
|
||||||
|
|
||||||
%if %{with tests}
|
|
||||||
# tests import _testcapi
|
|
||||||
BuildRequires: python%{python3_pkgversion}-test
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gettext
|
|
||||||
BuildRequires: graphviz
|
|
||||||
BuildRequires: texinfo
|
|
||||||
|
|
||||||
%if %{with imagemagick_tests}
|
|
||||||
BuildRequires: ImageMagick
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with latex_tests}
|
|
||||||
BuildRequires: texlive-collection-fontsrecommended
|
|
||||||
BuildRequires: texlive-collection-latex
|
|
||||||
BuildRequires: texlive-dvipng
|
|
||||||
BuildRequires: texlive-dvisvgm
|
|
||||||
BuildRequires: tex(amsmath.sty)
|
|
||||||
BuildRequires: tex(amsthm.sty)
|
|
||||||
BuildRequires: tex(anyfontsize.sty)
|
|
||||||
BuildRequires: tex(article.cls)
|
|
||||||
BuildRequires: tex(capt-of.sty)
|
|
||||||
BuildRequires: tex(cmap.sty)
|
|
||||||
BuildRequires: tex(color.sty)
|
|
||||||
BuildRequires: tex(ctablestack.sty)
|
|
||||||
BuildRequires: tex(fancyhdr.sty)
|
|
||||||
BuildRequires: tex(fancyvrb.sty)
|
|
||||||
BuildRequires: tex(fncychap.sty)
|
|
||||||
BuildRequires: tex(framed.sty)
|
|
||||||
BuildRequires: tex(FreeSerif.otf)
|
|
||||||
BuildRequires: tex(geometry.sty)
|
|
||||||
BuildRequires: tex(hyperref.sty)
|
|
||||||
BuildRequires: tex(kvoptions.sty)
|
|
||||||
BuildRequires: tex(luatex85.sty)
|
|
||||||
BuildRequires: tex(needspace.sty)
|
|
||||||
BuildRequires: tex(parskip.sty)
|
|
||||||
BuildRequires: tex(polyglossia.sty)
|
|
||||||
BuildRequires: tex(tabulary.sty)
|
|
||||||
BuildRequires: tex(titlesec.sty)
|
|
||||||
BuildRequires: tex(upquote.sty)
|
|
||||||
BuildRequires: tex(utf8x.def)
|
|
||||||
BuildRequires: tex(wrapfig.sty)
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@@ -151,101 +48,14 @@ the Python docs:
|
|||||||
snippets and inclusion of appropriately formatted docstrings.
|
snippets and inclusion of appropriately formatted docstrings.
|
||||||
|
|
||||||
|
|
||||||
%package -n python%{python3_pkgversion}-sphinx
|
%package doc
|
||||||
Summary: Python documentation generator
|
|
||||||
|
|
||||||
Recommends: graphviz
|
|
||||||
Recommends: ImageMagick
|
|
||||||
|
|
||||||
# Bundled JavaScript
|
|
||||||
Provides: bundled(jquery) = 3.5.1
|
|
||||||
Provides: bundled(underscore) = 1.3.1
|
|
||||||
Provides: bundled(css3-mediaqueries) = 1.0
|
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-sphinx
|
|
||||||
Sphinx is a tool that makes it easy to create intelligent and
|
|
||||||
beautiful documentation for Python projects (or other documents
|
|
||||||
consisting of multiple reStructuredText sources), written by Georg
|
|
||||||
Brandl. It was originally created to translate the new Python
|
|
||||||
documentation, but has now been cleaned up in the hope that it will be
|
|
||||||
useful to many other projects.
|
|
||||||
|
|
||||||
Sphinx uses reStructuredText as its markup language, and many of its
|
|
||||||
strengths come from the power and straightforwardness of
|
|
||||||
reStructuredText and its parsing and translating suite, the Docutils.
|
|
||||||
|
|
||||||
Although it is still under constant development, the following
|
|
||||||
features are already present, work fine and can be seen "in action" in
|
|
||||||
the Python docs:
|
|
||||||
|
|
||||||
* Output formats: HTML (including Windows HTML Help) and LaTeX,
|
|
||||||
for printable PDF versions
|
|
||||||
* Extensive cross-references: semantic markup and automatic links
|
|
||||||
for functions, classes, glossary terms and similar pieces of
|
|
||||||
information
|
|
||||||
* Hierarchical structure: easy definition of a document tree, with
|
|
||||||
automatic links to siblings, parents and children
|
|
||||||
* Automatic indices: general index as well as a module index
|
|
||||||
* Code handling: automatic highlighting using the Pygments highlighter
|
|
||||||
* Various extensions are available, e.g. for automatic testing of
|
|
||||||
snippets and inclusion of appropriately formatted docstrings.
|
|
||||||
|
|
||||||
|
|
||||||
%package -n python%{python3_pkgversion}-sphinx-latex
|
|
||||||
Summary: LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
|
|
||||||
|
|
||||||
Requires: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
|
|
||||||
Requires: texlive-collection-fontsrecommended
|
|
||||||
Requires: texlive-collection-latex
|
|
||||||
Requires: texlive-dvipng
|
|
||||||
Requires: texlive-dvisvgm
|
|
||||||
Requires: tex(amsmath.sty)
|
|
||||||
Requires: tex(amsthm.sty)
|
|
||||||
Requires: tex(anyfontsize.sty)
|
|
||||||
Requires: tex(article.cls)
|
|
||||||
Requires: tex(capt-of.sty)
|
|
||||||
Requires: tex(cmap.sty)
|
|
||||||
Requires: tex(color.sty)
|
|
||||||
Requires: tex(ctablestack.sty)
|
|
||||||
Requires: tex(fancyhdr.sty)
|
|
||||||
Requires: tex(fancyvrb.sty)
|
|
||||||
Requires: tex(fncychap.sty)
|
|
||||||
Requires: tex(framed.sty)
|
|
||||||
Requires: tex(FreeSerif.otf)
|
|
||||||
Requires: tex(geometry.sty)
|
|
||||||
Requires: tex(hyperref.sty)
|
|
||||||
Requires: tex(kvoptions.sty)
|
|
||||||
Requires: tex(luatex85.sty)
|
|
||||||
Requires: tex(needspace.sty)
|
|
||||||
Requires: tex(parskip.sty)
|
|
||||||
Requires: tex(polyglossia.sty)
|
|
||||||
Requires: tex(tabulary.sty)
|
|
||||||
Requires: tex(titlesec.sty)
|
|
||||||
Requires: tex(upquote.sty)
|
|
||||||
Requires: tex(utf8x.def)
|
|
||||||
Requires: tex(wrapfig.sty)
|
|
||||||
|
|
||||||
# No files in this package, automatic provides don't work:
|
|
||||||
%py_provides python%{python3_pkgversion}-sphinx-latex
|
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-sphinx-latex
|
|
||||||
Sphinx is a tool that makes it easy to create intelligent and
|
|
||||||
beautiful documentation for Python projects (or other documents
|
|
||||||
consisting of multiple reStructuredText sources), written by Georg
|
|
||||||
Brandl. It was originally created to translate the new Python
|
|
||||||
documentation, but has now been cleaned up in the hope that it will be
|
|
||||||
useful to many other projects.
|
|
||||||
|
|
||||||
This package pulls in the TeX dependencies needed by Sphinx's LaTeX
|
|
||||||
builder.
|
|
||||||
|
|
||||||
|
|
||||||
%package doc
|
|
||||||
Summary: Documentation for %{name}
|
Summary: Documentation for %{name}
|
||||||
|
Group: Documentation
|
||||||
License: BSD
|
License: BSD
|
||||||
Recommends: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description doc
|
|
||||||
|
%description doc
|
||||||
Sphinx is a tool that makes it easy to create intelligent and
|
Sphinx is a tool that makes it easy to create intelligent and
|
||||||
beautiful documentation for Python projects (or other documents
|
beautiful documentation for Python projects (or other documents
|
||||||
consisting of multiple reStructuredText sources), written by Georg
|
consisting of multiple reStructuredText sources), written by Georg
|
||||||
@@ -253,604 +63,45 @@ Brandl. It was originally created to translate the new Python
|
|||||||
documentation, but has now been cleaned up in the hope that it will be
|
documentation, but has now been cleaned up in the hope that it will be
|
||||||
useful to many other projects.
|
useful to many other projects.
|
||||||
|
|
||||||
This package contains documentation in reST and HTML formats.
|
This package contains documentation in rST and HTML formats
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{upstream_name}-%{upstream_version} -p1
|
%setup -q -n %{upstream_name}-%{version}
|
||||||
|
|
||||||
# fix line encoding of bundled jquery.js
|
|
||||||
dos2unix -k ./sphinx/themes/basic/static/jquery.js
|
|
||||||
|
|
||||||
%if %{without imagemagick_tests}
|
|
||||||
rm tests/test_ext_imgconverter.py
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Don't measure coverage:
|
|
||||||
sed -i '/pytest-cov/d' setup.py
|
|
||||||
# Not needed on recent Pythons, https://github.com/sphinx-doc/sphinx/pull/8483
|
|
||||||
sed -i '/typed_ast/d' setup.py
|
|
||||||
|
|
||||||
|
|
||||||
%generate_buildrequires
|
|
||||||
%pyproject_buildrequires -r %{?with_tests:-x test}
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%pyproject_wheel
|
%{__python} setup.py build
|
||||||
|
cd doc
|
||||||
export PYTHONPATH=$PWD
|
make html
|
||||||
pushd doc
|
|
||||||
export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
|
|
||||||
make html SPHINXBUILD="$SPHINXBUILD"
|
|
||||||
make man SPHINXBUILD="$SPHINXBUILD"
|
|
||||||
rm -rf _build/html/.buildinfo
|
|
||||||
mv _build/html ..
|
mv _build/html ..
|
||||||
popd
|
rm -rf _*
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%pyproject_install
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
# Fix EOL delimiters
|
||||||
# For backwards compatibility. Remove with care, if at all
|
sed -i 's|\r||g' LICENSE
|
||||||
for i in sphinx-{apidoc,autogen,build,quickstart}; do
|
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
||||||
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
|
|
||||||
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3
|
|
||||||
done
|
|
||||||
|
|
||||||
# Clean up non-python files
|
|
||||||
rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
|
|
||||||
rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
|
|
||||||
|
|
||||||
pushd doc
|
|
||||||
# Deliver man pages
|
|
||||||
install -d %{buildroot}%{_mandir}/man1
|
|
||||||
for f in _build/man/sphinx-*.1;
|
|
||||||
do
|
|
||||||
cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
|
|
||||||
# Deliver rst files
|
|
||||||
rm -rf doc/_build
|
|
||||||
sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
|
|
||||||
mv doc reST
|
|
||||||
rm reST/make.bat
|
|
||||||
|
|
||||||
# Move language files to /usr/share;
|
|
||||||
# patch to support this incorporated in 0.6.6
|
|
||||||
pushd %{buildroot}%{python3_sitelib}
|
|
||||||
|
|
||||||
for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
|
|
||||||
do
|
|
||||||
test $lang == __pycache__ && continue
|
|
||||||
install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
|
|
||||||
install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
|
|
||||||
mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
|
|
||||||
%{buildroot}%{_datadir}/sphinx/locale/$lang/
|
|
||||||
mv sphinx/locale/$lang/LC_MESSAGES/sphinx.mo \
|
|
||||||
%{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
|
|
||||||
rm -rf sphinx/locale/$lang
|
|
||||||
done
|
|
||||||
popd
|
|
||||||
|
|
||||||
# Create the sphinxcontrib directory, so we can own it
|
|
||||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1669790 for rationale
|
|
||||||
mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
|
|
||||||
|
|
||||||
%find_lang sphinx
|
|
||||||
|
|
||||||
# Language files; Since these are javascript, it's not immediately obvious to
|
|
||||||
# find_lang that they need to be marked with a language.
|
|
||||||
(cd %{buildroot} && find . -name 'sphinx.js') | sed -e 's|^.||' | sed -e \
|
|
||||||
's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \
|
|
||||||
>> sphinx.lang
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with tests}
|
%clean
|
||||||
%check
|
rm -rf $RPM_BUILD_ROOT
|
||||||
# Currently, all linkcheck tests and test_latex_images need internet
|
|
||||||
%pytest \
|
|
||||||
%if %{without internet}
|
|
||||||
-k "not linkcheck and not test_latex_images" \
|
|
||||||
%endif
|
|
||||||
;
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
|
%files
|
||||||
%license LICENSE
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS CHANGES EXAMPLES README.rst
|
%doc AUTHORS CHANGES LICENSE README TODO
|
||||||
%{_bindir}/sphinx-*
|
%{_bindir}/sphinx-*
|
||||||
%{python3_sitelib}/sphinx/
|
%{python_sitelib}/sphinx
|
||||||
%dir %{python3_sitelib}/sphinxcontrib/
|
%{python_sitelib}/*.egg-info
|
||||||
%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/
|
|
||||||
%dir %{_datadir}/sphinx/
|
|
||||||
%dir %{_datadir}/sphinx/locale
|
|
||||||
%dir %{_datadir}/sphinx/locale/*
|
|
||||||
%{_mandir}/man1/sphinx-*
|
|
||||||
|
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-sphinx-latex
|
|
||||||
# empty, this is a metapackage
|
|
||||||
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%license LICENSE
|
%defattr(-,root,root,-)
|
||||||
%doc html reST
|
%doc doc html
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Sep 16 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-3
|
|
||||||
- Display typing objects correctly with Python 3.10 (fix FTBFS)
|
|
||||||
- Generate correct reference to parent class if class has `_name` attribute
|
|
||||||
- Enable previously deselected test
|
|
||||||
|
|
||||||
* Wed Aug 18 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-2
|
|
||||||
- Patch python-sphinx to work with python-pygments >=2.10
|
|
||||||
|
|
||||||
* Mon Aug 02 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-1
|
|
||||||
- Update to 4.1.2
|
|
||||||
- Fixes rhbz#1979326
|
|
||||||
- Backport commit to fix python-sphinx with Python 3.10-rc1
|
|
||||||
|
|
||||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.2-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 11 2021 Karolina Surma <ksurma@redhat.com> - 1:4.0.2-1
|
|
||||||
- Update to 4.0.2
|
|
||||||
- Fixes rhbz#1948279
|
|
||||||
|
|
||||||
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-3
|
|
||||||
- Rebuilt for Python 3.10
|
|
||||||
|
|
||||||
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-2
|
|
||||||
- Bootstrap for Python 3.10
|
|
||||||
|
|
||||||
* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.4-1
|
|
||||||
- Update to 3.5.4
|
|
||||||
- Fixes rhbz#1949477
|
|
||||||
|
|
||||||
* Thu Apr 01 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.3-1
|
|
||||||
- Update to 3.5.3
|
|
||||||
- Fixes rhbz#1941161
|
|
||||||
|
|
||||||
* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.5.2-1
|
|
||||||
- Update 3.5.2
|
|
||||||
- Fixes rhbz#1928459
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.4.3-1
|
|
||||||
- Update to 3.4.3
|
|
||||||
- Fixes rhbz#1909494
|
|
||||||
|
|
||||||
* Sat Dec 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 1:3.3.1-2
|
|
||||||
- Unset -s from python shebang
|
|
||||||
- Fixes: rhbz#1903763
|
|
||||||
|
|
||||||
* Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.3.1-1
|
|
||||||
- Update to 3.3.1
|
|
||||||
- Fixes: rhbz#1893752
|
|
||||||
|
|
||||||
* Wed Oct 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:3.2.1-2
|
|
||||||
- Backport commit to fix python-sphinx with python-pygments v2.7.1
|
|
||||||
|
|
||||||
* Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1
|
|
||||||
- Update to 3.2.1
|
|
||||||
- Remove compatibility symbolic links from /usr/libexec/
|
|
||||||
- Fixes rhbz#1867294
|
|
||||||
|
|
||||||
* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1
|
|
||||||
- Update to 3.1.2
|
|
||||||
- Fixes rhbz#1853901
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 30 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:3.1.1-1
|
|
||||||
- Update to 3.1.1 (#1783776)
|
|
||||||
|
|
||||||
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-4
|
|
||||||
- Rebuilt for Python 3.9
|
|
||||||
|
|
||||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-3
|
|
||||||
- Bootstrap for Python 3.9
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Dec 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-1
|
|
||||||
- Update to 2.2.2 (rhbz#1743018)
|
|
||||||
|
|
||||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-6
|
|
||||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
|
||||||
|
|
||||||
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-5
|
|
||||||
- Rebuilt for Python 3.8
|
|
||||||
|
|
||||||
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-4
|
|
||||||
- Bootstrap for Python 3.8
|
|
||||||
|
|
||||||
* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 1:2.1.2-3
|
|
||||||
- Rebuild for Python 3.8.
|
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.2-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jun 23 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-1
|
|
||||||
- Update to 2.1.2 (#1716158)
|
|
||||||
|
|
||||||
* Wed Apr 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.1-1
|
|
||||||
- Update to 2.0.1 (#1697544)
|
|
||||||
- Own the sphinxcontrib directory (#1669790)
|
|
||||||
|
|
||||||
* Wed Mar 27 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:2.0.0~b2-1
|
|
||||||
- Update to 2.0.0b2
|
|
||||||
|
|
||||||
* Wed Feb 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.0~b1-1
|
|
||||||
- Update to 2.0.0b1
|
|
||||||
- Drop Python 2 package
|
|
||||||
- https://fedoraproject.org/wiki/Changes/Sphinx2
|
|
||||||
|
|
||||||
* Thu Feb 07 2019 Alfredo Moralejo <amoralej@redhat.com> - 1:1.8.4-1
|
|
||||||
- Update to 1.8.4.
|
|
||||||
|
|
||||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.6-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.6-2
|
|
||||||
- Drop explicit locale setting for python3, use C.UTF-8 for python2
|
|
||||||
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
||||||
* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.5-5
|
|
||||||
- Add patch to fix build if alabaster theme is installed
|
|
||||||
- Add patch for #1589868
|
|
||||||
|
|
||||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-4
|
|
||||||
- Enable tests
|
|
||||||
|
|
||||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-3
|
|
||||||
- Enable websupport
|
|
||||||
|
|
||||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-2
|
|
||||||
- Rebuilt for Python 3.7
|
|
||||||
|
|
||||||
* Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.5-1
|
|
||||||
- Update to 1.7.5 (bz#1570451)
|
|
||||||
|
|
||||||
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-5
|
|
||||||
- Rebuilt for Python 3.7
|
|
||||||
|
|
||||||
* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-4
|
|
||||||
- Bootstrap for Python 3.7
|
|
||||||
|
|
||||||
* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-3
|
|
||||||
- Bootstrap for Python 3.7
|
|
||||||
|
|
||||||
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-2
|
|
||||||
- Conditionalize the ImageMagick build dependency & tests
|
|
||||||
|
|
||||||
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-1
|
|
||||||
- Update to 1.7.2 (bz#1558968)
|
|
||||||
|
|
||||||
* Tue Mar 13 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.1-1
|
|
||||||
- Update to 1.7.1 (bz#1534802)
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.6-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
|
|
||||||
- Update to 1.6.6 (bz#1532435)
|
|
||||||
|
|
||||||
* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 1:1.6.5-2
|
|
||||||
- Fix ambiguous Python 2 dependency declarations
|
|
||||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
|
||||||
|
|
||||||
* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
|
|
||||||
- Update to 1.6.5 (bz#1508237)
|
|
||||||
|
|
||||||
* Mon Oct 09 2017 Troy Dawson <tdawson@redhat.com> - 1:1.6.4-2
|
|
||||||
- Cleanup spec file conditionals
|
|
||||||
|
|
||||||
* Tue Sep 26 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.4-1
|
|
||||||
- Update to 1.6.4 (bz#1426928)
|
|
||||||
|
|
||||||
* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.3-3
|
|
||||||
- Provide the epoch tag in order to keep the upgrade path clean.
|
|
||||||
|
|
||||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 20 2017 Charalampos Stratakis <cstratak@redhat.com> - - 1.6.3-1
|
|
||||||
- Update to 1.6.3 (bz#1426928)
|
|
||||||
|
|
||||||
* Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
|
|
||||||
- Cleanup source files that should not be installed
|
|
||||||
- Fix the __init__.pyc that was byte compiled for the wrong python
|
|
||||||
|
|
||||||
* Fri Feb 17 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-1
|
|
||||||
- Update to 1.5.2
|
|
||||||
- Remove a few latex dependencies that are no longer needed
|
|
||||||
- Remove xapian patch; now in upstream tarball
|
|
||||||
|
|
||||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 31 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-5
|
|
||||||
- environment-modules is less featureful than Lmod.
|
|
||||||
- Select the default version in a different way since environment-modules
|
|
||||||
didn't understand the symlink
|
|
||||||
- Ignore error messsages in the shell startup script as environment-modules
|
|
||||||
prints an error message if a module has already been loaded. The command
|
|
||||||
is doing the right thing for this case except that it's also printing an
|
|
||||||
error message.
|
|
||||||
|
|
||||||
* Thu Jan 26 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-4
|
|
||||||
- Add recipe for setting the system default to the README.fedora
|
|
||||||
|
|
||||||
* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-3
|
|
||||||
- Move the unversioned executables into the python2 package as they are now
|
|
||||||
using python2 to run
|
|
||||||
|
|
||||||
* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-2
|
|
||||||
- Add README.fedora so people know how to use environment-modules to switch.
|
|
||||||
- Change the default to be the python2 version to match with the guidelines
|
|
||||||
- Switch to generic environment(modules) instead of Lmod specifically.
|
|
||||||
|
|
||||||
* Fri Dec 30 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
|
|
||||||
- Update to 1.5.1
|
|
||||||
|
|
||||||
* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
|
|
||||||
- Remove alternatives. Alternatives should only be used for a very small
|
|
||||||
number of packages (system daemons which also have a compatible command line
|
|
||||||
interface).
|
|
||||||
- Use environment-modules to switch between the python2 and python3 packages
|
|
||||||
*but* be aware that no amount of manual switching can get this 100% right.
|
|
||||||
The code has to be fixed upstream, not in packaging.
|
|
||||||
|
|
||||||
* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.9-1
|
|
||||||
- Update to 1.4.9
|
|
||||||
- Enable python3 tests
|
|
||||||
|
|
||||||
* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.8-3
|
|
||||||
- Rebuild for Python 3.6
|
|
||||||
- Disable python3 tests for now
|
|
||||||
|
|
||||||
* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-2
|
|
||||||
- Added tex(luatex85.sty) dependency to support TexLive 2016
|
|
||||||
|
|
||||||
* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-1
|
|
||||||
- Update to 1.4.8
|
|
||||||
- Alternatives fails for scripts sometimes (bz#1382405)
|
|
||||||
|
|
||||||
* Sun Sep 4 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-2
|
|
||||||
- Alternatives fails for man pages due to existing files
|
|
||||||
|
|
||||||
* Fri Sep 2 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-1
|
|
||||||
- Update to 1.4.6 (bz#1370810)
|
|
||||||
- Fix unversioned Obsoletes
|
|
||||||
- Add alternatives slaves for man pages
|
|
||||||
|
|
||||||
* Fri Aug 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.5-1
|
|
||||||
- Update to 1.4.5 (bz#1356336)
|
|
||||||
- Remove Recommends for latex, locale, and doc subpackages (bz#1366624)
|
|
||||||
- Remove Requires from locale subpackage (bz#1366624)
|
|
||||||
- Set executable scripts via alternatives (bz#1321413)
|
|
||||||
- Change graphviz Requires to Recommends (bz#1366706)
|
|
||||||
|
|
||||||
* Sun Jul 03 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-2
|
|
||||||
- doc and locale no longer specifically require python2-sphinx
|
|
||||||
- Colapsed python3-sphinx-latex into python-latex
|
|
||||||
|
|
||||||
* Sun Jun 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-1
|
|
||||||
- Updated to 1.4.4
|
|
||||||
- Added python-sphinx-locale for common locale files
|
|
||||||
|
|
||||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-4
|
|
||||||
- Obsolete napoleon extension, it is now packaged with sphinx (#1286275)
|
|
||||||
- Rename python2-Sphinx to python2-sphinx
|
|
||||||
- Add conflicts to disallow parallel installation of different versions,
|
|
||||||
which causes file conflicts because of the shared documentation files.
|
|
||||||
|
|
||||||
* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-3
|
|
||||||
- Restore using python2 scripts by default (#1285535)
|
|
||||||
|
|
||||||
* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-2
|
|
||||||
- Fix requirements of python2- subpackage
|
|
||||||
- Provide sphinx-*-{3.5,3} symlinks for each script
|
|
||||||
|
|
||||||
* Tue Nov 24 2015 Julien Enselme <jujens@jujens.eu> - 1.3.1-1
|
|
||||||
- Update to 1.3.1 (#1136284)
|
|
||||||
- Update to new guidelines
|
|
||||||
- Make the default executable use python3
|
|
||||||
|
|
||||||
* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 1.2.3-5
|
|
||||||
- Rebuilt for Python3.5 rebuild
|
|
||||||
- add patch to reflect that Python3.5 dropped HTMLParserError
|
|
||||||
|
|
||||||
* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-4
|
|
||||||
- Fix line encoding of bundled jquery.js
|
|
||||||
|
|
||||||
* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-3
|
|
||||||
- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies
|
|
||||||
|
|
||||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-1
|
|
||||||
- Update to 1.2.3
|
|
||||||
- Mark license file with %%license instead of %%doc
|
|
||||||
|
|
||||||
* Thu Feb 5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-10
|
|
||||||
- Complete LaTeX builder deps (fixes bz#882166)
|
|
||||||
- Make test output verbose
|
|
||||||
- Add BRs needed to enable all tests
|
|
||||||
|
|
||||||
* Tue Feb 3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-9
|
|
||||||
- python3-sphinx package also Provides: python3-sphinx-latex
|
|
||||||
|
|
||||||
* Tue Feb 3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-8
|
|
||||||
- If a separate LaTeX subpackage is not generated, the main package should have
|
|
||||||
a virtual Provides: for it (bz#1187989)
|
|
||||||
|
|
||||||
* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-7
|
|
||||||
- Disable separate LaTeX builder for now (bz#1185574)
|
|
||||||
|
|
||||||
* Thu Jan 22 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-6
|
|
||||||
- Split off LaTeX builder into its own subpackages, to remove TeXLive
|
|
||||||
dependencies from the main package.
|
|
||||||
Thanks to Robert Kuska <rkuska@redhat.com> for feedback
|
|
||||||
- Clean up python3-sphinx's locale files, they ended up in the python2 package.
|
|
||||||
Share the locale files in /usr/share instead
|
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 27 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-4
|
|
||||||
- Don't own the -3 scripts by python 2 package
|
|
||||||
|
|
||||||
* Thu May 22 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-3
|
|
||||||
- Add sphinx-*-3 links to scripts
|
|
||||||
Resolves: #1098109
|
|
||||||
|
|
||||||
* Fri May 9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-2
|
|
||||||
- Rebuild for Python 3.4
|
|
||||||
|
|
||||||
* Fri May 9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-1
|
|
||||||
- Update to 1.2.2
|
|
||||||
|
|
||||||
* Thu Feb 13 2014 Michel Salim <salimma@fedoraproject.org> - 1.2.1-1
|
|
||||||
- Update to 1.2.1
|
|
||||||
|
|
||||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Mar 9 2013 Michel Salim <salimma@fedoraproject.org> - 1.1.3-7
|
|
||||||
- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot
|
|
||||||
|
|
||||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Aug 21 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.3-5
|
|
||||||
- Fix for use of sphinx's manpage writer with docutils-0.10
|
|
||||||
|
|
||||||
* Mon Aug 6 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-4
|
|
||||||
- Rebuild for Python 3.3
|
|
||||||
|
|
||||||
* Fri Aug 3 2012 David Malcolm <dmalcolm@redhat.com> - 1.1.3-3
|
|
||||||
- remove rhel logic from with_python3 conditional
|
|
||||||
|
|
||||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Apr 5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-1
|
|
||||||
- Update to 1.1.3
|
|
||||||
|
|
||||||
* Sun Feb 5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.2-5
|
|
||||||
- Move python3 runtime dependencies to the right subpackage
|
|
||||||
- Properly exclude python3 binaries
|
|
||||||
|
|
||||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-3
|
|
||||||
- BR on texlive-latex for LaTeX tests
|
|
||||||
|
|
||||||
* Thu Dec 8 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-2
|
|
||||||
- Enable python3 subpackage
|
|
||||||
|
|
||||||
* Mon Nov 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.2-1
|
|
||||||
- Update to upstream 1.1.2
|
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 18 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.7-1
|
|
||||||
- Update to upstream 1.0.7
|
|
||||||
|
|
||||||
* Mon Jan 17 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.6-1
|
|
||||||
- Update to upstream 1.0.6
|
|
||||||
|
|
||||||
* Mon Nov 1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-3
|
|
||||||
- Fix -doc Makefile to allow regeneration of .rst files
|
|
||||||
|
|
||||||
* Mon Nov 1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-2
|
|
||||||
- Actually include *.js locale files
|
|
||||||
- Generate manpages
|
|
||||||
|
|
||||||
* Fri Sep 17 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-1
|
|
||||||
- Update to 1.0.4
|
|
||||||
- Remove BuildRoot and %%clean declarations
|
|
||||||
|
|
||||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0-0.1.b2.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
|
||||||
|
|
||||||
* Mon May 31 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0-0.2.b2
|
|
||||||
- Update to 1.0 beta 2
|
|
||||||
- Fixes problem building html documentation in non-English locales
|
|
||||||
|
|
||||||
* Wed May 26 2010 Michel Salim <salimma@fedoraproject.org> - 1.0-0.1.b1
|
|
||||||
- Update to 1.0 beta 1
|
|
||||||
|
|
||||||
* Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
|
|
||||||
- Update to 0.6.6
|
|
||||||
|
|
||||||
* Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
|
|
||||||
- Few minor tweaks to Gareth's spec file update
|
|
||||||
|
|
||||||
* Mon May 10 2010 Gareth Armstrong <gareth.armstrong@hp.com> - 0.6.5-1.hp
|
|
||||||
- Update to 0.6.5
|
|
||||||
- Initial import of python-sphinx from Fedora Rawhide for use in HP CMS
|
|
||||||
- Enforce that Sphinx requires Python 2.4 or later via an explicit BR
|
|
||||||
- Minor tweaks to spec file
|
|
||||||
- Move language files to %%{_datadir}, idea borrowed from Debian's sphinx
|
|
||||||
package
|
|
||||||
- Deliver man pages for sphinx-build & sphinx-quickstart
|
|
||||||
- Deliver rst documentation files to reST directory in doc sub-package
|
|
||||||
- Add %%check section for Python2 and add BR on python-nose
|
|
||||||
|
|
||||||
* Wed Jan 13 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.4-1
|
|
||||||
- Update to 0.6.4
|
|
||||||
- Fixes a problem using autodoc with pylons projects.
|
|
||||||
|
|
||||||
* Fri Sep 4 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.3-1
|
|
||||||
- Update to 0.6.3
|
|
||||||
|
|
||||||
* Mon Aug 17 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.2-1
|
|
||||||
- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
|
|
||||||
|
|
||||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 05 2009 Luke Macken <lmacken@redhat.com> - 0.6.1-2
|
|
||||||
- Add a patch to use our own setuptools package
|
|
||||||
|
|
||||||
* Fri Apr 17 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
|
|
||||||
- Update to 0.6.1
|
|
||||||
|
|
||||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 2 2009 Michel Salim <salimma@fedoraproject.org> - 0.5.1-1
|
|
||||||
- Update to 0.5.1
|
|
||||||
|
|
||||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5-2
|
|
||||||
- Rebuild for Python 2.6
|
|
||||||
|
|
||||||
* Mon Nov 24 2008 Michel Salim <salimma@fedoraproject.org> - 0.5-1
|
|
||||||
- Update to 0.5
|
|
||||||
|
|
||||||
* Fri Oct 10 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.3-1
|
* Fri Oct 10 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.3-1
|
||||||
- Update to 0.4.3
|
- Update to 0.4.3
|
||||||
|
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
From 8b2031c747e7c7e6b845ee2e3db47de617d33cc6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
||||||
Date: Fri, 30 Jul 2021 01:27:38 +0900
|
|
||||||
Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10
|
|
||||||
|
|
||||||
Recently, `types.Union` was renamed to `types.UnionType` on the HEAD
|
|
||||||
of 3.10 (refs: python/cpython#27342). After this change, sphinx-build
|
|
||||||
has been crashed because of ImportError.
|
|
||||||
---
|
|
||||||
sphinx/util/typing.py | 12 ++++++------
|
|
||||||
1 files changed, 8 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
|
|
||||||
index f1723c035a..012d32e524 100644
|
|
||||||
--- a/sphinx/util/typing.py
|
|
||||||
+++ b/sphinx/util/typing.py
|
|
||||||
@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any:
|
|
||||||
ref = _ForwardRef(self.arg)
|
|
||||||
return ref._eval_type(globalns, localns)
|
|
||||||
|
|
||||||
-if sys.version_info > (3, 10):
|
|
||||||
- from types import Union as types_Union
|
|
||||||
-else:
|
|
||||||
- types_Union = None
|
|
||||||
+try:
|
|
||||||
+ from types import UnionType # type: ignore # python 3.10 or above
|
|
||||||
+except ImportError:
|
|
||||||
+ UnionType = None
|
|
||||||
|
|
||||||
if False:
|
|
||||||
# For type annotation
|
|
||||||
@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str:
|
|
||||||
return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls]
|
|
||||||
elif inspect.isNewType(cls):
|
|
||||||
return ':class:`%s`' % cls.__name__
|
|
||||||
- elif types_Union and isinstance(cls, types_Union):
|
|
||||||
+ elif UnionType and isinstance(cls, UnionType):
|
|
||||||
if len(cls.__args__) > 1 and None in cls.__args__:
|
|
||||||
args = ' | '.join(restify(a) for a in cls.__args__ if a)
|
|
||||||
return 'Optional[%s]' % args
|
|
||||||
@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str:
|
|
||||||
elif hasattr(annotation, '__origin__'):
|
|
||||||
# instantiated generic provided by a user
|
|
||||||
qualname = stringify(annotation.__origin__)
|
|
||||||
- elif types_Union and isinstance(annotation, types_Union): # types.Union (for py3.10+)
|
|
||||||
+ elif UnionType and isinstance(annotation, UnionType): # types.Union (for py3.10+)
|
|
||||||
qualname = 'types.Union'
|
|
||||||
else:
|
|
||||||
# we weren't able to extract the base type, appending arguments would
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
From b82d3ef05a75b6dad9679f8746db5ef89785c7c0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
|
|
||||||
Date: Sun, 29 Aug 2021 15:40:49 +0900
|
|
||||||
Subject: [PATCH] Fix #9589: autodoc: typing.Annotated has wrongly been
|
|
||||||
rendered
|
|
||||||
|
|
||||||
At the HEAD of 3.10, the implementation of `typing.Annotated` has
|
|
||||||
been changed to have __qualname__.
|
|
||||||
---
|
|
||||||
CHANGES | 4 ++--
|
|
||||||
sphinx/util/typing.py | 2 ++
|
|
||||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
|
|
||||||
index df5277ae7b..35f808211b 100644
|
|
||||||
--- a/sphinx/util/typing.py
|
|
||||||
+++ b/sphinx/util/typing.py
|
|
||||||
@@ -306,6 +306,8 @@ def stringify(annotation: Any) -> str:
|
|
||||||
return 'None'
|
|
||||||
elif annotation in INVALID_BUILTIN_CLASSES:
|
|
||||||
return INVALID_BUILTIN_CLASSES[annotation]
|
|
||||||
+ elif str(annotation).startswith('typing.Annotated'): # for py310+
|
|
||||||
+ pass
|
|
||||||
elif (getattr(annotation, '__module__', None) == 'builtins' and
|
|
||||||
getattr(annotation, '__qualname__', None)):
|
|
||||||
return annotation.__qualname__
|
|
||||||
@@ -1 +1 @@
|
|||||||
SHA512 (Sphinx-4.1.2.tar.gz) = 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457
|
b3c17f1b5be0b76c373a2474488f1662 Sphinx-0.4.3.tar.gz
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
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()) == 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'
|
|
||||||
Reference in New Issue
Block a user