From e361c26ece5428e5f8b794e3027bc4ef5d3d3cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 22 May 2010 01:08:12 +0000 Subject: [PATCH 001/234] - Few minor tweaks to Gareth's spec file update Mon May 10 2010 Gareth Armstrong - 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 --- .cvsignore | 2 +- ....5_move_locale_files_outside_sitelib.patch | 56 ++++++++ python-sphinx-0.6.5_setuptools.patch | 24 ++++ python-sphinx-setuptools.patch | 9 -- python-sphinx.spec | 136 +++++++++++++----- sources | 2 +- 6 files changed, 179 insertions(+), 50 deletions(-) create mode 100644 python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch create mode 100644 python-sphinx-0.6.5_setuptools.patch delete mode 100644 python-sphinx-setuptools.patch diff --git a/.cvsignore b/.cvsignore index ab16ecd..11c96c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.4.tar.gz +Sphinx-0.6.5.tar.gz diff --git a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch new file mode 100644 index 0000000..76dffc4 --- /dev/null +++ b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch @@ -0,0 +1,56 @@ +# HG changeset patch +# Parent 552e51b26229a9a918c76a401f2f487bf81f2ee6 + +Index: Sphinx-0.6.5/sphinx/builders/html.py +=================================================================== +--- Sphinx-0.6.5.orig/sphinx/builders/html.py ++++ Sphinx-0.6.5/sphinx/builders/html.py +@@ -10,6 +10,7 @@ + """ + + import os ++import sys + import codecs + import posixpath + import cPickle as pickle +@@ -91,10 +92,15 @@ class StandaloneHTMLBuilder(Builder): + self.link_suffix = self.out_suffix + + if self.config.language is not None: +- jsfile = path.join(package_dir, 'locale', self.config.language, +- 'LC_MESSAGES', 'sphinx.js') +- if path.isfile(jsfile): +- self.script_files.append('_static/translations.js') ++ jsfile_list = [path.join(package_dir, 'locale', ++ self.config.language, 'LC_MESSAGES', 'sphinx.js'), ++ path.join(sys.prefix, 'share/sphinx/locale', ++ self.config.language, 'sphinx.js')] ++ ++ for jsfile in jsfile_list: ++ if path.isfile(jsfile): ++ self.script_files.append('_static/translations.js') ++ break + + def init_templates(self): + Theme.init_themes(self) +@@ -528,11 +534,15 @@ class StandaloneHTMLBuilder(Builder): + f.close() + # then, copy translations JavaScript file + if self.config.language is not None: +- jsfile = path.join(package_dir, 'locale', self.config.language, +- 'LC_MESSAGES', 'sphinx.js') +- if path.isfile(jsfile): +- copyfile(jsfile, path.join(self.outdir, '_static', +- 'translations.js')) ++ jsfile_list = [path.join(package_dir, 'locale', ++ self.config.language, 'LC_MESSAGES', 'sphinx.js'), ++ path.join(sys.prefix, 'share/sphinx/locale', ++ self.config.language, 'sphinx.js')] ++ for jsfile in jsfile_list: ++ if path.isfile(jsfile): ++ copyfile(jsfile, path.join(self.outdir, '_static', ++ 'translations.js')) ++ break + # then, copy over all user-supplied static files + if self.theme: + staticdirnames = [path.join(themepath, 'static') diff --git a/python-sphinx-0.6.5_setuptools.patch b/python-sphinx-0.6.5_setuptools.patch new file mode 100644 index 0000000..e8bcc44 --- /dev/null +++ b/python-sphinx-0.6.5_setuptools.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# Parent 5da6d572bd088b04711b3bf70991c976d8f9c605 + +Index: Sphinx-0.6.5/setup.py +=================================================================== +--- Sphinx-0.6.5.orig/setup.py ++++ Sphinx-0.6.5/setup.py +@@ -1,10 +1,13 @@ + # -*- coding: utf-8 -*- +-import ez_setup +-ez_setup.use_setuptools() ++try: ++ from setuptools import setup, find_packages ++except ImportError: ++ import ez_setup ++ ez_setup.use_setuptools() ++ from setuptools import setup, find_packages + + import os + import sys +-from setuptools import setup, find_packages + from distutils import log + + import sphinx diff --git a/python-sphinx-setuptools.patch b/python-sphinx-setuptools.patch deleted file mode 100644 index c4cfb6a..0000000 --- a/python-sphinx-setuptools.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- setup.py.orig 2009-06-05 07:42:36.000000000 -0400 -+++ setup.py 2009-06-05 07:42:40.000000000 -0400 -@@ -1,6 +1,4 @@ - # -*- coding: utf-8 -*- --import ez_setup --ez_setup.use_setuptools() - - import os - import sys diff --git a/python-sphinx.spec b/python-sphinx.spec index 33f73ae..52c5b4f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,23 +1,31 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif -%define upstream_name Sphinx +%global upstream_name Sphinx -Name: python-sphinx -Version: 0.6.4 -Release: 1%{?dist} -Summary: Python documentation generator +Name: python-sphinx +Version: 0.6.5 +Release: 2%{?dist} +Summary: Python documentation generator -Group: Development/Tools -License: BSD -URL: http://sphinx.pocoo.org/ -Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -Patch0: %{name}-setuptools.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Group: Development/Tools +License: BSD +URL: http://sphinx.pocoo.org/ +Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +Patch0: %{name}-0.6.5_setuptools.patch +Patch1: %{name}-0.6.5_move_locale_files_outside_sitelib.patch -BuildArch: noarch -BuildRequires: python-devel python-docutils python-jinja2 python-setuptools -Requires: python-docutils python-jinja2 python-pygments +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch +BuildRequires: python2-devel >= 2.4 +BuildRequires: python-setuptools +BuildRequires: python-docutils +BuildRequires: python-jinja2 +BuildRequires: python-nose +Requires: python-docutils +Requires: python-jinja2 +Requires: python-pygments %description @@ -49,14 +57,14 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package doc -Summary: Documentation for %{name} -Group: Documentation -License: BSD -Requires: %{name} = %{version}-%{release} +%package doc +Summary: Documentation for %{name} +Group: Documentation +License: BSD +Requires: %{name} = %{version}-%{release} -%description doc +%description doc 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 @@ -64,51 +72,101 @@ 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 contains documentation in rST and HTML formats +This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version} -%patch0 -p0 -b .setuptools +%patch0 -p1 -b .setuptools +%patch1 -p1 -b .language_files +sed '1d' -i sphinx/pycode/pgen2/token.py %build %{__python} setup.py build -cd doc +pushd doc make html +rm -rf _build/html/.buildinfo mv _build/html .. rm -rf _* +popd %install -rm -rf $RPM_BUILD_ROOT -# Fix EOL delimiters -sed -i 's|\r||g' LICENSE -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} -# Language files; not under /usr/share, need to be handled manually -(cd $RPM_BUILD_ROOT && find . -name 'sphinx.mo') | sed -e 's|^.||' | sed -e \ - 's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \ - >> %{name}.lang +%{__python} setup.py install --skip-build --root %{buildroot} + + +pushd doc +# Deliver man pages +install -d %{buildroot}%{_mandir}/man1 +mv sphinx-*.1 %{buildroot}%{_mandir}/man1/ +popd + +# Deliver rst files +mv doc reST + +# Move language files to /usr/share in association with %patch1 +pushd %{buildroot}%{python_sitelib} + +for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`; +do + 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 +%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 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f %{name}.lang +%check +make test + + +%files -f sphinx.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO %{_bindir}/sphinx-* -%{python_sitelib}/sphinx -%{python_sitelib}/*.egg-info +%{python_sitelib}/* +%{_datadir}/sphinx/ +%exclude %{_datadir}/sphinx/locale/*/sphinx.js +%{_mandir}/man1/* %files doc %defattr(-,root,root,-) -%doc doc html +%doc html reST %changelog +* Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 +- Few minor tweaks to Gareth's spec file update + +* Mon May 10 2010 Gareth Armstrong - 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 - 0.6.4-1 - Update to 0.6.4 - Fixes a problem using autodoc with pylons projects. diff --git a/sources b/sources index ad5c2c8..6c0c1e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a65e0bcff6f79a7c013220d00ea137ad Sphinx-0.6.4.tar.gz +86dd5dbd55cb44d1f8091a4a1c3743b2 Sphinx-0.6.5.tar.gz From 140b900b5c9ad0f767768b9ed62b3e7807904a3a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 25 May 2010 22:34:11 +0000 Subject: [PATCH 002/234] - Update to 1.0 beta 1 --- .cvsignore | 2 +- ....5_move_locale_files_outside_sitelib.patch | 56 ------------------- python-sphinx-0.6.5_setuptools.patch | 24 -------- python-sphinx.spec | 31 +++++----- sources | 2 +- 5 files changed, 19 insertions(+), 96 deletions(-) delete mode 100644 python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch delete mode 100644 python-sphinx-0.6.5_setuptools.patch diff --git a/.cvsignore b/.cvsignore index 11c96c5..eb18a20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.5.tar.gz +Sphinx-1.0b1.tar.gz diff --git a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch deleted file mode 100644 index 76dffc4..0000000 --- a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch +++ /dev/null @@ -1,56 +0,0 @@ -# HG changeset patch -# Parent 552e51b26229a9a918c76a401f2f487bf81f2ee6 - -Index: Sphinx-0.6.5/sphinx/builders/html.py -=================================================================== ---- Sphinx-0.6.5.orig/sphinx/builders/html.py -+++ Sphinx-0.6.5/sphinx/builders/html.py -@@ -10,6 +10,7 @@ - """ - - import os -+import sys - import codecs - import posixpath - import cPickle as pickle -@@ -91,10 +92,15 @@ class StandaloneHTMLBuilder(Builder): - self.link_suffix = self.out_suffix - - if self.config.language is not None: -- jsfile = path.join(package_dir, 'locale', self.config.language, -- 'LC_MESSAGES', 'sphinx.js') -- if path.isfile(jsfile): -- self.script_files.append('_static/translations.js') -+ jsfile_list = [path.join(package_dir, 'locale', -+ self.config.language, 'LC_MESSAGES', 'sphinx.js'), -+ path.join(sys.prefix, 'share/sphinx/locale', -+ self.config.language, 'sphinx.js')] -+ -+ for jsfile in jsfile_list: -+ if path.isfile(jsfile): -+ self.script_files.append('_static/translations.js') -+ break - - def init_templates(self): - Theme.init_themes(self) -@@ -528,11 +534,15 @@ class StandaloneHTMLBuilder(Builder): - f.close() - # then, copy translations JavaScript file - if self.config.language is not None: -- jsfile = path.join(package_dir, 'locale', self.config.language, -- 'LC_MESSAGES', 'sphinx.js') -- if path.isfile(jsfile): -- copyfile(jsfile, path.join(self.outdir, '_static', -- 'translations.js')) -+ jsfile_list = [path.join(package_dir, 'locale', -+ self.config.language, 'LC_MESSAGES', 'sphinx.js'), -+ path.join(sys.prefix, 'share/sphinx/locale', -+ self.config.language, 'sphinx.js')] -+ for jsfile in jsfile_list: -+ if path.isfile(jsfile): -+ copyfile(jsfile, path.join(self.outdir, '_static', -+ 'translations.js')) -+ break - # then, copy over all user-supplied static files - if self.theme: - staticdirnames = [path.join(themepath, 'static') diff --git a/python-sphinx-0.6.5_setuptools.patch b/python-sphinx-0.6.5_setuptools.patch deleted file mode 100644 index e8bcc44..0000000 --- a/python-sphinx-0.6.5_setuptools.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# Parent 5da6d572bd088b04711b3bf70991c976d8f9c605 - -Index: Sphinx-0.6.5/setup.py -=================================================================== ---- Sphinx-0.6.5.orig/setup.py -+++ Sphinx-0.6.5/setup.py -@@ -1,10 +1,13 @@ - # -*- coding: utf-8 -*- --import ez_setup --ez_setup.use_setuptools() -+try: -+ from setuptools import setup, find_packages -+except ImportError: -+ import ez_setup -+ ez_setup.use_setuptools() -+ from setuptools import setup, find_packages - - import os - import sys --from setuptools import setup, find_packages - from distutils import log - - import sphinx diff --git a/python-sphinx.spec b/python-sphinx.spec index 52c5b4f..6aa288f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -3,18 +3,17 @@ %endif %global upstream_name Sphinx +%global prerel b1 Name: python-sphinx -Version: 0.6.5 -Release: 2%{?dist} +Version: 1.0 +Release: %{?prerel:0.}1.%{?prerel}%{?dist} Summary: Python documentation generator Group: Development/Tools License: BSD URL: http://sphinx.pocoo.org/ -Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -Patch0: %{name}-0.6.5_setuptools.patch -Patch1: %{name}-0.6.5_move_locale_files_outside_sitelib.patch +Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}%{?prerel}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -76,10 +75,7 @@ This package contains documentation in reST and HTML formats. %prep -%setup -q -n %{upstream_name}-%{version} -%patch0 -p1 -b .setuptools -%patch1 -p1 -b .language_files - +%setup -q -n %{upstream_name}-%{version}%{?prerel} sed '1d' -i sphinx/pycode/pgen2/token.py %build @@ -98,11 +94,12 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} -pushd doc +# Manpages not in beta release yet +#pushd doc # Deliver man pages -install -d %{buildroot}%{_mandir}/man1 -mv sphinx-*.1 %{buildroot}%{_mandir}/man1/ -popd +#install -d %{buildroot}%{_mandir}/man1 +#mv sphinx-*.1 %{buildroot}%{_mandir}/man1/ +#popd # Deliver rst files mv doc reST @@ -145,7 +142,7 @@ make test %{python_sitelib}/* %{_datadir}/sphinx/ %exclude %{_datadir}/sphinx/locale/*/sphinx.js -%{_mandir}/man1/* +#%{_mandir}/man1/* %files doc %defattr(-,root,root,-) @@ -153,6 +150,12 @@ make test %changelog +* Wed May 26 2010 Michel Salim - 1.0-0.1.b1 +- Update to 1.0 beta 1 + +* Tue May 25 2010 Michel Salim - 0.6.6-1 +- Update to 0.6.6 + * Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 - Few minor tweaks to Gareth's spec file update diff --git a/sources b/sources index 6c0c1e6..71cea2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86dd5dbd55cb44d1f8091a4a1c3743b2 Sphinx-0.6.5.tar.gz +efe4e95ea02e1a7fbb19969632454f3f Sphinx-1.0b1.tar.gz From 7dd2f9eb6ade5084dba89b92299736b316ea8428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Mon, 31 May 2010 16:41:46 +0000 Subject: [PATCH 003/234] - Update to 1.0 beta 2 - Fixes problem building html documentation in non-English locales --- .cvsignore | 2 +- python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb18a20..69a5060 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-1.0b1.tar.gz +Sphinx-1.0b2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 6aa288f..eae8155 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -3,7 +3,7 @@ %endif %global upstream_name Sphinx -%global prerel b1 +%global prerel b2 Name: python-sphinx Version: 1.0 @@ -150,6 +150,10 @@ make test %changelog +* Mon May 31 2010 Toshio Kuratomi - 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 - 1.0-0.1.b1 - Update to 1.0 beta 1 diff --git a/sources b/sources index 71cea2e..2c902d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efe4e95ea02e1a7fbb19969632454f3f Sphinx-1.0b1.tar.gz +6bf13da4fd0542cc85705d1c4abd3c0a Sphinx-1.0b2.tar.gz From dd5bd655afad50484293ab9d72477569903838dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Tue, 6 Jul 2010 02:03:17 +0000 Subject: [PATCH 004/234] Update license tag --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index eae8155..4a04718 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -11,7 +11,12 @@ Release: %{?prerel:0.}1.%{?prerel}%{?dist} Summary: Python documentation generator Group: Development/Tools -License: BSD + +# Unless otherwise noted, the license for code is BSD +# sphinx/util/stemmer.py Public Domain +# sphinx/pycode/pgen2 Python +# jquery (MIT or GPLv2) +License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}%{?prerel}.tar.gz From 12a32ebd2e164de87e858f140d7d94209e8a4b11 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 05:25:59 +0000 Subject: [PATCH 005/234] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4a04718..5db0760 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -7,7 +7,7 @@ Name: python-sphinx Version: 1.0 -Release: %{?prerel:0.}1.%{?prerel}%{?dist} +Release: %{?prerel:0.}1.%{?prerel}%{?dist}.1 Summary: Python documentation generator Group: Development/Tools @@ -155,6 +155,9 @@ make test %changelog +* Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Mon May 31 2010 Toshio Kuratomi - 1.0-0.2.b2 - Update to 1.0 beta 2 - Fixes problem building html documentation in non-English locales From 91943186715efc76f0113b31781b7366023c5503 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:43:45 +0000 Subject: [PATCH 006/234] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index be369c3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# 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 $$d/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) From 77fdd8d536bc91355344d717d42f3b3e7bb0e301 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 17 Sep 2010 14:50:58 +0200 Subject: [PATCH 007/234] Update Sphinx to 1.0.4 --- .gitignore | 2 +- python-sphinx.spec | 18 ++++++++---------- sources | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 69a5060..4f1fd22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -Sphinx-1.0b2.tar.gz +/Sphinx-1.0.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 5db0760..c28846e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -3,11 +3,10 @@ %endif %global upstream_name Sphinx -%global prerel b2 Name: python-sphinx -Version: 1.0 -Release: %{?prerel:0.}1.%{?prerel}%{?dist}.1 +Version: 1.0.4 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -16,11 +15,10 @@ Group: Development/Tools # sphinx/util/stemmer.py Public Domain # sphinx/pycode/pgen2 Python # jquery (MIT or GPLv2) -License: BSD and Public Domain and Python and (MIT or GPLv2) +License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ -Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}%{?prerel}.tar.gz +Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python-setuptools @@ -132,10 +130,6 @@ popd >> sphinx.lang -%clean -rm -rf %{buildroot} - - %check make test @@ -155,6 +149,10 @@ make test %changelog +* Fri Sep 17 2010 Michel Salim - 1.0.4-1 +- Update to 1.0.4 +- Remove BuildRoot and %%clean declarations + * Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index 2c902d7..88e98e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bf13da4fd0542cc85705d1c4abd3c0a Sphinx-1.0b2.tar.gz +d4067e42e75525ecf108ece471ce97bb Sphinx-1.0.4.tar.gz From 0f518b7f080a6fc17891318f9507c7b592ea04e8 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 1 Nov 2010 18:20:26 +0100 Subject: [PATCH 008/234] - Actually include *.js locale files - Generate manpages --- python-sphinx.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c28846e..b754472 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ Name: python-sphinx Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -85,9 +85,9 @@ sed '1d' -i sphinx/pycode/pgen2/token.py %{__python} setup.py build pushd doc make html +make man rm -rf _build/html/.buildinfo mv _build/html .. -rm -rf _* popd @@ -97,14 +97,14 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} -# Manpages not in beta release yet -#pushd doc +pushd doc # Deliver man pages -#install -d %{buildroot}%{_mandir}/man1 -#mv sphinx-*.1 %{buildroot}%{_mandir}/man1/ -#popd +install -d %{buildroot}%{_mandir}/man1 +mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ +popd # Deliver rst files +rm -rf doc/_* mv doc reST # Move language files to /usr/share in association with %patch1 @@ -139,9 +139,10 @@ make test %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO %{_bindir}/sphinx-* %{python_sitelib}/* -%{_datadir}/sphinx/ -%exclude %{_datadir}/sphinx/locale/*/sphinx.js -#%{_mandir}/man1/* +%dir %{_datadir}/sphinx/ +%dir %{_datadir}/sphinx/locale +%dir %{_datadir}/sphinx/locale/* +%{_mandir}/man1/* %files doc %defattr(-,root,root,-) @@ -149,6 +150,10 @@ make test %changelog +* Mon Nov 1 2010 Michel Salim - 1.0.4-2 +- Actually include *.js locale files +- Generate manpages + * Fri Sep 17 2010 Michel Salim - 1.0.4-1 - Update to 1.0.4 - Remove BuildRoot and %%clean declarations From f0ffbd5999d1fc7c0b5e02b08a3f0b54dc4fe41a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 1 Nov 2010 21:00:02 +0100 Subject: [PATCH 009/234] - Fix -doc Makefile to allow regeneration of .rst files --- python-sphinx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b754472..b6f0896 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ Name: python-sphinx Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -104,7 +104,8 @@ mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ popd # Deliver rst files -rm -rf doc/_* +rm -rf doc/_build +sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile mv doc reST # Move language files to /usr/share in association with %patch1 @@ -150,6 +151,9 @@ make test %changelog +* Mon Nov 1 2010 Michel Salim - 1.0.4-3 +- Fix -doc Makefile to allow regeneration of .rst files + * Mon Nov 1 2010 Michel Salim - 1.0.4-2 - Actually include *.js locale files - Generate manpages From ff20a4d8778dba6fa0c69cba89f2167920f6f109 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 1 Nov 2010 21:06:54 +0100 Subject: [PATCH 010/234] note that patch to support locale files in %{_datadir} has been upstreamed since 0.6.6 --- python-sphinx.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b6f0896..14d0867 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -108,7 +108,8 @@ rm -rf doc/_build sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile mv doc reST -# Move language files to /usr/share in association with %patch1 +# Move language files to /usr/share; +# patch to support this incorporated in 0.6.6 pushd %{buildroot}%{python_sitelib} for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`; From f9ba5a714cbe24955b02092bad0b7e87cc61b69f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 17 Jan 2011 21:31:19 -0800 Subject: [PATCH 011/234] - Update to upstream 1.0.6 --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4f1fd22..8001e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Sphinx-1.0.4.tar.gz +/Sphinx-1.0.6.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 14d0867..3fae7fa 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,8 +5,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.0.4 -Release: 3%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,6 +152,9 @@ make test %changelog +* Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 +- Update to upstream 1.0.6 + * Mon Nov 1 2010 Michel Salim - 1.0.4-3 - Fix -doc Makefile to allow regeneration of .rst files diff --git a/sources b/sources index 88e98e3..5fe543f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4067e42e75525ecf108ece471ce97bb Sphinx-1.0.4.tar.gz +4cdb86c7bb7fa2498ac12db844784769 Sphinx-1.0.6.tar.gz From e0af5ebac09fe22906148063f3f01489cd7e7c6b Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 18 Jan 2011 12:14:12 -0800 Subject: [PATCH 012/234] - Update to upstream 1.0.7 --- .gitignore | 1 + python-sphinx.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8001e8b..0749f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Sphinx-1.0.4.tar.gz /Sphinx-1.0.6.tar.gz +/Sphinx-1.0.7.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 3fae7fa..230b0f7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,7 +5,7 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: Python documentation generator @@ -152,6 +152,9 @@ make test %changelog +* Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 +- Update to upstream 1.0.7 + * Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 - Update to upstream 1.0.6 diff --git a/sources b/sources index 5fe543f..a2630fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cdb86c7bb7fa2498ac12db844784769 Sphinx-1.0.6.tar.gz +42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz From b1c0c82b4614e2740e4cc53eb3646687a7e6d118 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 00:32:40 -0600 Subject: [PATCH 013/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 230b0f7..eaeaf4e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ Name: python-sphinx Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,6 +152,9 @@ make test %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 - Update to upstream 1.0.7 From f55dc614d6616e49d2ccaaad55c3296b81937bba Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 28 Nov 2011 13:15:03 -0800 Subject: [PATCH 014/234] Update to upstream 1.1.2 --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0749f5b..17ed307 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /Sphinx-1.0.4.tar.gz /Sphinx-1.0.6.tar.gz /Sphinx-1.0.7.tar.gz +/Sphinx-1.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index eaeaf4e..85cd2aa 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,8 +5,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,6 +152,9 @@ make test %changelog +* Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 +- Update to upstream 1.1.2 + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a2630fe..c045db9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz +b65a5d5d6172f3dcfefb4770ec63926e Sphinx-1.1.2.tar.gz From 7f502fb34d084e5ee12742e23b281c8a4f416d2d Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 8 Dec 2011 18:46:16 +0100 Subject: [PATCH 015/234] Enable python3 subpackage --- .gitignore | 3 -- python-sphinx.spec | 107 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 17ed307..8817c29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/Sphinx-1.0.4.tar.gz -/Sphinx-1.0.6.tar.gz -/Sphinx-1.0.7.tar.gz /Sphinx-1.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 85cd2aa..bb3ec1e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,12 +1,15 @@ -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%if 0%{?fedora} || 0%{?rhel} > 6 +%global with_python3 1 +%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")} +%else +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif %global upstream_name Sphinx Name: python-sphinx Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -28,6 +31,17 @@ BuildRequires: python-nose Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-docutils +BuildRequires: python3-jinja2 +BuildRequires: python3-pygments +BuildRequires: python3-nose +Requires: python3-docutils +Requires: python3-jinja2 +Requires: python3-pygments +%endif # with_python3 %description @@ -59,6 +73,41 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. +%if 0%{?with_python3} +%package -n python3-sphinx +Summary: Python documentation generator +Group: Development/Tools + +%description -n python3-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. +%endif # with_python3 + + %package doc Summary: Documentation for %{name} Group: Documentation @@ -81,8 +130,20 @@ This package contains documentation in reST and HTML formats. %setup -q -n %{upstream_name}-%{version}%{?prerel} sed '1d' -i sphinx/pycode/pgen2/token.py +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif # with_python3 + + %build %{__python} setup.py build +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 + pushd doc make html make man @@ -94,13 +155,31 @@ popd %install rm -rf %{buildroot} -%{__python} setup.py install --skip-build --root %{buildroot} +# Must do the python3 install first because the scripts in /usr/bin are +# overwritten with every setup.py install (and we want the python2 version +# to be the default for now). +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install --skip-build --root %{buildroot} +for f in %{buildroot}%{_bindir}/sphinx-*; +do + mv $f $f-%{python3_version} +done +popd +%endif # with_python3 +%{__python} setup.py install --skip-build --root %{buildroot} pushd doc # Deliver man pages install -d %{buildroot}%{_mandir}/man1 mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ +%if 0%{?with_python3} +for f in %{buildroot}%{_mandir}/man1/sphinx-*.1; +do + cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|") +done +%endif # with_python3 popd # Deliver rst files @@ -134,6 +213,11 @@ popd %check make test +%if 0%{?with_python3} +pushd %{py3dir} +make test +popd +%endif # with_python3 %files -f sphinx.lang @@ -144,14 +228,29 @@ make test %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* +%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* +%if 0%{?with_python3} +%files -n python3-sphinx +%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%{_bindir}/sphinx-*-%{python3_version} +%{python3_sitelib}/* +%dir %{_datadir}/sphinx/ +%dir %{_datadir}/sphinx/locale +%dir %{_datadir}/sphinx/locale/* +%{_mandir}/man1/sphinx-*-%{python3_version}.1* +%endif # with_python3 + %files doc %defattr(-,root,root,-) %doc html reST %changelog +* Thu Dec 8 2011 Michel Salim - 1.1.2-2 +- Enable python3 subpackage + * Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 - Update to upstream 1.1.2 From 40949725d605a38915291a8b8ac864282dd7bb4e Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 17 Dec 2011 15:27:46 +0100 Subject: [PATCH 016/234] BR on texlive-latex for LaTeX tests --- python-sphinx.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index bb3ec1e..63ed3c8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,6 +28,8 @@ BuildRequires: python-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 BuildRequires: python-nose +# Test dependencies +BuildRequires: texlive-latex Requires: python-docutils Requires: python-jinja2 Requires: python-pygments @@ -248,6 +250,9 @@ popd %changelog +* Sat Dec 17 2011 Michel Salim - 1.1.2-3 +- BR on texlive-latex for LaTeX tests + * Thu Dec 8 2011 Michel Salim - 1.1.2-2 - Enable python3 subpackage From 1d3a0101f844200183d8da6e7c0341ef4f46814f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 17 Dec 2011 15:46:30 +0100 Subject: [PATCH 017/234] bump release number --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 63ed3c8..65fbc9e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools From bb7f33ebc78b7cf0ae6714861f1ed3d46ff61983 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 20:09:26 -0600 Subject: [PATCH 018/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 65fbc9e..cd3d75b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -250,6 +250,9 @@ popd %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Dec 17 2011 Michel Salim - 1.1.2-3 - BR on texlive-latex for LaTeX tests From 6f5543e14a09e466cc0f9a5f3cc8bb452cba289b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 5 Feb 2012 05:08:09 +0100 Subject: [PATCH 019/234] Move python3 runtime dependencies to the right subpackage - Properly exclude python3 binaries --- python-sphinx.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index cd3d75b..a3054ec 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -30,9 +30,7 @@ BuildRequires: python-jinja2 BuildRequires: python-nose # Test dependencies BuildRequires: texlive-latex -Requires: python-docutils -Requires: python-jinja2 -Requires: python-pygments + %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -40,11 +38,11 @@ BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-pygments BuildRequires: python3-nose -Requires: python3-docutils -Requires: python3-jinja2 -Requires: python3-pygments %endif # with_python3 +Requires: python-docutils +Requires: python-jinja2 +Requires: python-pygments %description Sphinx is a tool that makes it easy to create intelligent and @@ -79,6 +77,9 @@ the Python docs: %package -n python3-sphinx Summary: Python documentation generator Group: Development/Tools +Requires: python3-docutils +Requires: python3-jinja2 +Requires: python3-pygments %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -225,6 +226,7 @@ popd %files -f sphinx.lang %defattr(-,root,root,-) %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* %{python_sitelib}/* %dir %{_datadir}/sphinx/ @@ -250,6 +252,10 @@ popd %changelog +* Sun Feb 5 2012 Michel Salim - 1.1.2-5 +- Move python3 runtime dependencies to the right subpackage +- Properly exclude python3 binaries + * Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From a395fb6e81f56dd6e3253474b4c52f37b0326453 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Apr 2012 20:15:04 +0700 Subject: [PATCH 020/234] Update to 1.1.3 --- .gitignore | 2 +- python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8817c29..39fa13f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/Sphinx-1.1.2.tar.gz +/Sphinx-1.1.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index a3054ec..fc82824 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,8 +8,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.1.2 -Release: 5%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -252,6 +252,9 @@ popd %changelog +* Thu Apr 5 2012 Michel Salim - 1.1.3-1 +- Update to 1.1.3 + * Sun Feb 5 2012 Michel Salim - 1.1.2-5 - Move python3 runtime dependencies to the right subpackage - Properly exclude python3 binaries diff --git a/sources b/sources index c045db9..4609f5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b65a5d5d6172f3dcfefb4770ec63926e Sphinx-1.1.2.tar.gz +8f55a6d4f87fc6d528120c5d1f983e98 Sphinx-1.1.3.tar.gz From 6c82a1545fc1f28b97992757d2d9b6b5f5eca307 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 04:33:25 -0500 Subject: [PATCH 021/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index fc82824..de07f84 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -252,6 +252,9 @@ popd %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Apr 5 2012 Michel Salim - 1.1.3-1 - Update to 1.1.3 From b4171b5eab71b7b9de22b09daccc017914e52f8b Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 3 Aug 2012 14:04:33 -0400 Subject: [PATCH 022/234] remove rhel logic from with_python3 conditional --- python-sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index de07f84..c5393f6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} %global with_python3 1 %{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")} %else @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -252,6 +252,9 @@ popd %changelog +* Fri Aug 3 2012 David Malcolm - 1.1.3-3 +- remove rhel logic from with_python3 conditional + * Sat Jul 21 2012 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 3b05e7e3e8129128f2a4de41d11c0741f755ee52 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 6 Aug 2012 20:10:37 +0700 Subject: [PATCH 023/234] Rebuild for Python 3.3 --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c5393f6..9bb7fe1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -252,6 +252,9 @@ popd %changelog +* Mon Aug 6 2012 Michel Salim - 1.1.3-4 +- Rebuild for Python 3.3 + * Fri Aug 3 2012 David Malcolm - 1.1.3-3 - remove rhel logic from with_python3 conditional From 949853df2763376d4e1094d58b23b27f99f172fa Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 24 Aug 2012 06:47:45 -0700 Subject: [PATCH 024/234] Fix for use of sphinx's manpage writer with docutils-0.10 --- python-sphinx.spec | 9 ++++++++- sphinx-docutils-0.10.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sphinx-docutils-0.10.patch diff --git a/python-sphinx.spec b/python-sphinx.spec index 9bb7fe1..a2e963e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -21,6 +21,8 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +# Sent upstream as a fix to work with the next version of docutils +Patch0: sphinx-docutils-0.10.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -133,6 +135,8 @@ This package contains documentation in reST and HTML formats. %setup -q -n %{upstream_name}-%{version}%{?prerel} sed '1d' -i sphinx/pycode/pgen2/token.py +%patch0 -p1 + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -252,6 +256,9 @@ popd %changelog +* Tue Aug 21 2012 Toshio Kuratomi - 1.1.3-5 +- Fix for use of sphinx's manpage writer with docutils-0.10 + * Mon Aug 6 2012 Michel Salim - 1.1.3-4 - Rebuild for Python 3.3 diff --git a/sphinx-docutils-0.10.patch b/sphinx-docutils-0.10.patch new file mode 100644 index 0000000..7f4f331 --- /dev/null +++ b/sphinx-docutils-0.10.patch @@ -0,0 +1,28 @@ +diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py +--- Sphinx-1.1.3/sphinx/writers/manpage.py.bak 2011-11-01 00:38:44.000000000 -0700 ++++ Sphinx-1.1.3/sphinx/writers/manpage.py 2012-08-21 12:38:33.380808202 -0700 +@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato + # since self.append_header() is never called, need to do this here + self.body.append(MACRO_DEF) + ++ # Overwrite admonition label translations with our own ++ for label, translation in admonitionlabels.items(): ++ self.language.labels[label] = self.deunicode(translation) ++ ++ + # overwritten -- added quotes around all .TH arguments + def header(self): + tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\"" +@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato + def depart_seealso(self, node): + self.depart_admonition(node) + +- # overwritten -- use our own label translations +- def visit_admonition(self, node, name=None): +- if name: +- self.body.append('.IP %s\n' % +- self.deunicode(admonitionlabels.get(name, name))) +- + def visit_productionlist(self, node): + self.ensure_eol() + names = [] From b116da03e7f84662898f064301c7c1c84342967b Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 28 Aug 2012 12:08:57 -0400 Subject: [PATCH 025/234] add link to upstream report about manpage patch --- python-sphinx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index a2e963e..726e2e7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -22,6 +22,7 @@ License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz # Sent upstream as a fix to work with the next version of docutils +# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage Patch0: sphinx-docutils-0.10.patch BuildArch: noarch From 98372232f50bde06d13b68ff8d57335fe982eb32 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 14:26:29 -0600 Subject: [PATCH 026/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 726e2e7..4aaba0b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -257,6 +257,9 @@ popd %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Aug 21 2012 Toshio Kuratomi - 1.1.3-5 - Fix for use of sphinx's manpage writer with docutils-0.10 From 90515d9f9d4d9912ffadc3f95900e24d630ff642 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 9 Mar 2013 10:27:22 +0700 Subject: [PATCH 027/234] Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot --- Sphinx-1.1.3-fix_quoting_in_inheritance.patch | 13 +++++++++++++ python-sphinx.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 Sphinx-1.1.3-fix_quoting_in_inheritance.patch diff --git a/Sphinx-1.1.3-fix_quoting_in_inheritance.patch b/Sphinx-1.1.3-fix_quoting_in_inheritance.patch new file mode 100644 index 0000000..f9669f5 --- /dev/null +++ b/Sphinx-1.1.3-fix_quoting_in_inheritance.patch @@ -0,0 +1,13 @@ +--- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig 2012-02-19 11:54:47.000000000 +0100 ++++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py 2013-03-02 18:44:29.303047600 +0100 +@@ -199,8 +199,8 @@ class InheritanceGraph(object): + 'shape': 'box', + 'fontsize': 10, + 'height': 0.25, +- 'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, ' +- 'Arial, Helvetica, sans', ++ 'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, ' ++ 'Arial, Helvetica, sans"', + 'style': '"setlinewidth(0.5)"', + } + default_edge_attrs = { diff --git a/python-sphinx.spec b/python-sphinx.spec index 4aaba0b..2e3850f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -24,6 +24,9 @@ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream # Sent upstream as a fix to work with the next version of docutils # https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage Patch0: sphinx-docutils-0.10.patch +# Fixes quoting issue in inheritance_diagram.py +# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a +Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -137,6 +140,7 @@ This package contains documentation in reST and HTML formats. sed '1d' -i sphinx/pycode/pgen2/token.py %patch0 -p1 +%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -257,6 +261,9 @@ popd %changelog +* Sat Mar 9 2013 Michel Salim - 1.1.3-7 +- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot + * Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0391881889d72e02f538e91629750b22c0744e12 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:53:37 -0500 Subject: [PATCH 028/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 2e3850f..efe29de 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -261,6 +261,9 @@ popd %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Mar 9 2013 Michel Salim - 1.1.3-7 - Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot From 5c3682d94b405d5ea5fecb7ce57db3857369f4e2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 13 Feb 2014 23:33:41 +0700 Subject: [PATCH 029/234] Update to 1.2.1 --- Sphinx-1.1.3-fix_quoting_in_inheritance.patch | 13 ------ Sphinx-1.2.1-mantarget.patch | 15 +++++++ python-sphinx.spec | 40 +++++++++++-------- sources | 2 +- sphinx-docutils-0.10.patch | 28 ------------- 5 files changed, 39 insertions(+), 59 deletions(-) delete mode 100644 Sphinx-1.1.3-fix_quoting_in_inheritance.patch create mode 100644 Sphinx-1.2.1-mantarget.patch delete mode 100644 sphinx-docutils-0.10.patch diff --git a/Sphinx-1.1.3-fix_quoting_in_inheritance.patch b/Sphinx-1.1.3-fix_quoting_in_inheritance.patch deleted file mode 100644 index f9669f5..0000000 --- a/Sphinx-1.1.3-fix_quoting_in_inheritance.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig 2012-02-19 11:54:47.000000000 +0100 -+++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py 2013-03-02 18:44:29.303047600 +0100 -@@ -199,8 +199,8 @@ class InheritanceGraph(object): - 'shape': 'box', - 'fontsize': 10, - 'height': 0.25, -- 'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, ' -- 'Arial, Helvetica, sans', -+ 'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, ' -+ 'Arial, Helvetica, sans"', - 'style': '"setlinewidth(0.5)"', - } - default_edge_attrs = { diff --git a/Sphinx-1.2.1-mantarget.patch b/Sphinx-1.2.1-mantarget.patch new file mode 100644 index 0000000..ad65a28 --- /dev/null +++ b/Sphinx-1.2.1-mantarget.patch @@ -0,0 +1,15 @@ +--- sphinx/doc/Makefile.mantarget 2014-02-13 23:28:58.604797750 +0700 ++++ sphinx/doc/Makefile 2014-02-14 00:00:45.794658764 +0700 +@@ -12,6 +12,12 @@ + help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + ++# Likewise for man, since a man directory exist and make will assume ++# the target is up to date ++.PHONY: man ++man: ++ @$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) ++ + # Catch-all target: route all unknown targets to Sphinx using the new + # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). + %: diff --git a/python-sphinx.spec b/python-sphinx.spec index efe29de..0ef815e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,8 +8,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.1.3 -Release: 8%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -21,21 +21,16 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -# Sent upstream as a fix to work with the next version of docutils -# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage -Patch0: sphinx-docutils-0.10.patch -# Fixes quoting issue in inheritance_diagram.py -# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a -Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch +Patch0: Sphinx-1.2.1-mantarget.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 +BuildRequires: python-pygments BuildRequires: python-nose -# Test dependencies -BuildRequires: texlive-latex +#BuildRequires: texlive-latex %if 0%{?with_python3} BuildRequires: python3-devel @@ -49,6 +44,11 @@ BuildRequires: python3-nose Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +# for latex builder +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig %description Sphinx is a tool that makes it easy to create intelligent and @@ -86,6 +86,11 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +# for latex builder +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -137,11 +142,9 @@ This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version}%{?prerel} +%patch0 -p1 -b .mantarget sed '1d' -i sphinx/pycode/pgen2/token.py -%patch0 -p1 -%patch1 -p1 - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -203,7 +206,7 @@ mv doc reST # patch to support this incorporated in 0.6.6 pushd %{buildroot}%{python_sitelib} -for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`; +for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`; do install -d %{buildroot}%{_datadir}/sphinx/locale/$lang install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES @@ -227,14 +230,14 @@ popd make test %if 0%{?with_python3} pushd %{py3dir} -make test +PYTHON=python3 make test popd %endif # with_python3 %files -f sphinx.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* %{python_sitelib}/* @@ -246,7 +249,7 @@ popd %if 0%{?with_python3} %files -n python3-sphinx -%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %{_bindir}/sphinx-*-%{python3_version} %{python3_sitelib}/* %dir %{_datadir}/sphinx/ @@ -261,6 +264,9 @@ popd %changelog +* Thu Feb 13 2014 Michel Salim - 1.2.1-1 +- Update to 1.2.1 + * Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 4609f5c..c8159be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f55a6d4f87fc6d528120c5d1f983e98 Sphinx-1.1.3.tar.gz +104494f036889122c9f403ae065ae7a9 Sphinx-1.2.1.tar.gz diff --git a/sphinx-docutils-0.10.patch b/sphinx-docutils-0.10.patch deleted file mode 100644 index 7f4f331..0000000 --- a/sphinx-docutils-0.10.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py ---- Sphinx-1.1.3/sphinx/writers/manpage.py.bak 2011-11-01 00:38:44.000000000 -0700 -+++ Sphinx-1.1.3/sphinx/writers/manpage.py 2012-08-21 12:38:33.380808202 -0700 -@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato - # since self.append_header() is never called, need to do this here - self.body.append(MACRO_DEF) - -+ # Overwrite admonition label translations with our own -+ for label, translation in admonitionlabels.items(): -+ self.language.labels[label] = self.deunicode(translation) -+ -+ - # overwritten -- added quotes around all .TH arguments - def header(self): - tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\"" -@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato - def depart_seealso(self, node): - self.depart_admonition(node) - -- # overwritten -- use our own label translations -- def visit_admonition(self, node, name=None): -- if name: -- self.body.append('.IP %s\n' % -- self.deunicode(admonitionlabels.get(name, name))) -- - def visit_productionlist(self, node): - self.ensure_eol() - names = [] From 1f7abf830e6da6084a7deff6dba25583ca96cee6 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 4 Mar 2014 16:31:30 +0700 Subject: [PATCH 030/234] Run new-sources to upload new source tarball --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39fa13f..a687e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/Sphinx-1.1.3.tar.gz +/Sphinx-1.2.1.tar.gz From 3fae921c8f6f7a450e86a8531e67e7601d0e0a46 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 May 2014 21:32:40 -0600 Subject: [PATCH 031/234] Update to 1.2.2 --- .gitignore | 1 + python-sphinx.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a687e4f..629d782 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Sphinx-1.2.1.tar.gz +/Sphinx-1.2.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 0ef815e..2ecee1a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Python documentation generator @@ -264,6 +264,9 @@ popd %changelog +* Fri May 9 2014 Orion Poplawski - 1.2.2-1 +- Update to 1.2.2 + * Thu Feb 13 2014 Michel Salim - 1.2.1-1 - Update to 1.2.1 diff --git a/sources b/sources index c8159be..33de74f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -104494f036889122c9f403ae065ae7a9 Sphinx-1.2.1.tar.gz +3dc73ccaa8d0bfb2d62fb671b1f7e8a4 Sphinx-1.2.2.tar.gz From 8fa1fa5fca5194e0084bda04d2711456e432088d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 May 2014 21:33:34 -0600 Subject: [PATCH 032/234] Rebuild for Python 3.4 --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 2ecee1a..d55d846 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -264,6 +264,9 @@ popd %changelog +* Fri May 9 2014 Orion Poplawski - 1.2.2-2 +- Rebuild for Python 3.4 + * Fri May 9 2014 Orion Poplawski - 1.2.2-1 - Update to 1.2.2 From a5f5cdf496b3e5596f7816023a6352fc3c2ed06b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 9 May 2014 21:34:04 -0600 Subject: [PATCH 033/234] Drop %defattr() --- python-sphinx.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d55d846..af03b01 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -236,7 +236,6 @@ popd %files -f sphinx.lang -%defattr(-,root,root,-) %doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* @@ -259,7 +258,6 @@ popd %endif # with_python3 %files doc -%defattr(-,root,root,-) %doc html reST From 05583324a954c3c5b17c7d4e77c1234ac9e45d9c Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Tue, 27 May 2014 11:21:38 +0200 Subject: [PATCH 034/234] Add python-*-3 links to scripts Resolves: #1098109 --- python-sphinx.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index af03b01..34fcc2e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -179,6 +179,7 @@ pushd %{py3dir} for f in %{buildroot}%{_bindir}/sphinx-*; do mv $f $f-%{python3_version} + ln -s %{_bindir}/`basename $f-%{python3_version}` $f-3 done popd %endif # with_python3 @@ -249,6 +250,7 @@ popd %if 0%{?with_python3} %files -n python3-sphinx %doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO +%{_bindir}/sphinx-*-3 %{_bindir}/sphinx-*-%{python3_version} %{python3_sitelib}/* %dir %{_datadir}/sphinx/ @@ -262,6 +264,10 @@ popd %changelog +* Thu May 22 2014 Bohuslav Kabrda - 1.2.2-3 +- Add python-*-3 links to scripts +Resolves: #1098109 + * Fri May 9 2014 Orion Poplawski - 1.2.2-2 - Rebuild for Python 3.4 From b89e221d5560e95f9996f900ca7903790a56c370 Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Tue, 27 May 2014 15:08:56 +0200 Subject: [PATCH 035/234] Don't own the -3 scripts by python 2 package --- python-sphinx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 34fcc2e..43ffb8f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -238,6 +238,7 @@ popd %files -f sphinx.lang %doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO +%exclude %{_bindir}/sphinx-*-3 %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* %{python_sitelib}/* @@ -264,8 +265,11 @@ popd %changelog +* Tue May 27 2014 Bohuslav Kabrda - 1.2.2-4 +- Don't own the -3 scripts by python 2 package + * Thu May 22 2014 Bohuslav Kabrda - 1.2.2-3 -- Add python-*-3 links to scripts +- Add sphinx-*-3 links to scripts Resolves: #1098109 * Fri May 9 2014 Orion Poplawski - 1.2.2-2 From d1ad3f6769b3327672b2591df0d00baa64c5bfd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 18:14:13 -0500 Subject: [PATCH 036/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 43ffb8f..dae3209 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -265,6 +265,9 @@ popd %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 27 2014 Bohuslav Kabrda - 1.2.2-4 - Don't own the -3 scripts by python 2 package From 59016161fcb3eee325c595d254f2c4b1d7d9fbd7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 23 Jan 2015 16:56:47 +0700 Subject: [PATCH 037/234] Split off LaTeX builder into its own subpackages, to remove TeXLive dependencies from the main package. Thanks to Robert Kuska for feedback - Clean up python3-sphinx's locale files, they ended up in the python2 package. Share the locale files in /usr/share instead --- python-sphinx.spec | 84 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index dae3209..d38e601 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -21,7 +21,7 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -Patch0: Sphinx-1.2.1-mantarget.patch +Patch0: Sphinx-1.2.1-mantarget.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -79,6 +79,27 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. +%package latex +Summary: LaTeX builder for %{name} +Requires: %{name} = %{version}-%{release} +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig + +%description 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 contains the LaTeX builder for Sphinx. It is packaged +separately so that the main package does not pull in TeXLive +dependencies. + + %if 0%{?with_python3} %package -n python3-sphinx Summary: Python documentation generator @@ -86,11 +107,6 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments -# for latex builder -Requires: texlive-framed -Requires: texlive-threeparttable -Requires: texlive-titlesec -Requires: texlive-wrapfig %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -119,6 +135,26 @@ the Python docs: * 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 python3-sphinx-latex +Summary: LaTeX builder for %{name} +Requires: python3-sphinx = %{version}-%{release} +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig + +%description -n python3-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 contains the LaTeX builder for Sphinx. It is packaged +separately so that the main package does not pull in TeXLive +dependencies. %endif # with_python3 @@ -128,7 +164,6 @@ Group: Documentation License: BSD Requires: %{name} = %{version}-%{release} - %description doc Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects (or other documents @@ -195,6 +230,10 @@ for f in %{buildroot}%{_mandir}/man1/sphinx-*.1; do cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|") done + +# Remove language files, they're identical to the ones from the +# Python 2 build that will be moved to /usr/share below +find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \; %endif # with_python3 popd @@ -241,6 +280,9 @@ popd %exclude %{_bindir}/sphinx-*-3 %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* +%exclude %{python_sitelib}/sphinx/builders/latex.py* +%exclude %{python_sitelib}/sphinx/writers/latex.py* +%exclude %{python_sitelib}/sphinx/texinputs %{python_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale @@ -248,16 +290,33 @@ popd %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* +%files latex +%{python_sitelib}/sphinx/builders/latex.py* +%{python_sitelib}/sphinx/writers/latex.py* +%{python_sitelib}/sphinx/texinputs + %if 0%{?with_python3} -%files -n python3-sphinx +%files -n python3-sphinx -f sphinx.lang %doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %{_bindir}/sphinx-*-3 %{_bindir}/sphinx-*-%{python3_version} +%exclude %{python3_sitelib}/sphinx/builders/latex.py* +%exclude %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* +%exclude %{python3_sitelib}/sphinx/writers/latex.py* +%exclude %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* +%exclude %{python3_sitelib}/sphinx/texinputs %{python3_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-*-%{python3_version}.1* + +%files -n python3-sphinx-latex +%{python3_sitelib}/sphinx/builders/latex.py* +%{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* +%{python3_sitelib}/sphinx/writers/latex.py* +%{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* +%{python3_sitelib}/sphinx/texinputs %endif # with_python3 %files doc @@ -265,6 +324,13 @@ popd %changelog +* Thu Jan 22 2015 Michel Alexandre Salim - 1.2.2-6 +- Split off LaTeX builder into its own subpackages, to remove TeXLive + dependencies from the main package. + Thanks to Robert Kuska 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 - 1.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 82623cae02d13e7ed1a2ee89038fc0e7fd33359d Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 27 Jan 2015 22:08:25 +0700 Subject: [PATCH 038/234] Disable separate LaTeX builder for now (bz#1185574) --- python-sphinx.spec | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d38e601..b887940 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,11 +5,15 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif +# more work needed; currently sphinx-build fails when +# some latex files are unavailable - bz#1185574 +%bcond_with splitlatex + %global upstream_name Sphinx Name: python-sphinx Version: 1.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -44,11 +48,13 @@ BuildRequires: python3-nose Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +%if ! 0%{?with_splitlatex} # for latex builder Requires: texlive-framed Requires: texlive-threeparttable Requires: texlive-titlesec Requires: texlive-wrapfig +%endif %description Sphinx is a tool that makes it easy to create intelligent and @@ -79,6 +85,7 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. +%if 0%{?with_splitlatex} %package latex Summary: LaTeX builder for %{name} Requires: %{name} = %{version}-%{release} @@ -98,6 +105,7 @@ useful to many other projects. This package contains the LaTeX builder for Sphinx. It is packaged separately so that the main package does not pull in TeXLive dependencies. +%endif %if 0%{?with_python3} @@ -136,6 +144,7 @@ the Python docs: * Various extensions are available, e.g. for automatic testing of snippets and inclusion of appropriately formatted docstrings. +%if 0%{?with_splitlatex} %package -n python3-sphinx-latex Summary: LaTeX builder for %{name} Requires: python3-sphinx = %{version}-%{release} @@ -155,6 +164,7 @@ useful to many other projects. This package contains the LaTeX builder for Sphinx. It is packaged separately so that the main package does not pull in TeXLive dependencies. +%endif # with_splitlatex %endif # with_python3 @@ -280,9 +290,11 @@ popd %exclude %{_bindir}/sphinx-*-3 %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* +%if 0%{?with_splitlatex} %exclude %{python_sitelib}/sphinx/builders/latex.py* %exclude %{python_sitelib}/sphinx/writers/latex.py* %exclude %{python_sitelib}/sphinx/texinputs +%endif %{python_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale @@ -290,33 +302,39 @@ popd %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* +%if 0%{?with_splitlatex} %files latex %{python_sitelib}/sphinx/builders/latex.py* %{python_sitelib}/sphinx/writers/latex.py* %{python_sitelib}/sphinx/texinputs +%endif %if 0%{?with_python3} %files -n python3-sphinx -f sphinx.lang %doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %{_bindir}/sphinx-*-3 %{_bindir}/sphinx-*-%{python3_version} +%if 0%{?with_splitlatex} %exclude %{python3_sitelib}/sphinx/builders/latex.py* %exclude %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* %exclude %{python3_sitelib}/sphinx/writers/latex.py* %exclude %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* %exclude %{python3_sitelib}/sphinx/texinputs +%endif %{python3_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-*-%{python3_version}.1* +%if 0%{?with_splitlatex} %files -n python3-sphinx-latex %{python3_sitelib}/sphinx/builders/latex.py* %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* %{python3_sitelib}/sphinx/writers/latex.py* %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* %{python3_sitelib}/sphinx/texinputs +%endif # with_splitlatex %endif # with_python3 %files doc @@ -324,6 +342,9 @@ popd %changelog +* Tue Jan 27 2015 Michel Alexandre Salim - 1.2.2-7 +- Disable separate LaTeX builder for now (bz#1185574) + * Thu Jan 22 2015 Michel Alexandre Salim - 1.2.2-6 - Split off LaTeX builder into its own subpackages, to remove TeXLive dependencies from the main package. From 466a673d1089963f8b42c1b601f2e55bb9810796 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 3 Feb 2015 22:23:56 +0700 Subject: [PATCH 039/234] If a separate LaTeX subpackage is not generated, the main package should have a virtual Provides: for it (bz#1187989) --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b887940..c54b1f1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -49,6 +49,7 @@ Requires: python-docutils Requires: python-jinja2 Requires: python-pygments %if ! 0%{?with_splitlatex} +Provides: %{name}-latex = %{version}-%{release} # for latex builder Requires: texlive-framed Requires: texlive-threeparttable @@ -342,6 +343,10 @@ popd %changelog +* Tue Feb 3 2015 Michel Alexandre Salim - 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 - 1.2.2-7 - Disable separate LaTeX builder for now (bz#1185574) From d550a9e41a5ec6ca8ce89462458ff93310f99d90 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 4 Feb 2015 00:37:36 +0700 Subject: [PATCH 040/234] python3-sphinx package also Provides: python3-sphinx-latex --- python-sphinx.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c54b1f1..b1f75be 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -34,7 +34,6 @@ BuildRequires: python-docutils BuildRequires: python-jinja2 BuildRequires: python-pygments BuildRequires: python-nose -#BuildRequires: texlive-latex %if 0%{?with_python3} BuildRequires: python3-devel @@ -50,7 +49,6 @@ Requires: python-jinja2 Requires: python-pygments %if ! 0%{?with_splitlatex} Provides: %{name}-latex = %{version}-%{release} -# for latex builder Requires: texlive-framed Requires: texlive-threeparttable Requires: texlive-titlesec @@ -116,6 +114,13 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +%if ! 0%{?with_splitlatex} +Provides: python3-sphinx-latex = %{version}-%{release} +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig +%endif %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -343,6 +348,9 @@ popd %changelog +* Tue Feb 3 2015 Michel Alexandre Salim - 1.2.2-9 +- python3-sphinx package also Provides: python3-sphinx-latex + * Tue Feb 3 2015 Michel Alexandre Salim - 1.2.2-8 - If a separate LaTeX subpackage is not generated, the main package should have a virtual Provides: for it (bz#1187989) From 03e2822f6afa63ccc3749d042ee7594483d26a56 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Feb 2015 19:13:59 +0700 Subject: [PATCH 041/234] Complete LaTeX builder deps (fixes bz#882166) - Make test output verbose - Add BRs needed to enable all tests --- python-sphinx.spec | 114 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 89 insertions(+), 25 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b1f75be..681e096 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ Name: python-sphinx Version: 1.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -26,6 +26,7 @@ License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz Patch0: Sphinx-1.2.1-mantarget.patch +Patch1: Sphinx-1.2.2-verbosetests.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -33,7 +34,28 @@ BuildRequires: python-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 BuildRequires: python-pygments + +# for testing BuildRequires: python-nose +BuildRequires: gettext +BuildRequires: texinfo +BuildRequires: python-sqlalchemy +BuildRequires: python-whoosh +# note: no Python3 xapian binding yet +BuildRequires: xapian-bindings-python +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-collection-latex +BuildRequires: tex(cmap.sty) +BuildRequires: tex(ecrm1000.tfm) +BuildRequires: tex(fancybox.sty) +BuildRequires: tex(footnote.sty) +BuildRequires: tex(framed.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(parskip.sty) +BuildRequires: tex(titlesec.sty) +BuildRequires: tex(threeparttable.sty) +BuildRequires: tex(wrapfig.sty) + %if 0%{?with_python3} BuildRequires: python3-devel @@ -42,6 +64,8 @@ BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-pygments BuildRequires: python3-nose +BuildRequires: python3-sqlalchemy +BuildRequires: python3-whoosh %endif # with_python3 Requires: python-docutils @@ -49,10 +73,18 @@ Requires: python-jinja2 Requires: python-pygments %if ! 0%{?with_splitlatex} Provides: %{name}-latex = %{version}-%{release} -Requires: texlive-framed -Requires: texlive-threeparttable -Requires: texlive-titlesec -Requires: texlive-wrapfig +Requires: texlive-collection-fontsrecommended +Requires: texlive-collection-latex +Requires: tex(cmap.sty) +Requires: tex(ecrm1000.tfm) +Requires: tex(fancybox.sty) +Requires: tex(footnote.sty) +Requires: tex(framed.sty) +Requires: tex(multirow.sty) +Requires: tex(parskip.sty) +Requires: tex(titlesec.sty) +Requires: tex(threeparttable.sty) +Requires: tex(wrapfig.sty) %endif %description @@ -86,12 +118,20 @@ the Python docs: %if 0%{?with_splitlatex} %package latex -Summary: LaTeX builder for %{name} -Requires: %{name} = %{version}-%{release} -Requires: texlive-framed -Requires: texlive-threeparttable -Requires: texlive-titlesec -Requires: texlive-wrapfig +Summary: LaTeX builder for %{name} +Requires: %{name} = %{version}-%{release} +Requires: texlive-collection-fontsrecommended +Requires: texlive-collection-latex +Requires: tex(cmap.sty) +Requires: tex(ecrm1000.tfm) +Requires: tex(fancybox.sty) +Requires: tex(footnote.sty) +Requires: tex(framed.sty) +Requires: tex(multirow.sty) +Requires: tex(parskip.sty) +Requires: tex(titlesec.sty) +Requires: tex(threeparttable.sty) +Requires: tex(wrapfig.sty) %description latex Sphinx is a tool that makes it easy to create intelligent and @@ -109,17 +149,25 @@ dependencies. %if 0%{?with_python3} %package -n python3-sphinx -Summary: Python documentation generator -Group: Development/Tools +Summary: Python documentation generator +Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments %if ! 0%{?with_splitlatex} Provides: python3-sphinx-latex = %{version}-%{release} -Requires: texlive-framed -Requires: texlive-threeparttable -Requires: texlive-titlesec -Requires: texlive-wrapfig +Requires: texlive-collection-fontsrecommended +Requires: texlive-collection-latex +Requires: tex(cmap.sty) +Requires: tex(ecrm1000.tfm) +Requires: tex(fancybox.sty) +Requires: tex(footnote.sty) +Requires: tex(framed.sty) +Requires: tex(multirow.sty) +Requires: tex(parskip.sty) +Requires: tex(titlesec.sty) +Requires: tex(threeparttable.sty) +Requires: tex(wrapfig.sty) %endif %description -n python3-sphinx @@ -152,12 +200,20 @@ the Python docs: %if 0%{?with_splitlatex} %package -n python3-sphinx-latex -Summary: LaTeX builder for %{name} -Requires: python3-sphinx = %{version}-%{release} -Requires: texlive-framed -Requires: texlive-threeparttable -Requires: texlive-titlesec -Requires: texlive-wrapfig +Summary: LaTeX builder for %{name} +Requires: python3-sphinx = %{version}-%{release} +Requires: texlive-collection-fontsrecommended +Requires: texlive-collection-latex +Requires: tex(cmap.sty) +Requires: tex(ecrm1000.tfm) +Requires: tex(fancybox.sty) +Requires: tex(footnote.sty) +Requires: tex(framed.sty) +Requires: tex(multirow.sty) +Requires: tex(parskip.sty) +Requires: tex(titlesec.sty) +Requires: tex(threeparttable.sty) +Requires: tex(wrapfig.sty) %description -n python3-sphinx-latex Sphinx is a tool that makes it easy to create intelligent and @@ -194,6 +250,9 @@ This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version}%{?prerel} %patch0 -p1 -b .mantarget +# not backing up since every executable file in tests/ results in +# an additional "skipped" test +%patch1 -p1 sed '1d' -i sphinx/pycode/pgen2/token.py %if 0%{?with_python3} @@ -283,10 +342,10 @@ popd %check -make test +LANG=en_US.UTF-8 make test %if 0%{?with_python3} pushd %{py3dir} -PYTHON=python3 make test +LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 @@ -348,6 +407,11 @@ popd %changelog +* Thu Feb 5 2015 Michel Alexandre Salim - 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 - 1.2.2-9 - python3-sphinx package also Provides: python3-sphinx-latex From be9c7819b52c7dc9ca79108a10b01a8766be93fb Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Feb 2015 19:23:55 +0700 Subject: [PATCH 042/234] commit missing patch --- Sphinx-1.2.2-verbosetests.patch | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Sphinx-1.2.2-verbosetests.patch diff --git a/Sphinx-1.2.2-verbosetests.patch b/Sphinx-1.2.2-verbosetests.patch new file mode 100644 index 0000000..1242c47 --- /dev/null +++ b/Sphinx-1.2.2-verbosetests.patch @@ -0,0 +1,8 @@ +--- Sphinx-1.2.2/tests/run.py.verbosetests 2014-03-02 14:38:09.000000000 +0700 ++++ Sphinx-1.2.2/tests/run.py 2015-02-05 18:40:47.641374670 +0700 +@@ -58,4 +58,4 @@ + sys.exit(1) + + print('Running Sphinx test suite...') +-nose.main() ++nose.main(argv=['nose', '--verbosity=3']) From ffb1bcc3eb9a1bedc85cb019ba3f74bf7ced1c93 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Feb 2015 21:34:13 +0700 Subject: [PATCH 043/234] Update to 1.2.3 - Mark license file with %license instead of %doc --- .gitignore | 3 +-- python-sphinx.spec | 19 +++++++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 629d782..3e3c9b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/Sphinx-1.2.1.tar.gz -/Sphinx-1.2.2.tar.gz +/Sphinx-1.2.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 681e096..d1056c4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -12,8 +12,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.2.2 -Release: 10%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -54,6 +54,7 @@ BuildRequires: tex(multirow.sty) BuildRequires: tex(parskip.sty) BuildRequires: tex(titlesec.sty) BuildRequires: tex(threeparttable.sty) +BuildRequires: tex(upquote.sty) BuildRequires: tex(wrapfig.sty) @@ -84,6 +85,7 @@ Requires: tex(multirow.sty) Requires: tex(parskip.sty) Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) +Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) %endif @@ -131,6 +133,7 @@ Requires: tex(multirow.sty) Requires: tex(parskip.sty) Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) +Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) %description latex @@ -167,6 +170,7 @@ Requires: tex(multirow.sty) Requires: tex(parskip.sty) Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) +Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) %endif @@ -213,6 +217,7 @@ Requires: tex(multirow.sty) Requires: tex(parskip.sty) Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) +Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) %description -n python3-sphinx-latex @@ -351,7 +356,8 @@ popd %files -f sphinx.lang -%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO +%license LICENSE +%doc AUTHORS CHANGES EXAMPLES README.rst TODO %exclude %{_bindir}/sphinx-*-3 %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* @@ -376,7 +382,8 @@ popd %if 0%{?with_python3} %files -n python3-sphinx -f sphinx.lang -%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO +%license LICENSE +%doc AUTHORS CHANGES EXAMPLES README.rst TODO %{_bindir}/sphinx-*-3 %{_bindir}/sphinx-*-%{python3_version} %if 0%{?with_splitlatex} @@ -407,6 +414,10 @@ popd %changelog +* Thu Feb 5 2015 Michel Alexandre Salim - 1.2.3-1 +- Update to 1.2.3 +- Mark license file with %%license instead of %%doc + * Thu Feb 5 2015 Michel Alexandre Salim - 1.2.2-10 - Complete LaTeX builder deps (fixes bz#882166) - Make test output verbose diff --git a/sources b/sources index 33de74f..a5211f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3dc73ccaa8d0bfb2d62fb671b1f7e8a4 Sphinx-1.2.2.tar.gz +a98c93124035b4cd7183604aec656cb3 Sphinx-1.2.3.tar.gz From 731cbeb29c35a98b7e156e383cce282301edfb37 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 20:52:43 +0000 Subject: [PATCH 044/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d1056c4..12e0db9 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ Name: python-sphinx Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -414,6 +414,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Feb 5 2015 Michel Alexandre Salim - 1.2.3-1 - Update to 1.2.3 - Mark license file with %%license instead of %%doc From 791e01fe599906448667578f7af3c08bb45d4355 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 20 Jul 2015 17:05:13 +0700 Subject: [PATCH 045/234] Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies --- python-sphinx.spec | 85 +++++++--------------------------------------- 1 file changed, 12 insertions(+), 73 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 12e0db9..9026320 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,15 +5,11 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -# more work needed; currently sphinx-build fails when -# some latex files are unavailable - bz#1185574 -%bcond_with splitlatex - %global upstream_name Sphinx Name: python-sphinx Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -72,22 +68,6 @@ BuildRequires: python3-whoosh Requires: python-docutils Requires: python-jinja2 Requires: python-pygments -%if ! 0%{?with_splitlatex} -Provides: %{name}-latex = %{version}-%{release} -Requires: texlive-collection-fontsrecommended -Requires: texlive-collection-latex -Requires: tex(cmap.sty) -Requires: tex(ecrm1000.tfm) -Requires: tex(fancybox.sty) -Requires: tex(footnote.sty) -Requires: tex(framed.sty) -Requires: tex(multirow.sty) -Requires: tex(parskip.sty) -Requires: tex(titlesec.sty) -Requires: tex(threeparttable.sty) -Requires: tex(upquote.sty) -Requires: tex(wrapfig.sty) -%endif %description Sphinx is a tool that makes it easy to create intelligent and @@ -118,9 +98,8 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%if 0%{?with_splitlatex} %package latex -Summary: LaTeX builder for %{name} +Summary: LaTeX builder dependencies for %{name} Requires: %{name} = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex @@ -144,10 +123,8 @@ 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 contains the LaTeX builder for Sphinx. It is packaged -separately so that the main package does not pull in TeXLive -dependencies. -%endif +This package pulls in the TeX dependencies needed by Sphinx's LaTeX +builder. %if 0%{?with_python3} @@ -157,22 +134,6 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments -%if ! 0%{?with_splitlatex} -Provides: python3-sphinx-latex = %{version}-%{release} -Requires: texlive-collection-fontsrecommended -Requires: texlive-collection-latex -Requires: tex(cmap.sty) -Requires: tex(ecrm1000.tfm) -Requires: tex(fancybox.sty) -Requires: tex(footnote.sty) -Requires: tex(framed.sty) -Requires: tex(multirow.sty) -Requires: tex(parskip.sty) -Requires: tex(titlesec.sty) -Requires: tex(threeparttable.sty) -Requires: tex(upquote.sty) -Requires: tex(wrapfig.sty) -%endif %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -202,9 +163,8 @@ the Python docs: * Various extensions are available, e.g. for automatic testing of snippets and inclusion of appropriately formatted docstrings. -%if 0%{?with_splitlatex} %package -n python3-sphinx-latex -Summary: LaTeX builder for %{name} +Summary: LaTeX builder dependencies for %{name} Requires: python3-sphinx = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex @@ -228,10 +188,8 @@ 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 contains the LaTeX builder for Sphinx. It is packaged -separately so that the main package does not pull in TeXLive -dependencies. -%endif # with_splitlatex +This package pulls in the TeX dependencies needed by Sphinx's LaTeX +builder. %endif # with_python3 @@ -361,11 +319,6 @@ popd %exclude %{_bindir}/sphinx-*-3 %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* -%if 0%{?with_splitlatex} -%exclude %{python_sitelib}/sphinx/builders/latex.py* -%exclude %{python_sitelib}/sphinx/writers/latex.py* -%exclude %{python_sitelib}/sphinx/texinputs -%endif %{python_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale @@ -373,12 +326,8 @@ popd %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* -%if 0%{?with_splitlatex} %files latex -%{python_sitelib}/sphinx/builders/latex.py* -%{python_sitelib}/sphinx/writers/latex.py* -%{python_sitelib}/sphinx/texinputs -%endif +%license LICENSE %if 0%{?with_python3} %files -n python3-sphinx -f sphinx.lang @@ -386,27 +335,14 @@ popd %doc AUTHORS CHANGES EXAMPLES README.rst TODO %{_bindir}/sphinx-*-3 %{_bindir}/sphinx-*-%{python3_version} -%if 0%{?with_splitlatex} -%exclude %{python3_sitelib}/sphinx/builders/latex.py* -%exclude %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* -%exclude %{python3_sitelib}/sphinx/writers/latex.py* -%exclude %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* -%exclude %{python3_sitelib}/sphinx/texinputs -%endif %{python3_sitelib}/* %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-*-%{python3_version}.1* -%if 0%{?with_splitlatex} %files -n python3-sphinx-latex -%{python3_sitelib}/sphinx/builders/latex.py* -%{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py* -%{python3_sitelib}/sphinx/writers/latex.py* -%{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py* -%{python3_sitelib}/sphinx/texinputs -%endif # with_splitlatex +%license LICENSE %endif # with_python3 %files doc @@ -414,6 +350,9 @@ popd %changelog +* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-3 +- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies + * Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From a967b5849d9dcbb7ab1267817546bff7c5dea5c4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 20 Jul 2015 20:20:38 +0700 Subject: [PATCH 046/234] Fix line encoding of bundled jquery.js --- python-sphinx.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9026320..01980cb 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -31,6 +31,9 @@ BuildRequires: python-docutils BuildRequires: python-jinja2 BuildRequires: python-pygments +# for fixes +BuildRequires: dos2unix + # for testing BuildRequires: python-nose BuildRequires: gettext @@ -218,6 +221,9 @@ This package contains documentation in reST and HTML formats. %patch1 -p1 sed '1d' -i sphinx/pycode/pgen2/token.py +# fix line encoding of bundled jquery.js +dos2unix -k ./sphinx/themes/basic/static/jquery.js + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -350,6 +356,9 @@ popd %changelog +* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-4 +- Fix line encoding of bundled jquery.js + * Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-3 - Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies From 09de9d17106d4207319ccc18742c3d38a379e292 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Tue, 13 Oct 2015 17:48:58 +0200 Subject: [PATCH 047/234] Rebuilt for Python3.5 rebuild --- html-parser-HTMLParserError-removed.patch | 18 ++++++++++++++++++ python-sphinx.spec | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 html-parser-HTMLParserError-removed.patch diff --git a/html-parser-HTMLParserError-removed.patch b/html-parser-HTMLParserError-removed.patch new file mode 100644 index 0000000..d44ef22 --- /dev/null +++ b/html-parser-HTMLParserError-removed.patch @@ -0,0 +1,18 @@ +diff -up Sphinx-1.2.3/sphinx/builders/linkcheck.py.old Sphinx-1.2.3/sphinx/builders/linkcheck.py +--- Sphinx-1.2.3/sphinx/builders/linkcheck.py.old 2015-10-13 15:15:40.767811124 +0200 ++++ Sphinx-1.2.3/sphinx/builders/linkcheck.py 2015-10-13 15:14:41.916145677 +0200 +@@ -17,7 +17,13 @@ import threading + from os import path + from urllib2 import build_opener, unquote, Request, \ + HTTPError, HTTPRedirectHandler +-from HTMLParser import HTMLParser, HTMLParseError ++from HTMLParser import HTMLParser ++ ++try: ++ from HTMLParser import HTMLParseError ++except ImportError: ++ class HTMLParseError(Exception): ++ pass + + from docutils import nodes + diff --git a/python-sphinx.spec b/python-sphinx.spec index 01980cb..13894ec 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -9,7 +9,7 @@ Name: python-sphinx Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -23,6 +23,7 @@ URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz Patch0: Sphinx-1.2.1-mantarget.patch Patch1: Sphinx-1.2.2-verbosetests.patch +Patch2: html-parser-HTMLParserError-removed.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -219,6 +220,7 @@ This package contains documentation in reST and HTML formats. # not backing up since every executable file in tests/ results in # an additional "skipped" test %patch1 -p1 +%patch2 -p1 sed '1d' -i sphinx/pycode/pgen2/token.py # fix line encoding of bundled jquery.js @@ -356,6 +358,10 @@ popd %changelog +* Tue Oct 13 2015 Robert Kuska - 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 - 1.2.3-4 - Fix line encoding of bundled jquery.js From e24435f06124df189d5378bfd4c474fcfa5b4188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Nov 2015 17:28:39 -0500 Subject: [PATCH 048/234] Update to 1.3.1 (Patch posted by Julien on https://bugzilla.redhat.com/show_bug.cgi?id=1136284#c10.) --- .gitignore | 1 + Sphinx-1.2.2-verbosetests.patch | 8 -- python-sphinx.spec | 139 +++++++++++++++++++++----------- sources | 2 +- 4 files changed, 96 insertions(+), 54 deletions(-) delete mode 100644 Sphinx-1.2.2-verbosetests.patch diff --git a/.gitignore b/.gitignore index 3e3c9b2..7692fb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Sphinx-1.2.3.tar.gz +/Sphinx-1.3.1.tar.gz diff --git a/Sphinx-1.2.2-verbosetests.patch b/Sphinx-1.2.2-verbosetests.patch deleted file mode 100644 index 1242c47..0000000 --- a/Sphinx-1.2.2-verbosetests.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- Sphinx-1.2.2/tests/run.py.verbosetests 2014-03-02 14:38:09.000000000 +0700 -+++ Sphinx-1.2.2/tests/run.py 2015-02-05 18:40:47.641374670 +0700 -@@ -58,4 +58,4 @@ - sys.exit(1) - - print('Running Sphinx test suite...') --nose.main() -+nose.main(argv=['nose', '--verbosity=3']) diff --git a/python-sphinx.spec b/python-sphinx.spec index 13894ec..9f78228 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,6 +1,5 @@ %if 0%{?fedora} %global with_python3 1 -%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")} %else %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif @@ -8,8 +7,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.2.3 -Release: 5%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -19,18 +18,20 @@ Group: Development/Tools # sphinx/pycode/pgen2 Python # jquery (MIT or GPLv2) License: BSD and Public Domain and Python and (MIT or GPLv2) -URL: http://sphinx.pocoo.org/ +URL: http://sphinx-doc.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz Patch0: Sphinx-1.2.1-mantarget.patch -Patch1: Sphinx-1.2.2-verbosetests.patch -Patch2: html-parser-HTMLParserError-removed.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 +BuildRequires: python-babel BuildRequires: python-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 -BuildRequires: python-pygments +BuildRequires: python-pygments >= 2.0 +BuildRequires: python-six +BuildRequires: python-sphinx_rtd_theme +BuildRequires: python2-sphinx-theme-alabaster # for fixes BuildRequires: dos2unix @@ -41,6 +42,7 @@ BuildRequires: gettext BuildRequires: texinfo BuildRequires: python-sqlalchemy BuildRequires: python-whoosh +BuildRequires: python2-snowballstemmer # note: no Python3 xapian binding yet BuildRequires: xapian-bindings-python BuildRequires: texlive-collection-fontsrecommended @@ -60,6 +62,7 @@ BuildRequires: tex(wrapfig.sty) %if 0%{?with_python3} BuildRequires: python3-devel +BuildRequires: python3-babel BuildRequires: python3-setuptools BuildRequires: python3-docutils BuildRequires: python3-jinja2 @@ -67,13 +70,56 @@ BuildRequires: python3-pygments BuildRequires: python3-nose BuildRequires: python3-sqlalchemy BuildRequires: python3-whoosh +BuildRequires: python3-snowballstemmer +BuildRequires: python3-six +BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-sphinx-theme-alabaster %endif # with_python3 + +%description +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 python2-%{upstream_name} +Summary: Python documentation generator +Requires: python-babel Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +Requires: python2-snowballstemmer +Requires: python2-sphinx_rtd_theme +Requires: python-sphinx_rtd_theme +Requires: python2-six +Obsoletes: python-sphinx = 1.2.3 +%{?python_provide:%python_provide python2-sphinx} -%description +%description -n python2-%{upstream_name} 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 @@ -135,9 +181,15 @@ builder. %package -n python3-sphinx Summary: Python documentation generator Group: Development/Tools +Requires: python-babel Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +Requires: python3-snowballstemmer +Requires: python3-sphinx_rtd_theme +Requires: python3-sphinx-theme-alabaster +Requires: python3-six +%{?python_provide:%python_provide python3-sphinx} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -215,12 +267,8 @@ This package contains documentation in reST and HTML formats. %prep -%setup -q -n %{upstream_name}-%{version}%{?prerel} -%patch0 -p1 -b .mantarget -# not backing up since every executable file in tests/ results in -# an additional "skipped" test -%patch1 -p1 -%patch2 -p1 +%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1 + sed '1d' -i sphinx/pycode/pgen2/token.py # fix line encoding of bundled jquery.js @@ -233,11 +281,9 @@ cp -a . %{py3dir} %build -%{__python} setup.py build +%py2_build %if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd +%py3_build %endif # with_python3 pushd doc @@ -249,38 +295,34 @@ popd %install -rm -rf %{buildroot} - -# Must do the python3 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version +# Must do the python2 install first because the scripts in /usr/bin are +# overwritten with every setup.py install (and we want the python3 version # to be the default for now). -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} +%py2_install for f in %{buildroot}%{_bindir}/sphinx-*; do - mv $f $f-%{python3_version} - ln -s %{_bindir}/`basename $f-%{python3_version}` $f-3 + mv $f $f-%{python2_version} + ln -s %{_bindir}/`basename $f-%{python2_version}` $f-2 done -popd + + +%if 0%{?with_python3} +%py3_install %endif # with_python3 -%{__python} setup.py install --skip-build --root %{buildroot} pushd doc # Deliver man pages install -d %{buildroot}%{_mandir}/man1 mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ -%if 0%{?with_python3} for f in %{buildroot}%{_mandir}/man1/sphinx-*.1; do - cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|") + cp -p $f $(echo $f | sed -e "s|.1$|-%{python2_version}.1|") done # Remove language files, they're identical to the ones from the # Python 2 build that will be moved to /usr/share below find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \; -%endif # with_python3 popd # Deliver rst files @@ -321,18 +363,17 @@ popd %endif # with_python3 -%files -f sphinx.lang +%files -f sphinx.lang -n python2-%{upstream_name} %license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst TODO -%exclude %{_bindir}/sphinx-*-3 -%exclude %{_bindir}/sphinx-*-%{python3_version} -%{_bindir}/sphinx-* -%{python_sitelib}/* +%doc AUTHORS CHANGES EXAMPLES README.rst +%{_bindir}/sphinx-*-2 +%{_bindir}/sphinx-*-%{python2_version} +%{python2_sitelib}/sphinx/ +%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* -%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* -%{_mandir}/man1/* +%{_mandir}/man1/sphinx-*-%{python2_version}.1* %files latex %license LICENSE @@ -340,14 +381,17 @@ popd %if 0%{?with_python3} %files -n python3-sphinx -f sphinx.lang %license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst TODO -%{_bindir}/sphinx-*-3 -%{_bindir}/sphinx-*-%{python3_version} -%{python3_sitelib}/* +%doc AUTHORS CHANGES EXAMPLES README.rst +%exclude %{_bindir}/sphinx-*-2 +%exclude %{_bindir}/sphinx-*-%{python2_version} +%{_bindir}/sphinx* +%{python3_sitelib}/sphinx/ +%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* -%{_mandir}/man1/sphinx-*-%{python3_version}.1* +%exclude %{_mandir}/man1/sphinx-*-%{python2_version}.1* +%{_mandir}/man1/* %files -n python3-sphinx-latex %license LICENSE @@ -358,6 +402,11 @@ popd %changelog +* Tue Nov 24 2015 Julien Enselme - 1.3.1-1 +- Update to 1.3.1 +- Update to new guidelines +- Make the default executable use python3 + * Tue Oct 13 2015 Robert Kuska - 1.2.3-5 - Rebuilt for Python3.5 rebuild - add patch to reflect that Python3.5 dropped HTMLParserError diff --git a/sources b/sources index a5211f6..15f4f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a98c93124035b4cd7183604aec656cb3 Sphinx-1.2.3.tar.gz +8786a194acf9673464c5455b11fd4332 Sphinx-1.3.1.tar.gz From 1e96511926474846f9645855219e5daf534ef702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Nov 2015 10:12:55 -0500 Subject: [PATCH 049/234] Restore patch and require mock for tests --- html-parser-HTMLParserError-removed.patch | 29 +++++++++++++---------- python-sphinx.spec | 7 +++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/html-parser-HTMLParserError-removed.patch b/html-parser-HTMLParserError-removed.patch index d44ef22..10b3b5d 100644 --- a/html-parser-HTMLParserError-removed.patch +++ b/html-parser-HTMLParserError-removed.patch @@ -1,18 +1,21 @@ -diff -up Sphinx-1.2.3/sphinx/builders/linkcheck.py.old Sphinx-1.2.3/sphinx/builders/linkcheck.py ---- Sphinx-1.2.3/sphinx/builders/linkcheck.py.old 2015-10-13 15:15:40.767811124 +0200 -+++ Sphinx-1.2.3/sphinx/builders/linkcheck.py 2015-10-13 15:14:41.916145677 +0200 -@@ -17,7 +17,13 @@ import threading - from os import path - from urllib2 import build_opener, unquote, Request, \ - HTTPError, HTTPRedirectHandler --from HTMLParser import HTMLParser, HTMLParseError -+from HTMLParser import HTMLParser -+ +diff --git Sphinx-1.3.1/sphinx/builders/linkcheck.py~ Sphinx-1.3.1/sphinx/builders/linkcheck.py +index 9f5c2131c2..71bec0262d 100644 +--- Sphinx-1.3.1/sphinx/builders/linkcheck.py~ ++++ Sphinx-1.3.1/sphinx/builders/linkcheck.py +@@ -19,9 +19,15 @@ from six.moves import queue + from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler + from six.moves.urllib.parse import unquote, urlsplit, quote + from six.moves.urllib.error import HTTPError +-from six.moves.html_parser import HTMLParser, HTMLParseError ++from six.moves.html_parser import HTMLParser + from docutils import nodes + +try: + from HTMLParser import HTMLParseError +except ImportError: + class HTMLParseError(Exception): + pass - - from docutils import nodes - ++ + from sphinx.builders import Builder + from sphinx.util.console import purple, red, darkgreen, darkgray, \ + darkred, turquoise diff --git a/python-sphinx.spec b/python-sphinx.spec index 9f78228..ec8ff40 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,6 +21,7 @@ License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx-doc.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz Patch0: Sphinx-1.2.1-mantarget.patch +Patch1: html-parser-HTMLParserError-removed.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -41,6 +42,7 @@ BuildRequires: python-nose BuildRequires: gettext BuildRequires: texinfo BuildRequires: python-sqlalchemy +BuildRequires: python-mock BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer # note: no Python3 xapian binding yet @@ -69,6 +71,7 @@ BuildRequires: python3-jinja2 BuildRequires: python3-pygments BuildRequires: python3-nose BuildRequires: python3-sqlalchemy +BuildRequires: python3-mock BuildRequires: python3-whoosh BuildRequires: python3-snowballstemmer BuildRequires: python3-six @@ -112,6 +115,7 @@ Requires: python-babel Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +Requires: python-mock Requires: python2-snowballstemmer Requires: python2-sphinx_rtd_theme Requires: python-sphinx_rtd_theme @@ -185,6 +189,7 @@ Requires: python-babel Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +Requires: python3-mock Requires: python3-snowballstemmer Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster @@ -403,7 +408,7 @@ popd %changelog * Tue Nov 24 2015 Julien Enselme - 1.3.1-1 -- Update to 1.3.1 +- Update to 1.3.1 (#1136284) - Update to new guidelines - Make the default executable use python3 From 73971d1e9817dfab011be32cf233447e910d928f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Nov 2015 11:31:25 -0500 Subject: [PATCH 050/234] Fix requirements of python2- subpackage --- python-sphinx.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index ec8ff40..f720f82 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ Name: python-sphinx Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -117,7 +117,6 @@ Requires: python-jinja2 Requires: python-pygments Requires: python-mock Requires: python2-snowballstemmer -Requires: python2-sphinx_rtd_theme Requires: python-sphinx_rtd_theme Requires: python2-six Obsoletes: python-sphinx = 1.2.3 @@ -407,6 +406,9 @@ popd %changelog +* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 +- Fix requirements of python2- subpackage + * Tue Nov 24 2015 Julien Enselme - 1.3.1-1 - Update to 1.3.1 (#1136284) - Update to new guidelines From 6e19bc6384e827c07ab27e681f6949ee88a81a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Nov 2015 11:39:54 -0500 Subject: [PATCH 051/234] Provide sphinx-*-{3.5,3} symlinks for each script ... following https://fedoraproject.org/wiki/Packaging:Python#Naming. No need to put the full path in symlinks. It is actually better to include only the last part of the path, because that the path is resolved the same within and from outside of a chroot. Rearange %files a bit to work when python3 is disabled. Fix one more requirement on the python3 subpackage. --- python-sphinx.spec | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index f720f82..1e35c7e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -184,7 +184,7 @@ builder. %package -n python3-sphinx Summary: Python documentation generator Group: Development/Tools -Requires: python-babel +Requires: python3-babel Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments @@ -303,15 +303,22 @@ popd # overwritten with every setup.py install (and we want the python3 version # to be the default for now). %py2_install -for f in %{buildroot}%{_bindir}/sphinx-*; -do - mv $f $f-%{python2_version} - ln -s %{_bindir}/`basename $f-%{python2_version}` $f-2 +for i in sphinx-{apidoc,autogen,build,quickstart}; do + mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} + ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 +%if 0%{?with_python3} == 0 + ln -s $i-2 %{buildroot}%{_bindir}/$i +%endif done %if 0%{?with_python3} %py3_install +for i in sphinx-{apidoc,autogen,build,quickstart}; do + mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} + ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 + ln -s $i-3 %{buildroot}%{_bindir}/$i +done %endif # with_python3 @@ -367,11 +374,13 @@ popd %endif # with_python3 +%files latex +%license LICENSE + %files -f sphinx.lang -n python2-%{upstream_name} %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst -%{_bindir}/sphinx-*-2 -%{_bindir}/sphinx-*-%{python2_version} +%{_bindir}/sphinx-*-2* %{python2_sitelib}/sphinx/ %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ %dir %{_datadir}/sphinx/ @@ -379,16 +388,14 @@ popd %dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-*-%{python2_version}.1* -%files latex +%if 0%{?with_python3} +%files -n python3-sphinx-latex %license LICENSE -%if 0%{?with_python3} %files -n python3-sphinx -f sphinx.lang %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst -%exclude %{_bindir}/sphinx-*-2 -%exclude %{_bindir}/sphinx-*-%{python2_version} -%{_bindir}/sphinx* +%{_bindir}/sphinx-*-3* %{python3_sitelib}/sphinx/ %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ %dir %{_datadir}/sphinx/ @@ -397,9 +404,12 @@ popd %exclude %{_mandir}/man1/sphinx-*-%{python2_version}.1* %{_mandir}/man1/* -%files -n python3-sphinx-latex -%license LICENSE %endif # with_python3 +# This part falls into python2- when building without python3 +%{_bindir}/sphinx-apidoc +%{_bindir}/sphinx-autogen +%{_bindir}/sphinx-build +%{_bindir}/sphinx-quickstart %files doc %doc html reST @@ -408,6 +418,7 @@ popd %changelog * Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 - Fix requirements of python2- subpackage +- Provide sphinx-*-{3.5,3} symlinks for each script * Tue Nov 24 2015 Julien Enselme - 1.3.1-1 - Update to 1.3.1 (#1136284) From bc5504a56773e19e88e5ac356f310be9507c0498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Nov 2015 16:55:37 -0500 Subject: [PATCH 052/234] Restore using python2 scripts by default sphinx imports code during, so sphinx-3 fails for python2-only projects. Back out this change for now, so it can be revisited later and dependent projects prepared. --- python-sphinx.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 1e35c7e..bca6609 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ Name: python-sphinx Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -119,6 +119,7 @@ Requires: python-mock Requires: python2-snowballstemmer Requires: python-sphinx_rtd_theme Requires: python2-six +Requires: python2-sphinx-theme-alabaster Obsoletes: python-sphinx = 1.2.3 %{?python_provide:%python_provide python2-sphinx} @@ -299,28 +300,23 @@ popd %install -# Must do the python2 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python3 version +# Must do the python3 install first because the scripts in /usr/bin are +# overwritten with every setup.py install (and we want the python2 version # to be the default for now). -%py2_install -for i in sphinx-{apidoc,autogen,build,quickstart}; do - mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} - ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 -%if 0%{?with_python3} == 0 - ln -s $i-2 %{buildroot}%{_bindir}/$i -%endif -done - - %if 0%{?with_python3} %py3_install for i in sphinx-{apidoc,autogen,build,quickstart}; do mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 - ln -s $i-3 %{buildroot}%{_bindir}/$i done %endif # with_python3 +%py2_install +for i in sphinx-{apidoc,autogen,build,quickstart}; do + mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} + ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 + ln -s $i-2 %{buildroot}%{_bindir}/$i +done pushd doc # Deliver man pages @@ -328,7 +324,7 @@ install -d %{buildroot}%{_mandir}/man1 mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ for f in %{buildroot}%{_mandir}/man1/sphinx-*.1; do - cp -p $f $(echo $f | sed -e "s|.1$|-%{python2_version}.1|") + cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|") done # Remove language files, they're identical to the ones from the @@ -386,7 +382,14 @@ popd %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* -%{_mandir}/man1/sphinx-*-%{python2_version}.1* +%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* +%{_mandir}/man1/* + +%{_bindir}/sphinx-apidoc +%{_bindir}/sphinx-autogen +%{_bindir}/sphinx-build +%{_bindir}/sphinx-quickstart + %if 0%{?with_python3} %files -n python3-sphinx-latex @@ -401,21 +404,18 @@ popd %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* -%exclude %{_mandir}/man1/sphinx-*-%{python2_version}.1* -%{_mandir}/man1/* +%{_mandir}/man1/sphinx-*-%{python3_version}.1* %endif # with_python3 -# This part falls into python2- when building without python3 -%{_bindir}/sphinx-apidoc -%{_bindir}/sphinx-autogen -%{_bindir}/sphinx-build -%{_bindir}/sphinx-quickstart %files doc %doc html reST %changelog +* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-3 +- Restore using python2 scripts by default (#1285535) + * Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 - Fix requirements of python2- subpackage - Provide sphinx-*-{3.5,3} symlinks for each script From a451501ba733b0127f25cd3b0d3115d8e1ebd6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Nov 2015 12:44:44 -0500 Subject: [PATCH 053/234] Obsolete napoleon extension --- python-sphinx.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index bca6609..153cd56 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ Name: python-sphinx Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -121,6 +121,8 @@ Requires: python-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Obsoletes: python-sphinx = 1.2.3 +Obsoletes: python-sphinxcontrib-napoleon < 0.3.0 +Provides: python-sphinxcontrib-napoleon = %{version}-%{release} %{?python_provide:%python_provide python2-sphinx} %description -n python2-%{upstream_name} @@ -194,6 +196,8 @@ Requires: python3-snowballstemmer Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster Requires: python3-six +Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 +Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} %description -n python3-sphinx @@ -413,6 +417,9 @@ popd %changelog +* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-4 +- Obsolete napoleon extension, it is now packaged with sphinx (#1286275) + * Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-3 - Restore using python2 scripts by default (#1285535) From c7b0a2a350779ac62cb9b48b8e7f9d29178651d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Nov 2015 13:13:31 -0500 Subject: [PATCH 054/234] Rename python2-Sphinx to python2-sphinx --- python-sphinx.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 153cd56..527727e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -109,7 +109,7 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package -n python2-%{upstream_name} +%package -n python2-sphinx Summary: Python documentation generator Requires: python-babel Requires: python-docutils @@ -123,9 +123,12 @@ Requires: python2-sphinx-theme-alabaster Obsoletes: python-sphinx = 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.3.0 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} +Obsoletes: python2-Sphinx <= 1.3.1-4 +Provides: python2-Sphinx = %{version}-%{release} %{?python_provide:%python_provide python2-sphinx} +Conflicts: python3-sphinx < %{version}-%{release} -%description -n python2-%{upstream_name} +%description -n python2-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 @@ -199,6 +202,8 @@ Requires: python3-six Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} +Conflicts: python2-Sphinx < %{version}-%{release} +Conflicts: python2-sphinx < %{version}-%{release} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -377,7 +382,7 @@ popd %files latex %license LICENSE -%files -f sphinx.lang -n python2-%{upstream_name} +%files -f sphinx.lang -n python2-sphinx %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-*-2* @@ -419,6 +424,9 @@ popd %changelog * Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 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 - 1.3.1-3 - Restore using python2 scripts by default (#1285535) From 16a3f9244ee4f8bf9328b5fc9cb347d7ca298bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Nov 2015 07:56:56 -0500 Subject: [PATCH 055/234] Bump napoleon version that is obsoleted Higher numbers might be needed in epel, so bump it high enough that the package is still obsoleted even if there are a few updates. --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 527727e..19dbfe5 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -121,7 +121,7 @@ Requires: python-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Obsoletes: python-sphinx = 1.2.3 -Obsoletes: python-sphinxcontrib-napoleon < 0.3.0 +Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} Obsoletes: python2-Sphinx <= 1.3.1-4 Provides: python2-Sphinx = %{version}-%{release} From f9d75a376306bc7e3888f4d1ae69881e209b0551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 20:59:50 +0000 Subject: [PATCH 056/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 19dbfe5..03be7a1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ Name: python-sphinx Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -422,6 +422,9 @@ popd %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-4 - Obsolete napoleon extension, it is now packaged with sphinx (#1286275) - Rename python2-Sphinx to python2-sphinx From bef3af321eb09a0f9f01b80f1f5e153cfcd58716 Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Sun, 3 Jul 2016 15:34:44 -0400 Subject: [PATCH 057/234] - Updated to 1.4.4 - Added python-sphinx-locale for common locale files --- .gitignore | 1 + python-sphinx.spec | 127 ++++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 104 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 7692fb5..e30f2a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Sphinx-1.2.3.tar.gz /Sphinx-1.3.1.tar.gz +/Sphinx-1.4.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 03be7a1..dc6053f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -7,8 +7,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.3.1 -Release: 5%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -19,20 +19,20 @@ Group: Development/Tools # jquery (MIT or GPLv2) License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx-doc.org/ -Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz Patch0: Sphinx-1.2.1-mantarget.patch -Patch1: html-parser-HTMLParserError-removed.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 -BuildRequires: python-babel -BuildRequires: python-setuptools +BuildRequires: python2-babel +BuildRequires: python2-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 BuildRequires: python-pygments >= 2.0 BuildRequires: python-six -BuildRequires: python-sphinx_rtd_theme +BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster +BuildRequires: python2-imagesize # for fixes BuildRequires: dos2unix @@ -41,14 +41,18 @@ BuildRequires: dos2unix BuildRequires: python-nose BuildRequires: gettext BuildRequires: texinfo +BuildRequires: graphviz BuildRequires: python-sqlalchemy -BuildRequires: python-mock +BuildRequires: python2-mock BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer # note: no Python3 xapian binding yet BuildRequires: xapian-bindings-python BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latex +BuildRequires: texlive-dvipng +BuildRequires: texlive-dvisvgm +BuildRequires: texlive-ucs BuildRequires: tex(cmap.sty) BuildRequires: tex(ecrm1000.tfm) BuildRequires: tex(fancybox.sty) @@ -60,7 +64,19 @@ BuildRequires: tex(titlesec.sty) BuildRequires: tex(threeparttable.sty) BuildRequires: tex(upquote.sty) BuildRequires: tex(wrapfig.sty) - +BuildRequires: tex(capt-of.sty) +BuildRequires: tex(needspace.sty) +BuildRequires: tex(eqparbox.sty) +BuildRequires: tex(amsmath.sty) +BuildRequires: tex(amsthm.sty) +BuildRequires: tex(amssymb.sty) +BuildRequires: tex(amsfonts.sty) +BuildRequires: tex(bm.sty) +BuildRequires: tex(palatino.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(eqparbox.sty) +BuildRequires: tex(atbegshi.sty) +BuildRequires: tex(anyfontsize.sty) %if 0%{?with_python3} BuildRequires: python3-devel @@ -77,6 +93,7 @@ BuildRequires: python3-snowballstemmer BuildRequires: python3-six BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-theme-alabaster +BuildRequires: python3-imagesize %endif # with_python3 @@ -111,16 +128,19 @@ the Python docs: %package -n python2-sphinx Summary: Python documentation generator -Requires: python-babel +Requires: python-sphinx-locale = %{version}-%{release} +Requires: python2-babel Requires: python-docutils Requires: python-jinja2 Requires: python-pygments -Requires: python-mock +Requires: python2-mock Requires: python2-snowballstemmer -Requires: python-sphinx_rtd_theme +Requires: python2-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster -Obsoletes: python-sphinx = 1.2.3 +Requires: python2-imagesize +Requires: graphviz +Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} Obsoletes: python2-Sphinx <= 1.3.1-4 @@ -162,6 +182,9 @@ Summary: LaTeX builder dependencies for %{name} Requires: %{name} = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex +Requires: texlive-dvipng +Requires: texlive-dvisvgm +Requires: texlive-ucs Requires: tex(cmap.sty) Requires: tex(ecrm1000.tfm) Requires: tex(fancybox.sty) @@ -173,6 +196,20 @@ Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) +Requires: tex(capt-of.sty) +Requires: tex(needspace.sty) +Requires: tex(eqparbox.sty) +Requires: tex(amsmath.sty) +Requires: tex(amsthm.sty) +Requires: tex(amssymb.sty) +Requires: tex(amsfonts.sty) +Requires: tex(bm.sty) +Requires: tex(palatino.sty) +Requires: tex(multirow.sty) +Requires: tex(eqparbox.sty) +Requires: tex(atbegshi.sty) +Requires: tex(anyfontsize.sty) + %description latex Sphinx is a tool that makes it easy to create intelligent and @@ -190,6 +227,7 @@ builder. %package -n python3-sphinx Summary: Python documentation generator Group: Development/Tools +Requires: python-sphinx-locale = %{version}-%{release} Requires: python3-babel Requires: python3-docutils Requires: python3-jinja2 @@ -198,7 +236,9 @@ Requires: python3-mock Requires: python3-snowballstemmer Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster +Requires: python3-imagesize Requires: python3-six +Requires: graphviz Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} @@ -238,6 +278,9 @@ Summary: LaTeX builder dependencies for %{name} Requires: python3-sphinx = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex +Requires: texlive-dvipng +Requires: texlive-dvisvgm +Requires: texlive-ucs Requires: tex(cmap.sty) Requires: tex(ecrm1000.tfm) Requires: tex(fancybox.sty) @@ -249,6 +292,19 @@ Requires: tex(titlesec.sty) Requires: tex(threeparttable.sty) Requires: tex(upquote.sty) Requires: tex(wrapfig.sty) +Requires: tex(capt-of.sty) +Requires: tex(needspace.sty) +Requires: tex(eqparbox.sty) +Requires: tex(amsmath.sty) +Requires: tex(amsthm.sty) +Requires: tex(amssymb.sty) +Requires: tex(amsfonts.sty) +Requires: tex(bm.sty) +Requires: tex(palatino.sty) +Requires: tex(multirow.sty) +Requires: tex(eqparbox.sty) +Requires: tex(atbegshi.sty) +Requires: tex(anyfontsize.sty) %description -n python3-sphinx-latex Sphinx is a tool that makes it easy to create intelligent and @@ -264,10 +320,10 @@ builder. %package doc -Summary: Documentation for %{name} -Group: Documentation -License: BSD -Requires: %{name} = %{version}-%{release} +Summary: Documentation for %{name} +Group: Documentation +License: BSD +Requires: %{name} = %{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -280,6 +336,22 @@ useful to many other projects. This package contains documentation in reST and HTML formats. +%package locale +Summary: Locale files for %{name} +Group: Development/Tools +License: BSD +Requires: %{name} = %{version}-%{release} + +%description locale +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 contains locale files for Sphinx + %prep %autosetup -n %{upstream_name}-%{version}%{?prerel} -p1 @@ -382,15 +454,18 @@ popd %files latex %license LICENSE -%files -f sphinx.lang -n python2-sphinx +%files locale -f sphinx.lang +%license LICENSE +%dir %{_datadir}/sphinx/ +%dir %{_datadir}/sphinx/locale +%dir %{_datadir}/sphinx/locale/* + +%files -n python2-sphinx %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-*-2* %{python2_sitelib}/sphinx/ %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ -%dir %{_datadir}/sphinx/ -%dir %{_datadir}/sphinx/locale -%dir %{_datadir}/sphinx/locale/* %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* @@ -404,15 +479,12 @@ popd %files -n python3-sphinx-latex %license LICENSE -%files -n python3-sphinx -f sphinx.lang +%files -n python3-sphinx %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-*-3* %{python3_sitelib}/sphinx/ %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ -%dir %{_datadir}/sphinx/ -%dir %{_datadir}/sphinx/locale -%dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-*-%{python3_version}.1* %endif # with_python3 @@ -422,6 +494,10 @@ popd %changelog +* Sun Jun 12 2016 Avram Lubkin - 1.4.4-1 +- Updated to 1.4.4 +- Added python-sphinx-locale for common locale files + * Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -641,3 +717,4 @@ Resolves: #1098109 * Thu Mar 27 2008 Michel Salim 0.1.61950-1 - Initial package + diff --git a/sources b/sources index 15f4f9a..2e4db67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8786a194acf9673464c5455b11fd4332 Sphinx-1.3.1.tar.gz +64ce2ec08d37ed56313a98232cbe2aee Sphinx-1.4.4.tar.gz From 0ce41f300cda2a5b695bc16af669dbe54537d599 Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Sun, 3 Jul 2016 15:47:41 -0400 Subject: [PATCH 058/234] - doc and locale no longer specifically require python2-sphinx - Colapsed python3-sphinx-latex into python-latex --- python-sphinx.spec | 66 ++++++++++------------------------------------ 1 file changed, 14 insertions(+), 52 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index dc6053f..9a3d2bd 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,7 +8,7 @@ Name: python-sphinx Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -145,6 +145,7 @@ Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} Obsoletes: python2-Sphinx <= 1.3.1-4 Provides: python2-Sphinx = %{version}-%{release} +Provides: python(Sphinx) = %{version}-%{release} %{?python_provide:%python_provide python2-sphinx} Conflicts: python3-sphinx < %{version}-%{release} @@ -179,7 +180,8 @@ the Python docs: %package latex Summary: LaTeX builder dependencies for %{name} -Requires: %{name} = %{version}-%{release} +Requires: python(Sphinx) = %{version}-%{release} +Recommends: %{name} = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex Requires: texlive-dvipng @@ -209,7 +211,7 @@ Requires: tex(multirow.sty) Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) - +Obsoletes: python3-sphinx-latex %description latex Sphinx is a tool that makes it easy to create intelligent and @@ -241,6 +243,7 @@ Requires: python3-six Requires: graphviz Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} +Provides: python(Sphinx) = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} Conflicts: python2-Sphinx < %{version}-%{release} Conflicts: python2-sphinx < %{version}-%{release} @@ -272,50 +275,6 @@ the Python docs: * 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 python3-sphinx-latex -Summary: LaTeX builder dependencies for %{name} -Requires: python3-sphinx = %{version}-%{release} -Requires: texlive-collection-fontsrecommended -Requires: texlive-collection-latex -Requires: texlive-dvipng -Requires: texlive-dvisvgm -Requires: texlive-ucs -Requires: tex(cmap.sty) -Requires: tex(ecrm1000.tfm) -Requires: tex(fancybox.sty) -Requires: tex(footnote.sty) -Requires: tex(framed.sty) -Requires: tex(multirow.sty) -Requires: tex(parskip.sty) -Requires: tex(titlesec.sty) -Requires: tex(threeparttable.sty) -Requires: tex(upquote.sty) -Requires: tex(wrapfig.sty) -Requires: tex(capt-of.sty) -Requires: tex(needspace.sty) -Requires: tex(eqparbox.sty) -Requires: tex(amsmath.sty) -Requires: tex(amsthm.sty) -Requires: tex(amssymb.sty) -Requires: tex(amsfonts.sty) -Requires: tex(bm.sty) -Requires: tex(palatino.sty) -Requires: tex(multirow.sty) -Requires: tex(eqparbox.sty) -Requires: tex(atbegshi.sty) -Requires: tex(anyfontsize.sty) - -%description -n python3-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. %endif # with_python3 @@ -323,7 +282,8 @@ builder. Summary: Documentation for %{name} Group: Documentation License: BSD -Requires: %{name} = %{version}-%{release} +Requires: python(Sphinx) = %{version}-%{release} +Recommends: %{name} = %{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -340,7 +300,8 @@ This package contains documentation in reST and HTML formats. Summary: Locale files for %{name} Group: Development/Tools License: BSD -Requires: %{name} = %{version}-%{release} +Requires: python(Sphinx) = %{version}-%{release} +Recommends: %{name} = %{version}-%{release} %description locale Sphinx is a tool that makes it easy to create intelligent and @@ -476,8 +437,6 @@ popd %if 0%{?with_python3} -%files -n python3-sphinx-latex -%license LICENSE %files -n python3-sphinx %license LICENSE @@ -494,6 +453,10 @@ popd %changelog +* Sun Jul 03 2016 Avram Lubkin - 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 - 1.4.4-1 - Updated to 1.4.4 - Added python-sphinx-locale for common locale files @@ -717,4 +680,3 @@ Resolves: #1098109 * Thu Mar 27 2008 Michel Salim 0.1.61950-1 - Initial package - From 6b1fa7ad66ddc8e25c66f83e952279a1a9df24b2 Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Fri, 12 Aug 2016 14:51:15 -0400 Subject: [PATCH 059/234] - 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) --- .gitignore | 1 + python-sphinx.spec | 78 ++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 63 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index e30f2a8..e1ec5c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /Sphinx-1.2.3.tar.gz /Sphinx-1.3.1.tar.gz /Sphinx-1.4.4.tar.gz +/Sphinx-1.4.5.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 9a3d2bd..6fc5432 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,9 +6,15 @@ %global upstream_name Sphinx +%if 0%{?fedora} > 24 +%global py3_alt_priority 500 +%else +%global py3_alt_priority 10 +%endif + Name: python-sphinx -Version: 1.4.4 -Release: 2%{?dist} +Version: 1.4.5 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -139,7 +145,9 @@ Requires: python2-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize -Requires: graphviz +Recommends: graphviz +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} @@ -181,7 +189,6 @@ the Python docs: %package latex Summary: LaTeX builder dependencies for %{name} Requires: python(Sphinx) = %{version}-%{release} -Recommends: %{name} = %{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex Requires: texlive-dvipng @@ -240,7 +247,9 @@ Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize Requires: python3-six -Requires: graphviz +Recommends: graphviz +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} Provides: python(Sphinx) = %{version}-%{release} @@ -283,7 +292,6 @@ Summary: Documentation for %{name} Group: Documentation License: BSD Requires: python(Sphinx) = %{version}-%{release} -Recommends: %{name} = %{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -300,8 +308,6 @@ This package contains documentation in reST and HTML formats. Summary: Locale files for %{name} Group: Development/Tools License: BSD -Requires: python(Sphinx) = %{version}-%{release} -Recommends: %{name} = %{version}-%{release} %description locale Sphinx is a tool that makes it easy to create intelligent and @@ -342,9 +348,6 @@ popd %install -# Must do the python3 install first because the scripts in /usr/bin are -# overwritten with every setup.py install (and we want the python2 version -# to be the default for now). %if 0%{?with_python3} %py3_install for i in sphinx-{apidoc,autogen,build,quickstart}; do @@ -357,7 +360,10 @@ done for i in sphinx-{apidoc,autogen,build,quickstart}; do mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 - ln -s $i-2 %{buildroot}%{_bindir}/$i +done + +for i in sphinx-{apidoc,autogen,build,quickstart}; do + touch %{buildroot}%{_bindir}/$i done pushd doc @@ -411,6 +417,33 @@ LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 +%post -n python2-sphinx +%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ + sphinx-build %{_bindir}/sphinx-build-%{python2_version} 100 \ + --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python2_version} \ + --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python2_version} \ + --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python2_version} + +%if 0%{?with_python3} +%post -n python3-sphinx +%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ + sphinx-build %{_bindir}/sphinx-build-%{python3_version} %{py3_alt_priority} \ + --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python3_version} \ + --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python3_version} \ + --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python3_version} +%endif # with_python3 + +%postun -n python2-sphinx +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} +fi + +%if 0%{?with_python3} +%postun -n python3-sphinx +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} +fi +%endif # with_python3 %files latex %license LICENSE @@ -430,11 +463,10 @@ popd %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* -%{_bindir}/sphinx-apidoc -%{_bindir}/sphinx-autogen -%{_bindir}/sphinx-build -%{_bindir}/sphinx-quickstart - +%ghost %{_bindir}/sphinx-apidoc +%ghost %{_bindir}/sphinx-autogen +%ghost %{_bindir}/sphinx-build +%ghost %{_bindir}/sphinx-quickstart %if 0%{?with_python3} @@ -446,6 +478,11 @@ popd %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ %{_mandir}/man1/sphinx-*-%{python3_version}.1* +%ghost %{_bindir}/sphinx-apidoc +%ghost %{_bindir}/sphinx-autogen +%ghost %{_bindir}/sphinx-build +%ghost %{_bindir}/sphinx-quickstart + %endif # with_python3 %files doc @@ -453,6 +490,13 @@ popd %changelog +* Fri Aug 12 2016 Avram Lubkin - 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 - 1.4.4-2 - doc and locale no longer specifically require python2-sphinx - Colapsed python3-sphinx-latex into python-latex diff --git a/sources b/sources index 2e4db67..ff39388 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64ce2ec08d37ed56313a98232cbe2aee Sphinx-1.4.4.tar.gz +5c2cd2dac45dfa6123d067e32a89e89a Sphinx-1.4.5.tar.gz From a2c5476ecca7b9e2c9707cf99a2bd480dcb3490c Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Fri, 2 Sep 2016 15:33:12 -0400 Subject: [PATCH 060/234] - Update to 1.4.6 (bz#1370810) - Fix unversioned Obsoletes - Add alternatives slaves for man pages --- .gitignore | 1 + python-sphinx.spec | 36 ++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e1ec5c7..ef33498 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Sphinx-1.3.1.tar.gz /Sphinx-1.4.4.tar.gz /Sphinx-1.4.5.tar.gz +/Sphinx-1.4.6.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 6fc5432..00bb95a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,7 +13,7 @@ %endif Name: python-sphinx -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: Python documentation generator @@ -218,7 +218,7 @@ Requires: tex(multirow.sty) Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) -Obsoletes: python3-sphinx-latex +Obsoletes: python3-sphinx-latex < 1.4.4-2 %description latex Sphinx is a tool that makes it easy to create intelligent and @@ -369,10 +369,10 @@ done pushd doc # Deliver man pages install -d %{buildroot}%{_mandir}/man1 -mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/ -for f in %{buildroot}%{_mandir}/man1/sphinx-*.1; +for f in _build/man/sphinx-*.1; do - cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|") + cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|") + cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|") done # Remove language files, they're identical to the ones from the @@ -422,7 +422,11 @@ popd sphinx-build %{_bindir}/sphinx-build-%{python2_version} 100 \ --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python2_version} \ --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python2_version} \ - --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python2_version} + --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python2_version} \ + --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python2_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python2_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python2_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python2_version}.1.gz %if 0%{?with_python3} %post -n python3-sphinx @@ -430,7 +434,11 @@ popd sphinx-build %{_bindir}/sphinx-build-%{python3_version} %{py3_alt_priority} \ --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python3_version} \ --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python3_version} \ - --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python3_version} + --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python3_version} \ + --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python3_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python3_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python3_version}.1.gz \ + --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python3_version}.1.gz %endif # with_python3 %postun -n python2-sphinx @@ -467,7 +475,10 @@ fi %ghost %{_bindir}/sphinx-autogen %ghost %{_bindir}/sphinx-build %ghost %{_bindir}/sphinx-quickstart - +%ghost %{_mandir}/man1/sphinx-all.1.gz +%ghost %{_mandir}/man1/sphinx-apidoc.1.gz +%ghost %{_mandir}/man1/sphinx-build.1.gz +%ghost %{_mandir}/man1/sphinx-quickstart.1.gz %if 0%{?with_python3} %files -n python3-sphinx @@ -482,6 +493,10 @@ fi %ghost %{_bindir}/sphinx-autogen %ghost %{_bindir}/sphinx-build %ghost %{_bindir}/sphinx-quickstart +%ghost %{_mandir}/man1/sphinx-all.1.gz +%ghost %{_mandir}/man1/sphinx-apidoc.1.gz +%ghost %{_mandir}/man1/sphinx-build.1.gz +%ghost %{_mandir}/man1/sphinx-quickstart.1.gz %endif # with_python3 @@ -490,6 +505,11 @@ fi %changelog +* Fri Sep 2 2016 Avram Lubkin - 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 - 1.4.5-1 - Update to 1.4.5 (bz#1356336) - Remove Recommends for latex, locale, and doc subpackages (bz#1366624) diff --git a/sources b/sources index ff39388..81d20ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c2cd2dac45dfa6123d067e32a89e89a Sphinx-1.4.5.tar.gz +e86658823b51296dbe6ebff5f58988c9 Sphinx-1.4.6.tar.gz From 9c436a4b96c0144b77f44b5e98a257a541356a3b Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Sun, 4 Sep 2016 14:20:26 -0400 Subject: [PATCH 061/234] Alternatives fails for man pages due to existing files --- python-sphinx.spec | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 00bb95a..72d4ba8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ Name: python-sphinx Version: 1.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -418,6 +418,16 @@ popd %endif # with_python3 %post -n python2-sphinx + +# Remove old versions of man pages so alternatives doesn't break +for manpage in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz +do + if [ ! -L $manpage ] + then + rm -f $manpage + fi +done + %{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ sphinx-build %{_bindir}/sphinx-build-%{python2_version} 100 \ --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python2_version} \ @@ -430,6 +440,16 @@ popd %if 0%{?with_python3} %post -n python3-sphinx + +# Remove old versions of man pages so alternatives doesn't break +for manpage in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz +do + if [ ! -L $manpage ] + then + rm -f $manpage + fi +done + %{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ sphinx-build %{_bindir}/sphinx-build-%{python3_version} %{py3_alt_priority} \ --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python3_version} \ @@ -505,6 +525,9 @@ fi %changelog +* Sun Sep 4 2016 Avram Lubkin - 1.4.6-2 +- Alternatives fails for man pages due to existing files + * Fri Sep 2 2016 Avram Lubkin - 1.4.6-1 - Update to 1.4.6 (bz#1370810) - Fix unversioned Obsoletes From 82066edb54f0f37df4ddade516c6a6537c0a354d Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Thu, 6 Oct 2016 13:48:36 -0400 Subject: [PATCH 062/234] - Update to 1.4.8 - Alternatives fails for scripts sometimes (bz#1382405) --- .gitignore | 1 + python-sphinx.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ef33498..79c42cf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Sphinx-1.4.4.tar.gz /Sphinx-1.4.5.tar.gz /Sphinx-1.4.6.tar.gz +/Sphinx-1.4.8.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 72d4ba8..6918265 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,8 +13,8 @@ %endif Name: python-sphinx -Version: 1.4.6 -Release: 2%{?dist} +Version: 1.4.8 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -419,12 +419,12 @@ popd %post -n python2-sphinx -# Remove old versions of man pages so alternatives doesn't break -for manpage in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz +# Remove old versions of files so alternatives doesn't break +for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart} do - if [ ! -L $manpage ] + if [ ! -L $filename ] then - rm -f $manpage + rm -f $filename fi done @@ -441,12 +441,12 @@ done %if 0%{?with_python3} %post -n python3-sphinx -# Remove old versions of man pages so alternatives doesn't break -for manpage in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz +# Remove old versions of files so alternatives doesn't break +for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart} do - if [ ! -L $manpage ] + if [ ! -L $filename ] then - rm -f $manpage + rm -f $filename fi done @@ -525,6 +525,10 @@ fi %changelog +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 +- Update to 1.4.8 +- Alternatives fails for scripts sometimes (bz#1382405) + * Sun Sep 4 2016 Avram Lubkin - 1.4.6-2 - Alternatives fails for man pages due to existing files diff --git a/sources b/sources index 81d20ca..48d0fe2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e86658823b51296dbe6ebff5f58988c9 Sphinx-1.4.6.tar.gz +5ec718a4855917e149498bba91b74e67 Sphinx-1.4.8.tar.gz From 80e09a56e7e9b931cfd9972cfc1fe4c540ab828c Mon Sep 17 00:00:00 2001 From: Avram Lubkin Date: Tue, 1 Nov 2016 14:07:08 -0400 Subject: [PATCH 063/234] Added tex(luatex85.sty) dependency to support TexLive 2016 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 6918265..8435d55 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ Name: python-sphinx Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -83,6 +83,7 @@ BuildRequires: tex(multirow.sty) BuildRequires: tex(eqparbox.sty) BuildRequires: tex(atbegshi.sty) BuildRequires: tex(anyfontsize.sty) +BuildRequires: tex(luatex85.sty) %if 0%{?with_python3} BuildRequires: python3-devel @@ -218,6 +219,7 @@ Requires: tex(multirow.sty) Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) +Requires: tex(luatex85.sty) Obsoletes: python3-sphinx-latex < 1.4.4-2 %description latex @@ -525,6 +527,9 @@ fi %changelog +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 +- Added tex(luatex85.sty) dependency to support TexLive 2016 + * Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 - Update to 1.4.8 - Alternatives fails for scripts sometimes (bz#1382405) From 3b323a1e7920b891c434a586309efb9cb1221733 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 12 Dec 2016 23:03:19 +0100 Subject: [PATCH 064/234] Rebuild for Python 3.6 Disable python3 tests for now --- python-sphinx.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 8435d55..890b95a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ Name: python-sphinx Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -87,7 +87,7 @@ BuildRequires: tex(luatex85.sty) %if 0%{?with_python3} BuildRequires: python3-devel -BuildRequires: python3-babel +#BuildRequires: python3-babel BuildRequires: python3-setuptools BuildRequires: python3-docutils BuildRequires: python3-jinja2 @@ -415,7 +415,7 @@ popd LANG=en_US.UTF-8 make test %if 0%{?with_python3} pushd %{py3dir} -LANG=en_US.UTF-8 PYTHON=python3 make test +#LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 @@ -527,6 +527,10 @@ fi %changelog +* Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 +- Rebuild for Python 3.6 +- Disable python3 tests for now + * Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 - Added tex(luatex85.sty) dependency to support TexLive 2016 From b45a413e6d500bf0612f350004cc7672d3831882 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 11:29:49 +0100 Subject: [PATCH 065/234] Update to 1.4.9 Enable python3 tests --- python-sphinx.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 890b95a..7ed2d16 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -13,8 +13,8 @@ %endif Name: python-sphinx -Version: 1.4.8 -Release: 3%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -26,7 +26,7 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx-doc.org/ Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -Patch0: Sphinx-1.2.1-mantarget.patch +#Patch0: Sphinx-1.2.1-mantarget.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -87,7 +87,7 @@ BuildRequires: tex(luatex85.sty) %if 0%{?with_python3} BuildRequires: python3-devel -#BuildRequires: python3-babel +BuildRequires: python3-babel BuildRequires: python3-setuptools BuildRequires: python3-docutils BuildRequires: python3-jinja2 @@ -415,7 +415,7 @@ popd LANG=en_US.UTF-8 make test %if 0%{?with_python3} pushd %{py3dir} -#LANG=en_US.UTF-8 PYTHON=python3 make test +LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 @@ -527,6 +527,10 @@ fi %changelog +* Tue Dec 13 2016 Charalampos Stratakis - 1.4.9-1 +- Update to 1.4.9 +- Enable python3 tests + * Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 - Rebuild for Python 3.6 - Disable python3 tests for now From e07792c3a5b3080c1d605034457e08f0cd0b8d9b Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 11:38:27 +0100 Subject: [PATCH 066/234] Upload sources for 1.4.9 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 79c42cf..0134fae 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Sphinx-1.4.5.tar.gz /Sphinx-1.4.6.tar.gz /Sphinx-1.4.8.tar.gz +/Sphinx-1.4.9.tar.gz diff --git a/sources b/sources index 48d0fe2..0eaf98a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ec718a4855917e149498bba91b74e67 Sphinx-1.4.8.tar.gz +SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156 From ad8724f17a9ca2881833f17ba256ae0ec981d26e Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 09:20:42 -0800 Subject: [PATCH 067/234] 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. --- python-sphinx.spec | 174 ++++++++++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 81 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7ed2d16..149a5e5 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,17 +4,18 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -%global upstream_name Sphinx - -%if 0%{?fedora} > 24 -%global py3_alt_priority 500 +# At some point, RHEL will need to be in here too +%if 0%{?fedora} && 0%{?fedora} > 24 +%global py3_default 1 %else -%global py3_alt_priority 10 +%global py3_default 0 %endif +%global upstream_name Sphinx + Name: python-sphinx Version: 1.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -26,6 +27,10 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx-doc.org/ Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +Source1: python2-sphinx +Source2: python3-sphinx +Source3: zz-modules-python-sphinx.sh +Source4: zz-modules-python-sphinx.csh #Patch0: Sphinx-1.2.1-mantarget.patch BuildArch: noarch @@ -39,6 +44,7 @@ BuildRequires: python-six BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize +BuildRequires: environment(modules) # for fixes BuildRequires: dos2unix @@ -146,9 +152,11 @@ Requires: python2-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize +Requires(posttrans): Lmod +# Needed to get rid of the alternatives config installed in f24 and f25 +# versions of the package +Requires(posttrans): /usr/sbin/alternatives Recommends: graphviz -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} @@ -250,8 +258,10 @@ Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize Requires: python3-six Recommends: graphviz -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(posttrans): Lmod +# Needed to get rid of the alternatives config installed in f24 and f25 +# versions of the package +Requires(posttrans): /usr/sbin/alternatives Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} Provides: python(Sphinx) = %{version}-%{release} @@ -352,20 +362,20 @@ popd %install %if 0%{?with_python3} %py3_install +install -d %{buildroot}%{_libexecdir}/python3-sphinx for i in sphinx-{apidoc,autogen,build,quickstart}; do mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 + ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i done %endif # with_python3 %py2_install +install -d %{buildroot}%{_libexecdir}/python2-sphinx for i in sphinx-{apidoc,autogen,build,quickstart}; do mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 -done - -for i in sphinx-{apidoc,autogen,build,quickstart}; do - touch %{buildroot}%{_bindir}/$i + ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i done pushd doc @@ -373,6 +383,9 @@ pushd doc install -d %{buildroot}%{_mandir}/man1 for f in _build/man/sphinx-*.1; do + ### TODO: these are all the same. Do we really need to ship them three + ### times or is it fine to just ship them as e.g. sphinx-build.1 + cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f) cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|") cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|") done @@ -402,6 +415,38 @@ do rm -rf sphinx/locale/$lang done popd + +install -d %{buildroot}%{_modulesdir}/python-sphinx +install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/ +sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx +install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/ +sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx +install -d %{buildroot}%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh +install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh + +%if %{py3_default} +ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default + +# These symlinks establish a default for when a package is first installed (and +# therefore, environment modules is not loaded). The user can immediately +# switch them by using module swap python-sphinx/python2-sphinx +for filename in sphinx-{build,apidoc,autogen,quickstart} ; do +ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename +done + +%else +ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default + +# These symlinks establish a default for when a package is first installed (and +# therefore, environment modules is not loaded). The user can immediately +# switch them by using module swap python-sphinx/python3-sphinx +for filename in sphinx-{build,apidoc,autogen,quickstart} ; do +ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename +done + +%endif + %find_lang sphinx # Language files; Since these are javascript, it's not immediately obvious to @@ -419,61 +464,19 @@ LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 -%post -n python2-sphinx -# Remove old versions of files so alternatives doesn't break -for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart} -do - if [ ! -L $filename ] - then - rm -f $filename - fi -done - -%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ - sphinx-build %{_bindir}/sphinx-build-%{python2_version} 100 \ - --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python2_version} \ - --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python2_version} \ - --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python2_version} \ - --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python2_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python2_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python2_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python2_version}.1.gz +%pre -n python2-sphinx +# python-sphinx as shipped in an update to f24 and f25 used alternatives. So +# we need to clean up the alternatives configuration until at least f27 +%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || : %if 0%{?with_python3} -%post -n python3-sphinx - -# Remove old versions of files so alternatives doesn't break -for filename in %{_mandir}/man1/sphinx-{all,apidoc,build,quickstart}.1.gz %{_bindir}/sphinx-{build,apidoc,autogen,quickstart} -do - if [ ! -L $filename ] - then - rm -f $filename - fi -done - -%{_sbindir}/update-alternatives --install %{_bindir}/sphinx-build \ - sphinx-build %{_bindir}/sphinx-build-%{python3_version} %{py3_alt_priority} \ - --slave %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{python3_version} \ - --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python3_version} \ - --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python3_version} \ - --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{python3_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{python3_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{python3_version}.1.gz \ - --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{python3_version}.1.gz +%pre -n python3-sphinx +# python-sphinx as shipped in an update to f24 and f25 used alternatives. So +# we need to clean up the alternatives configuration until at least f27 +%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || : %endif # with_python3 -%postun -n python2-sphinx -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} -fi - -%if 0%{?with_python3} -%postun -n python3-sphinx -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} -fi -%endif # with_python3 %files latex %license LICENSE @@ -492,33 +495,34 @@ fi %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* %{_mandir}/man1/* +%{_libexecdir}/python2-sphinx/ +%{_modulesdir}/python-sphinx/python2-sphinx +%if !%{py3_default} +%{_modulesdir}/python-sphinx/default +%endif +%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh +%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh -%ghost %{_bindir}/sphinx-apidoc -%ghost %{_bindir}/sphinx-autogen -%ghost %{_bindir}/sphinx-build -%ghost %{_bindir}/sphinx-quickstart -%ghost %{_mandir}/man1/sphinx-all.1.gz -%ghost %{_mandir}/man1/sphinx-apidoc.1.gz -%ghost %{_mandir}/man1/sphinx-build.1.gz -%ghost %{_mandir}/man1/sphinx-quickstart.1.gz %if 0%{?with_python3} %files -n python3-sphinx %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-*-3* +%{_bindir}/sphinx-build +%{_bindir}/sphinx-apidoc +%{_bindir}/sphinx-autogen +%{_bindir}/sphinx-quickstart %{python3_sitelib}/sphinx/ %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ %{_mandir}/man1/sphinx-*-%{python3_version}.1* - -%ghost %{_bindir}/sphinx-apidoc -%ghost %{_bindir}/sphinx-autogen -%ghost %{_bindir}/sphinx-build -%ghost %{_bindir}/sphinx-quickstart -%ghost %{_mandir}/man1/sphinx-all.1.gz -%ghost %{_mandir}/man1/sphinx-apidoc.1.gz -%ghost %{_mandir}/man1/sphinx-build.1.gz -%ghost %{_mandir}/man1/sphinx-quickstart.1.gz +%{_libexecdir}/python3-sphinx/ +%{_modulesdir}/python-sphinx/python3-sphinx +%if %{py3_default} +%{_modulesdir}/python-sphinx/default +%endif +%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh +%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh %endif # with_python3 @@ -527,6 +531,14 @@ fi %changelog +* Fri Dec 30 2016 Toshio Kuratomi - 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 - 1.4.9-1 - Update to 1.4.9 - Enable python3 tests From 68944a5bb0c5f390b99b0389e7a809adb6c4032f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 12:46:55 -0800 Subject: [PATCH 068/234] Add environment-module related files --- python2-sphinx | 6 ++++++ python3-sphinx | 6 ++++++ zz-modules-python-sphinx.csh | 2 ++ zz-modules-python-sphinx.sh | 2 ++ 4 files changed, 16 insertions(+) create mode 100644 python2-sphinx create mode 100644 python3-sphinx create mode 100644 zz-modules-python-sphinx.csh create mode 100644 zz-modules-python-sphinx.sh diff --git a/python2-sphinx b/python2-sphinx new file mode 100644 index 0000000..e015ae6 --- /dev/null +++ b/python2-sphinx @@ -0,0 +1,6 @@ +#%Module 1.0 +# +# python2-sphinx module for use with 'environment modules' package +# +conflict python-sphinx +prepend-path PATH @python2_sphinx_dir@ diff --git a/python3-sphinx b/python3-sphinx new file mode 100644 index 0000000..6d79fad --- /dev/null +++ b/python3-sphinx @@ -0,0 +1,6 @@ +#%Module 1.0 +# +# python2-sphinx module for use with 'environment modules' package +# +conflict python-sphinx +prepend-path PATH @python3_sphinx_dir@ diff --git a/zz-modules-python-sphinx.csh b/zz-modules-python-sphinx.csh new file mode 100644 index 0000000..a0bc0b8 --- /dev/null +++ b/zz-modules-python-sphinx.csh @@ -0,0 +1,2 @@ +# Add path to the default python-sphinx scripts on this version of Fedora +module load python-sphinx diff --git a/zz-modules-python-sphinx.sh b/zz-modules-python-sphinx.sh new file mode 100644 index 0000000..a0bc0b8 --- /dev/null +++ b/zz-modules-python-sphinx.sh @@ -0,0 +1,2 @@ +# Add path to the default python-sphinx scripts on this version of Fedora +module load python-sphinx From c7292271234c240d5c4fff4ed010cb12db4c53c0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 30 Dec 2016 15:10:00 -0700 Subject: [PATCH 069/234] Update to 1.5.1 --- .gitignore | 1 + python-sphinx-xapian.patch | 34 ++++++++++++++++++++++++++++++++++ python-sphinx.spec | 10 ++++++++-- sources | 2 +- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 python-sphinx-xapian.patch diff --git a/.gitignore b/.gitignore index 0134fae..42c3bfb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Sphinx-1.4.6.tar.gz /Sphinx-1.4.8.tar.gz /Sphinx-1.4.9.tar.gz +/Sphinx-1.5.1.tar.gz diff --git a/python-sphinx-xapian.patch b/python-sphinx-xapian.patch new file mode 100644 index 0000000..d21b807 --- /dev/null +++ b/python-sphinx-xapian.patch @@ -0,0 +1,34 @@ +From cf795894b9290c5ab2035ae21535f0a7f4b7107a Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +Date: Fri, 16 Dec 2016 19:44:27 +0900 +Subject: [PATCH] Fix #3246: xapian search adapter crashes + +--- + CHANGES | 2 ++ + sphinx/websupport/search/xapiansearch.py | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py +index 1e43dcb..aa7cff8 100644 +--- a/sphinx/websupport/search/xapiansearch.py ++++ b/sphinx/websupport/search/xapiansearch.py +@@ -39,16 +39,16 @@ def finish_indexing(self): + # Ensure the db lock is removed. + del self.database + +- def add_document(self, path, title, text): ++ def add_document(self, pagename, filename, title, text): + self.database.begin_transaction() + # sphinx_page_path is used to easily retrieve documents by path. +- sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_') ++ sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_') + # Delete the old document if it exists. + self.database.delete_document(sphinx_page_path) + + doc = xapian.Document() + doc.set_data(text) +- doc.add_value(self.DOC_PATH, path) ++ doc.add_value(self.DOC_PATH, pagename) + doc.add_value(self.DOC_TITLE, title) + self.indexer.set_document(doc) + self.indexer.index_text(text) diff --git a/python-sphinx.spec b/python-sphinx.spec index 149a5e5..9f5c707 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.4.9 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -32,6 +32,9 @@ Source2: python3-sphinx Source3: zz-modules-python-sphinx.sh Source4: zz-modules-python-sphinx.csh #Patch0: Sphinx-1.2.1-mantarget.patch +# Upstream fix for xapian 1.4 +# https://github.com/sphinx-doc/sphinx/commit/cf795894b9290c5ab2035ae21535f0a7f4b7107a +Patch1: python-sphinx-xapian.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -531,6 +534,9 @@ popd %changelog +* Fri Dec 30 2016 Orion Poplawski - 1.5.1-1 +- Update to 1.5.1 + * Fri Dec 30 2016 Toshio Kuratomi - 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 diff --git a/sources b/sources index 0eaf98a..4dcb0d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156 +SHA512 (Sphinx-1.5.1.tar.gz) = ec06998921663c0e01096743c7908131b6173ace42373eea8a95a3e24706db119eaf3eb096a70e12ecb5a4a135ee599abdf36c53f786bd392a32fdad45438794 From cc11c8ff898018e4dfacc4cdde5463040bfe3cf9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 30 Dec 2016 16:10:25 -0700 Subject: [PATCH 070/234] Add BR/R on python-requests --- python-sphinx.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9f5c707..e3fb747 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -47,6 +47,7 @@ BuildRequires: python-six BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize +BuildRequires: python2-requests BuildRequires: environment(modules) # for fixes @@ -110,6 +111,7 @@ BuildRequires: python3-six BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-theme-alabaster BuildRequires: python3-imagesize +BuildRequires: python3-requests %endif # with_python3 @@ -155,6 +157,7 @@ Requires: python2-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize +Requires: python2-requests Requires(posttrans): Lmod # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package @@ -259,6 +262,7 @@ Requires: python3-snowballstemmer Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize +Requires: python3-requests Requires: python3-six Recommends: graphviz Requires(posttrans): Lmod From b6f4a595f7f96b87c035ab5066ceaa100572ab11 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 30 Dec 2016 16:28:03 -0700 Subject: [PATCH 071/234] Add needed BRs for testing --- python-sphinx.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index e3fb747..77511b9 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -60,6 +60,8 @@ BuildRequires: texinfo BuildRequires: graphviz BuildRequires: python-sqlalchemy BuildRequires: python2-mock +BuildRequires: python2-simplejson +BuildRequires: python-html5lib BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer # note: no Python3 xapian binding yet @@ -105,6 +107,8 @@ BuildRequires: python3-pygments BuildRequires: python3-nose BuildRequires: python3-sqlalchemy BuildRequires: python3-mock +BuildRequires: python3-simplejson +BuildRequires: python3-html5lib BuildRequires: python3-whoosh BuildRequires: python3-snowballstemmer BuildRequires: python3-six From 79d38f37ff6edd4a604ff25a52e349362035226f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 22:12:24 -0800 Subject: [PATCH 072/234] rpmlint fixes to python-sphinx spec file --- python-sphinx.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 77511b9..444cf45 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -406,6 +406,12 @@ done find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \; popd +# Clean up non-python files +rm -f %{buildroot}%{python2_sitelib}/sphinx/locale/.DS_Store +rm -rf %{buildroot}%{python2_sitelib}/sphinx/locale/.tx +rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store +rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx + # Deliver rst files rm -rf doc/_build sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile @@ -511,8 +517,8 @@ popd %if !%{py3_default} %{_modulesdir}/python-sphinx/default %endif -%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh -%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh +%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh +%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh %if 0%{?with_python3} @@ -532,8 +538,8 @@ popd %if %{py3_default} %{_modulesdir}/python-sphinx/default %endif -%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh -%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh +%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh +%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh %endif # with_python3 From 93a4ba510a86e5cf34b00319edfba2e93952d3b2 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 22:22:40 -0800 Subject: [PATCH 073/234] Fix test_build_latex tests by adding more texlive packages as Requires/BuildRequires --- python-sphinx.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 444cf45..7f5719d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -96,6 +96,9 @@ BuildRequires: tex(eqparbox.sty) BuildRequires: tex(atbegshi.sty) BuildRequires: tex(anyfontsize.sty) BuildRequires: tex(luatex85.sty) +BuildRequires: tex(fncychp.sty) +BuildRequires: tex(tabulary.sty) +BuildRequires: tex(polyglossia.sty) %if 0%{?with_python3} BuildRequires: python3-devel @@ -238,6 +241,9 @@ Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) Requires: tex(luatex85.sty) +Requires: tex(fncychp.sty) +Requires: tex(tabulary.sty) +Requires: tex(polyglossia.sty) Obsoletes: python3-sphinx-latex < 1.4.4-2 %description latex From 2f352b47f7f0b6937c6a07a375cb628a65c59f99 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 22:35:04 -0800 Subject: [PATCH 074/234] Disable linkcheck tests as they hit the network --- python-sphinx.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7f5719d..c4b6525 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -480,9 +480,15 @@ done %check +# Currently, all linkcheck tests hit external websites. Since network access +# is disabled in koji, we have to disable these. +rm tests/test_build_linkcheck.py LANG=en_US.UTF-8 make test %if 0%{?with_python3} pushd %{py3dir} +# Currently, all linkcheck tests hit external websites. Since network access +# is disabled in koji, we have to disable these. +rm tests/test_build_linkcheck.py LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 From 1a1466a96e6877f0373f4afc4c521f3e80b07e7e Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 22:58:18 -0800 Subject: [PATCH 075/234] Fix typo in one texlive dep --- python-sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c4b6525..09099bf 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -96,7 +96,7 @@ BuildRequires: tex(eqparbox.sty) BuildRequires: tex(atbegshi.sty) BuildRequires: tex(anyfontsize.sty) BuildRequires: tex(luatex85.sty) -BuildRequires: tex(fncychp.sty) +BuildRequires: tex(fncychap.sty) BuildRequires: tex(tabulary.sty) BuildRequires: tex(polyglossia.sty) @@ -241,7 +241,7 @@ Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) Requires: tex(luatex85.sty) -Requires: tex(fncychp.sty) +Requires: tex(fncychap.sty) Requires: tex(tabulary.sty) Requires: tex(polyglossia.sty) Obsoletes: python3-sphinx-latex < 1.4.4-2 From 4944f766cdebefe580d445981e314110bf73e30d Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 30 Dec 2016 23:57:27 -0800 Subject: [PATCH 076/234] One more texlive dep --- python-sphinx.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 09099bf..8c29f88 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -99,6 +99,7 @@ BuildRequires: tex(luatex85.sty) BuildRequires: tex(fncychap.sty) BuildRequires: tex(tabulary.sty) BuildRequires: tex(polyglossia.sty) +BuildRequires: tex(eu1enc.def) %if 0%{?with_python3} BuildRequires: python3-devel @@ -244,6 +245,7 @@ Requires: tex(luatex85.sty) Requires: tex(fncychap.sty) Requires: tex(tabulary.sty) Requires: tex(polyglossia.sty) +Requires: tex(eu1enc.def) Obsoletes: python3-sphinx-latex < 1.4.4-2 %description latex From fa7e4f510bfb46af9fd23ff2c063b75ab6e9fe5f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 18 Jan 2017 22:12:32 -0800 Subject: [PATCH 077/234] 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. --- README.fedora | 17 +++++++++++++++++ python-sphinx.spec | 35 +++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 README.fedora diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..15a28e7 --- /dev/null +++ b/README.fedora @@ -0,0 +1,17 @@ +Sphinx with autodoc is sensitive to whether it is run via Python2 or Python3 +as it uses the Python version that it is invoked with to parse the source +files for docstrings. Unfortunately, there's no logic to detect this within +the sphinx commands and the standard Makefiles generated by sphinx-quickstart +don't give the user any hint that it might be a problem. + +The Fedora package tries to mitigate this problem by allowing the user to +switch between the Python2 and Python3 versions using environment-modules. To +switch to the Python3 commands, use:: + + module swap python-sphinx/python3-sphinx + +To switch to the Python2 version, use:: + + module swap python-sphinx/python2-sphinx + +The default install uses the python3 version of the modules. diff --git a/python-sphinx.spec b/python-sphinx.spec index 8c29f88..937232a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,18 +4,18 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -# At some point, RHEL will need to be in here too -%if 0%{?fedora} && 0%{?fedora} > 24 -%global py3_default 1 -%else +# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming +%if 1 %global py3_default 0 +%else +%global py3_default 1 %endif %global upstream_name Sphinx Name: python-sphinx Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -31,6 +31,7 @@ Source1: python2-sphinx Source2: python3-sphinx Source3: zz-modules-python-sphinx.sh Source4: zz-modules-python-sphinx.csh +Source5: README.fedora #Patch0: Sphinx-1.2.1-mantarget.patch # Upstream fix for xapian 1.4 # https://github.com/sphinx-doc/sphinx/commit/cf795894b9290c5ab2035ae21535f0a7f4b7107a @@ -166,10 +167,10 @@ Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize Requires: python2-requests -Requires(posttrans): Lmod +Requires: environment(modules) # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package -Requires(posttrans): /usr/sbin/alternatives +Requires(pre): /usr/sbin/alternatives Recommends: graphviz Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 @@ -277,16 +278,15 @@ Requires: python3-imagesize Requires: python3-requests Requires: python3-six Recommends: graphviz -Requires(posttrans): Lmod +Requires: environment(modules) # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package -Requires(posttrans): /usr/sbin/alternatives +Requires(pre): /usr/sbin/alternatives Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} Provides: python(Sphinx) = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} Conflicts: python2-Sphinx < %{version}-%{release} -Conflicts: python2-sphinx < %{version}-%{release} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -353,6 +353,8 @@ This package contains locale files for Sphinx %prep %autosetup -n %{upstream_name}-%{version}%{?prerel} -p1 +cp %{SOURCE5} . + sed '1d' -i sphinx/pycode/pgen2/token.py # fix line encoding of bundled jquery.js @@ -457,7 +459,7 @@ ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default # therefore, environment modules is not loaded). The user can immediately # switch them by using module swap python-sphinx/python2-sphinx for filename in sphinx-{build,apidoc,autogen,quickstart} ; do -ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename + ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename done %else @@ -467,7 +469,7 @@ ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default # therefore, environment modules is not loaded). The user can immediately # switch them by using module swap python-sphinx/python3-sphinx for filename in sphinx-{build,apidoc,autogen,quickstart} ; do -ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename + ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename done %endif @@ -520,7 +522,7 @@ popd %files -n python2-sphinx %license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst +%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora %{_bindir}/sphinx-*-2* %{python2_sitelib}/sphinx/ %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ @@ -538,7 +540,7 @@ popd %files -n python3-sphinx %license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst +%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora %{_bindir}/sphinx-*-3* %{_bindir}/sphinx-build %{_bindir}/sphinx-apidoc @@ -562,6 +564,11 @@ popd %changelog +* Wed Jan 18 2017 Toshio Kuratomi - - 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 - 1.5.1-1 - Update to 1.5.1 From baaecbbb4aaae27da41ad7738786e07b01fbec79 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 18 Jan 2017 22:39:26 -0800 Subject: [PATCH 078/234] Move the unversioned executables into the python2 package as they are now using python2 to run --- python-sphinx.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 937232a..b587085 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -524,6 +524,10 @@ popd %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst README.fedora %{_bindir}/sphinx-*-2* +%{_bindir}/sphinx-build +%{_bindir}/sphinx-apidoc +%{_bindir}/sphinx-autogen +%{_bindir}/sphinx-quickstart %{python2_sitelib}/sphinx/ %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* @@ -542,10 +546,6 @@ popd %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst README.fedora %{_bindir}/sphinx-*-3* -%{_bindir}/sphinx-build -%{_bindir}/sphinx-apidoc -%{_bindir}/sphinx-autogen -%{_bindir}/sphinx-quickstart %{python3_sitelib}/sphinx/ %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ %{_mandir}/man1/sphinx-*-%{python3_version}.1* @@ -564,6 +564,10 @@ popd %changelog +* Wed Jan 18 2017 Toshio Kuratomi - - 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 - - 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 From 74b3a560b8da073f7b17eb2d375bb360972d5841 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 26 Jan 2017 18:13:59 -0800 Subject: [PATCH 079/234] Add recipe for setting the system default to the README.fedora --- README.fedora | 12 +++++++++++- python-sphinx.spec | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.fedora b/README.fedora index 15a28e7..67dac5c 100644 --- a/README.fedora +++ b/README.fedora @@ -14,4 +14,14 @@ To switch to the Python2 version, use:: module swap python-sphinx/python2-sphinx -The default install uses the python3 version of the modules. +The default install uses the python2 version of the modules. +If the system administrator wishes to change the default, edit the +/etc/profile.d/zz-modules-python-sphinx.sh and +/etc/profile.d/zz-modules-python-sphinx.csh files to specify a specific +alternative to use. For instance, to make the python3 version the default, +modify it like so:: + + @@ -1,2 +1,2 @@ + # Add path to the default python-sphinx scripts on this version of Fedora + -module load python-sphinx + +module load python-sphinx/python3-sphinx diff --git a/python-sphinx.spec b/python-sphinx.spec index b587085..3c38dd8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -564,6 +564,9 @@ popd %changelog +* Thu Jan 26 2017 Toshio Kuratomi - - 1.5.1-4 +- Add recipe for setting the system default to the README.fedora + * Wed Jan 18 2017 Toshio Kuratomi - - 1.5.1-3 - Move the unversioned executables into the python2 package as they are now using python2 to run From ea98c3de4b7cadb7bba9d1dbe373c37c393baec8 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 31 Jan 2017 11:52:19 -0800 Subject: [PATCH 080/234] 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. --- default-sphinx-command.in | 2 ++ python-sphinx.spec | 22 +++++++++++++++++----- zz-modules-python-sphinx.csh | 2 +- zz-modules-python-sphinx.sh | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 default-sphinx-command.in diff --git a/default-sphinx-command.in b/default-sphinx-command.in new file mode 100644 index 0000000..c933d75 --- /dev/null +++ b/default-sphinx-command.in @@ -0,0 +1,2 @@ +#%Module1.0 +set ModuleVersion "python@PYTHONVER@-sphinx" diff --git a/python-sphinx.spec b/python-sphinx.spec index 3c38dd8..4a62161 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -32,6 +32,9 @@ Source2: python3-sphinx Source3: zz-modules-python-sphinx.sh Source4: zz-modules-python-sphinx.csh Source5: README.fedora +# environment-modules file to select whether the py2 or py3 version of +# python-sphinx execuitables is default +Source6: default-sphinx-command.in #Patch0: Sphinx-1.2.1-mantarget.patch # Upstream fix for xapian 1.4 # https://github.com/sphinx-doc/sphinx/commit/cf795894b9290c5ab2035ae21535f0a7f4b7107a @@ -453,7 +456,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-pytho install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh %if %{py3_default} -ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default +sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version # These symlinks establish a default for when a package is first installed (and # therefore, environment modules is not loaded). The user can immediately @@ -463,7 +466,7 @@ for filename in sphinx-{build,apidoc,autogen,quickstart} ; do done %else -ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default +sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version # These symlinks establish a default for when a package is first installed (and # therefore, environment modules is not loaded). The user can immediately @@ -535,7 +538,7 @@ popd %{_libexecdir}/python2-sphinx/ %{_modulesdir}/python-sphinx/python2-sphinx %if !%{py3_default} -%{_modulesdir}/python-sphinx/default +%{_modulesdir}/python-sphinx/.version %endif %config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh %config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh @@ -552,7 +555,7 @@ popd %{_libexecdir}/python3-sphinx/ %{_modulesdir}/python-sphinx/python3-sphinx %if %{py3_default} -%{_modulesdir}/python-sphinx/default +%{_modulesdir}/python-sphinx/.version %endif %config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh %config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh @@ -564,6 +567,15 @@ popd %changelog +* Tue Jan 31 2017 Toshio Kuratomi - - 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 - - 1.5.1-4 - Add recipe for setting the system default to the README.fedora diff --git a/zz-modules-python-sphinx.csh b/zz-modules-python-sphinx.csh index a0bc0b8..d85799f 100644 --- a/zz-modules-python-sphinx.csh +++ b/zz-modules-python-sphinx.csh @@ -1,2 +1,2 @@ # Add path to the default python-sphinx scripts on this version of Fedora -module load python-sphinx +module load python-sphinx >& /dev/null diff --git a/zz-modules-python-sphinx.sh b/zz-modules-python-sphinx.sh index a0bc0b8..af36d40 100644 --- a/zz-modules-python-sphinx.sh +++ b/zz-modules-python-sphinx.sh @@ -1,2 +1,2 @@ # Add path to the default python-sphinx scripts on this version of Fedora -module load python-sphinx +module load python-sphinx 2> /dev/null From 9ea173bb1e9734dad36359dd4b3744f51846ad60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 10:32:17 +0000 Subject: [PATCH 081/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4a62161..9288181 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -567,6 +567,9 @@ popd %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 31 2017 Toshio Kuratomi - - 1.5.1-5 - environment-modules is less featureful than Lmod. - Select the default version in a different way since environment-modules From 5bf198167c9bb5a0b1d3c493d40e7501a68bfa53 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 17 Feb 2017 07:57:59 -0800 Subject: [PATCH 082/234] Update to 1.5.2 Remove a few latex dependencies that are no longer needed --- python-sphinx.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9288181..f0f4791 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.5.1 -Release: 6%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -77,7 +77,6 @@ BuildRequires: texlive-dvisvgm BuildRequires: texlive-ucs BuildRequires: tex(cmap.sty) BuildRequires: tex(ecrm1000.tfm) -BuildRequires: tex(fancybox.sty) BuildRequires: tex(footnote.sty) BuildRequires: tex(framed.sty) BuildRequires: tex(multirow.sty) @@ -223,7 +222,6 @@ Requires: texlive-dvisvgm Requires: texlive-ucs Requires: tex(cmap.sty) Requires: tex(ecrm1000.tfm) -Requires: tex(fancybox.sty) Requires: tex(footnote.sty) Requires: tex(framed.sty) Requires: tex(multirow.sty) @@ -567,6 +565,10 @@ popd %changelog +* Fri Feb 17 2017 Toshio Kuratomi - - 1.5.2-1 +- Update to 1.5.2 +- Remove a few latex dependencies that are no longer needed + * Sat Feb 11 2017 Fedora Release Engineering - 1.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 145cab2c327ae0aa3fb1204c47d455891ab2045a Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 17 Feb 2017 08:28:24 -0800 Subject: [PATCH 083/234] Remember to update the source tarball as well --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 42c3bfb..5a4a63b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /Sphinx-1.4.8.tar.gz /Sphinx-1.4.9.tar.gz /Sphinx-1.5.1.tar.gz +/Sphinx-1.5.2.tar.gz diff --git a/sources b/sources index 4dcb0d5..a6650e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.5.1.tar.gz) = ec06998921663c0e01096743c7908131b6173ace42373eea8a95a3e24706db119eaf3eb096a70e12ecb5a4a135ee599abdf36c53f786bd392a32fdad45438794 +SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88 From b5d98f0f4d15b707fa0e28ec784e239c0d7e8670 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 17 Feb 2017 08:52:07 -0800 Subject: [PATCH 084/234] Xapian patch no longer needed --- python-sphinx.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index f0f4791..f1d025d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -35,10 +35,6 @@ Source5: README.fedora # environment-modules file to select whether the py2 or py3 version of # python-sphinx execuitables is default Source6: default-sphinx-command.in -#Patch0: Sphinx-1.2.1-mantarget.patch -# Upstream fix for xapian 1.4 -# https://github.com/sphinx-doc/sphinx/commit/cf795894b9290c5ab2035ae21535f0a7f4b7107a -Patch1: python-sphinx-xapian.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -568,6 +564,7 @@ popd * Fri Feb 17 2017 Toshio Kuratomi - - 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 - 1.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f73229b3b1fb401947f46b29bce740f6bc4e74ab Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 17 Feb 2017 09:33:29 -0800 Subject: [PATCH 085/234] Add more buildrequires for tests --- python-sphinx.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index f1d025d..b47d41d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -55,6 +55,8 @@ BuildRequires: dos2unix # for testing BuildRequires: python-nose +BuildRequires: python2-pytest +BuildRequires: python-pytest-cov BuildRequires: gettext BuildRequires: texinfo BuildRequires: graphviz @@ -64,6 +66,7 @@ BuildRequires: python2-simplejson BuildRequires: python-html5lib BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer +BuildRequires: python-enum34 # note: no Python3 xapian binding yet BuildRequires: xapian-bindings-python BuildRequires: texlive-collection-fontsrecommended @@ -108,6 +111,8 @@ BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-pygments BuildRequires: python3-nose +BuildRequires: python3-pytest +BuildRequires: python3-pytest-cov BuildRequires: python3-sqlalchemy BuildRequires: python3-mock BuildRequires: python3-simplejson From ffb77c7ed3c6c36b414966d71e5a1021c0b2fce7 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sat, 18 Feb 2017 10:02:44 -0800 Subject: [PATCH 086/234] Cleanup source files that should not be installed Fix the __init__.pyc that was byte compiled for the wrong python --- python-sphinx.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b47d41d..1857edb 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -362,6 +362,10 @@ sed '1d' -i sphinx/pycode/pgen2/token.py # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js +# In 1.5.2, the upstream tarball left this .pyc by mistake. +# Remove it so that it doesn't get included in the python3 build by mistake +rm sphinx/locale/__init__.pyc + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -391,6 +395,12 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i done + +# These appear to be incomplete C extensions to speed up parsing. They are not +# built by setup.py yet. Removing them in %%install so that if sphinx does +# make use of them, and we don't notice, we only remove these source files +# after the build has created the .so's +rm %{builddir}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} %endif # with_python3 %py2_install @@ -401,6 +411,12 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i done +# These appear to be incomplete C extensions to speed up parsing. They are not +# built by setup.py yet. Removing them in %%install so that if sphinx does +# make use of them, and we don't notice, we only remove these source files +# after the build has created the .so's +rm %{builddir}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} + pushd doc # Deliver man pages install -d %{buildroot}%{_mandir}/man1 @@ -566,6 +582,10 @@ popd %changelog +* Sat Feb 18 2017 Toshio Kuratomi - - 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 - - 1.5.2-1 - Update to 1.5.2 - Remove a few latex dependencies that are no longer needed From 43596e57313d7162da6ad63f3ba9391130a377c0 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Sat, 18 Feb 2017 10:10:48 -0800 Subject: [PATCH 087/234] builddir => buildroot --- python-sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 1857edb..c37da2b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -400,7 +400,7 @@ done # built by setup.py yet. Removing them in %%install so that if sphinx does # make use of them, and we don't notice, we only remove these source files # after the build has created the .so's -rm %{builddir}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} +rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} %endif # with_python3 %py2_install @@ -415,7 +415,7 @@ done # built by setup.py yet. Removing them in %%install so that if sphinx does # make use of them, and we don't notice, we only remove these source files # after the build has created the .so's -rm %{builddir}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} +rm %{buildroot}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} pushd doc # Deliver man pages From 6fe65c3b4d066db615b324b44fe3591b64f5cf0b Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 20 Jul 2017 19:58:34 +0200 Subject: [PATCH 088/234] Update to 1.6.3 (rhbz#1426928) Mark the test_latex_remote_images as expected failure since it tries to fetch images from the web which is not possible in koji or mock. Added dependencies on python-typing, python-sphinxcontrib-websupport, tex(ctablestack.sty) and ImageMagick. --- .gitignore | 1 + Sphinx-1.2.1-mantarget.patch | 15 ---------- html-parser-HTMLParserError-removed.patch | 21 -------------- python-sphinx-xapian.patch | 34 ----------------------- python-sphinx.spec | 27 ++++++++++++++---- sources | 2 +- xfail-test_latex_remote_images.patch | 13 +++++++++ 7 files changed, 36 insertions(+), 77 deletions(-) delete mode 100644 Sphinx-1.2.1-mantarget.patch delete mode 100644 html-parser-HTMLParserError-removed.patch delete mode 100644 python-sphinx-xapian.patch create mode 100644 xfail-test_latex_remote_images.patch diff --git a/.gitignore b/.gitignore index 5a4a63b..7113428 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Sphinx-1.4.9.tar.gz /Sphinx-1.5.1.tar.gz /Sphinx-1.5.2.tar.gz +/Sphinx-1.6.3.tar.gz diff --git a/Sphinx-1.2.1-mantarget.patch b/Sphinx-1.2.1-mantarget.patch deleted file mode 100644 index ad65a28..0000000 --- a/Sphinx-1.2.1-mantarget.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- sphinx/doc/Makefile.mantarget 2014-02-13 23:28:58.604797750 +0700 -+++ sphinx/doc/Makefile 2014-02-14 00:00:45.794658764 +0700 -@@ -12,6 +12,12 @@ - help: - @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -+# Likewise for man, since a man directory exist and make will assume -+# the target is up to date -+.PHONY: man -+man: -+ @$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -+ - # Catch-all target: route all unknown targets to Sphinx using the new - # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). - %: diff --git a/html-parser-HTMLParserError-removed.patch b/html-parser-HTMLParserError-removed.patch deleted file mode 100644 index 10b3b5d..0000000 --- a/html-parser-HTMLParserError-removed.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git Sphinx-1.3.1/sphinx/builders/linkcheck.py~ Sphinx-1.3.1/sphinx/builders/linkcheck.py -index 9f5c2131c2..71bec0262d 100644 ---- Sphinx-1.3.1/sphinx/builders/linkcheck.py~ -+++ Sphinx-1.3.1/sphinx/builders/linkcheck.py -@@ -19,9 +19,15 @@ from six.moves import queue - from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler - from six.moves.urllib.parse import unquote, urlsplit, quote - from six.moves.urllib.error import HTTPError --from six.moves.html_parser import HTMLParser, HTMLParseError -+from six.moves.html_parser import HTMLParser - from docutils import nodes - -+try: -+ from HTMLParser import HTMLParseError -+except ImportError: -+ class HTMLParseError(Exception): -+ pass -+ - from sphinx.builders import Builder - from sphinx.util.console import purple, red, darkgreen, darkgray, \ - darkred, turquoise diff --git a/python-sphinx-xapian.patch b/python-sphinx-xapian.patch deleted file mode 100644 index d21b807..0000000 --- a/python-sphinx-xapian.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cf795894b9290c5ab2035ae21535f0a7f4b7107a Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -Date: Fri, 16 Dec 2016 19:44:27 +0900 -Subject: [PATCH] Fix #3246: xapian search adapter crashes - ---- - CHANGES | 2 ++ - sphinx/websupport/search/xapiansearch.py | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sphinx/websupport/search/xapiansearch.py b/sphinx/websupport/search/xapiansearch.py -index 1e43dcb..aa7cff8 100644 ---- a/sphinx/websupport/search/xapiansearch.py -+++ b/sphinx/websupport/search/xapiansearch.py -@@ -39,16 +39,16 @@ def finish_indexing(self): - # Ensure the db lock is removed. - del self.database - -- def add_document(self, path, title, text): -+ def add_document(self, pagename, filename, title, text): - self.database.begin_transaction() - # sphinx_page_path is used to easily retrieve documents by path. -- sphinx_page_path = '"sphinxpagepath%s"' % path.replace('/', '_') -+ sphinx_page_path = '"sphinxpagepath%s"' % pagename.replace('/', '_') - # Delete the old document if it exists. - self.database.delete_document(sphinx_page_path) - - doc = xapian.Document() - doc.set_data(text) -- doc.add_value(self.DOC_PATH, path) -+ doc.add_value(self.DOC_PATH, pagename) - doc.add_value(self.DOC_TITLE, title) - self.indexer.set_document(doc) - self.indexer.index_text(text) diff --git a/python-sphinx.spec b/python-sphinx.spec index c37da2b..1ae8308 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.5.2 -Release: 2%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -36,6 +36,11 @@ Source5: README.fedora # python-sphinx execuitables is default Source6: default-sphinx-command.in +# Make the test_latex_remote_images an expected failure +# since it requires an active internet connection +# to fetch images, which is not possible in koji or mock. +Patch0: xfail-test_latex_remote_images.patch + BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python2-babel @@ -48,6 +53,8 @@ BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize BuildRequires: python2-requests +BuildRequires: python2-typing +BuildRequires: python2-sphinxcontrib-websupport BuildRequires: environment(modules) # for fixes @@ -67,6 +74,7 @@ BuildRequires: python-html5lib BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer BuildRequires: python-enum34 +BuildRequires: ImageMagick # note: no Python3 xapian binding yet BuildRequires: xapian-bindings-python BuildRequires: texlive-collection-fontsrecommended @@ -101,6 +109,7 @@ BuildRequires: tex(luatex85.sty) BuildRequires: tex(fncychap.sty) BuildRequires: tex(tabulary.sty) BuildRequires: tex(polyglossia.sty) +BuildRequires: tex(ctablestack.sty) BuildRequires: tex(eu1enc.def) %if 0%{?with_python3} @@ -124,6 +133,7 @@ BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-theme-alabaster BuildRequires: python3-imagesize BuildRequires: python3-requests +BuildRequires: python3-sphinxcontrib-websupport %endif # with_python3 @@ -170,11 +180,14 @@ Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize Requires: python2-requests +Requires: python2-typing +Requires: python2-sphinxcontrib-websupport Requires: environment(modules) # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package Requires(pre): /usr/sbin/alternatives Recommends: graphviz +Recommends: ImageMagick Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 Provides: python-sphinxcontrib-napoleon = %{version}-%{release} @@ -248,6 +261,7 @@ Requires: tex(luatex85.sty) Requires: tex(fncychap.sty) Requires: tex(tabulary.sty) Requires: tex(polyglossia.sty) +Requires: tex(ctablestack.sty) Requires: tex(eu1enc.def) Obsoletes: python3-sphinx-latex < 1.4.4-2 @@ -279,7 +293,9 @@ Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize Requires: python3-requests Requires: python3-six +Requires: python3-sphinxcontrib-websupport Recommends: graphviz +Recommends: ImageMagick Requires: environment(modules) # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package @@ -362,10 +378,6 @@ sed '1d' -i sphinx/pycode/pgen2/token.py # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js -# In 1.5.2, the upstream tarball left this .pyc by mistake. -# Remove it so that it doesn't get included in the python3 build by mistake -rm sphinx/locale/__init__.pyc - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -582,6 +594,9 @@ popd %changelog +* Thu Jul 20 2017 Charalampos Stratakis - - 1.6.3-1 +- Update to 1.6.3 (bz#1426928) + * Sat Feb 18 2017 Toshio Kuratomi - - 1.5.2-2 - Cleanup source files that should not be installed - Fix the __init__.pyc that was byte compiled for the wrong python diff --git a/sources b/sources index a6650e7..6ba2c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88 +SHA512 (Sphinx-1.6.3.tar.gz) = d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae diff --git a/xfail-test_latex_remote_images.patch b/xfail-test_latex_remote_images.patch new file mode 100644 index 0000000..16e4ddd --- /dev/null +++ b/xfail-test_latex_remote_images.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py +index 55f48cd..78ccecd 100644 +--- a/tests/test_build_latex.py ++++ b/tests/test_build_latex.py +@@ -1009,7 +1009,7 @@ def test_latex_raw_directive(app, status, warning): + assert 'HTML: abc ghi' in result + assert 'LaTeX: abc def ghi' in result + +- ++@pytest.mark.xfail(reason="this test requires internet connection") + @pytest.mark.sphinx('latex', testroot='images') + def test_latex_remote_images(app, status, warning): + app.builder.build_all() From ce8ab307f4b92f2c951ab09e6006ab2943a17172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 11:53:11 +0000 Subject: [PATCH 089/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 1ae8308..9e549fe 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -594,6 +594,9 @@ popd %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 20 2017 Charalampos Stratakis - - 1.6.3-1 - Update to 1.6.3 (bz#1426928) From 3a77d8ce47d6b752d2878c821dbf0bbc034c8109 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 21 Sep 2017 11:05:50 +0200 Subject: [PATCH 090/234] Provide the epoch tag in order to keep the upgrade path clean after the downgrade of sphinx at F26. --- python-sphinx.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9e549fe..ddc24cb 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,8 @@ Name: python-sphinx Version: 1.6.3 -Release: 2%{?dist} +Release: 3%{?dist} +Epoch: 1 Summary: Python documentation generator Group: Development/Tools @@ -168,7 +169,7 @@ the Python docs: %package -n python2-sphinx Summary: Python documentation generator -Requires: python-sphinx-locale = %{version}-%{release} +Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} Requires: python2-babel Requires: python-docutils Requires: python-jinja2 @@ -190,12 +191,12 @@ Recommends: graphviz Recommends: ImageMagick Obsoletes: python-sphinx <= 1.2.3 Obsoletes: python-sphinxcontrib-napoleon < 0.5 -Provides: python-sphinxcontrib-napoleon = %{version}-%{release} +Provides: python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release} Obsoletes: python2-Sphinx <= 1.3.1-4 -Provides: python2-Sphinx = %{version}-%{release} -Provides: python(Sphinx) = %{version}-%{release} +Provides: python2-Sphinx = %{?epoch}:%{version}-%{release} +Provides: python(Sphinx) = %{?epoch}:%{version}-%{release} %{?python_provide:%python_provide python2-sphinx} -Conflicts: python3-sphinx < %{version}-%{release} +Conflicts: python3-sphinx < %{?epoch}:%{version}-%{release} %description -n python2-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -228,7 +229,7 @@ the Python docs: %package latex Summary: LaTeX builder dependencies for %{name} -Requires: python(Sphinx) = %{version}-%{release} +Requires: python(Sphinx) = %{?epoch}:%{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex Requires: texlive-dvipng @@ -281,7 +282,7 @@ builder. %package -n python3-sphinx Summary: Python documentation generator Group: Development/Tools -Requires: python-sphinx-locale = %{version}-%{release} +Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} Requires: python3-babel Requires: python3-docutils Requires: python3-jinja2 @@ -301,10 +302,10 @@ Requires: environment(modules) # versions of the package Requires(pre): /usr/sbin/alternatives Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 -Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} -Provides: python(Sphinx) = %{version}-%{release} +Provides: python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release} +Provides: python(Sphinx) = %{?epoch}:%{version}-%{release} %{?python_provide:%python_provide python3-sphinx} -Conflicts: python2-Sphinx < %{version}-%{release} +Conflicts: python2-Sphinx < %{?epoch}:%{version}-%{release} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -340,7 +341,7 @@ the Python docs: Summary: Documentation for %{name} Group: Documentation License: BSD -Requires: python(Sphinx) = %{version}-%{release} +Requires: python(Sphinx) = %{?epoch}:%{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -594,6 +595,9 @@ popd %changelog +* Wed Sep 20 2017 Charalampos Stratakis - 1:1.6.3-3 +- Provide the epoch tag in order to keep the upgrade path clean. + * Thu Jul 27 2017 Fedora Release Engineering - 1.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bf86b0e51bcb3647f1acddfe9776da7e206d0778 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 26 Sep 2017 15:29:32 +0200 Subject: [PATCH 091/234] Update to 1.6.4 (rhbz#1426928) --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7113428..2ad2ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /Sphinx-1.5.1.tar.gz /Sphinx-1.5.2.tar.gz /Sphinx-1.6.3.tar.gz +/Sphinx-1.6.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index ddc24cb..436c5c9 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.6.3 -Release: 3%{?dist} +Version: 1.6.4 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -595,6 +595,9 @@ popd %changelog +* Tue Sep 26 2017 Charalampos Stratakis - 1:1.6.4-1 +- Update to 1.6.4 (bz#1426928) + * Wed Sep 20 2017 Charalampos Stratakis - 1:1.6.3-3 - Provide the epoch tag in order to keep the upgrade path clean. diff --git a/sources b/sources index 6ba2c59..642fb13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.6.3.tar.gz) = d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae +SHA512 (Sphinx-1.6.4.tar.gz) = df7dafce15b6a7025f3ed094a6274d697b2b6b58a91f073a25ea3f70d06a6f3b47808d6a453ed1e51fa6ecb6abceaa661aa6e2d63533ed0cd0e666ba972a9133 From e75c1dcce9e05bb00152baaae56f82ea9d024be0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 9 Oct 2017 12:20:27 -0700 Subject: [PATCH 092/234] Cleanup spec file conditionals --- python-sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 436c5c9..7f1ea1a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %else %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.6.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -595,6 +595,9 @@ popd %changelog +* Mon Oct 09 2017 Troy Dawson - 1:1.6.4-2 +- Cleanup spec file conditionals + * Tue Sep 26 2017 Charalampos Stratakis - 1:1.6.4-1 - Update to 1.6.4 (bz#1426928) From fa7fa5e015e283bd886bbf52e647ac4ffcde4ddb Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 6 Nov 2017 13:40:45 +0100 Subject: [PATCH 093/234] Update to 1.6.5 (bz#1508237) --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ad2ca4..cf8d990 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /Sphinx-1.5.2.tar.gz /Sphinx-1.6.3.tar.gz /Sphinx-1.6.4.tar.gz +/Sphinx-1.6.5.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 7f1ea1a..9e3fbd1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.6.4 -Release: 2%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -595,6 +595,9 @@ popd %changelog +* Mon Nov 06 2017 Charalampos Stratakis - 1:1.6.5-1 +- Update to 1.6.5 (bz#1508237) + * Mon Oct 09 2017 Troy Dawson - 1:1.6.4-2 - Cleanup spec file conditionals diff --git a/sources b/sources index 642fb13..48a9f07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.6.4.tar.gz) = df7dafce15b6a7025f3ed094a6274d697b2b6b58a91f073a25ea3f70d06a6f3b47808d6a453ed1e51fa6ecb6abceaa661aa6e2d63533ed0cd0e666ba972a9133 +SHA512 (Sphinx-1.6.5.tar.gz) = c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d From e5eb957b0338f1cbd3b287bb81be1df349c1866c Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 11 Dec 2017 14:09:56 +0100 Subject: [PATCH 094/234] Fix ambiguous Python 2 dependency declarations --- python-sphinx.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9e3fbd1..2cb2bc2 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -46,10 +46,10 @@ BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python2-babel BuildRequires: python2-setuptools -BuildRequires: python-docutils -BuildRequires: python-jinja2 -BuildRequires: python-pygments >= 2.0 -BuildRequires: python-six +BuildRequires: python2-docutils +BuildRequires: python2-jinja2 +BuildRequires: python2-pygments >= 2.0 +BuildRequires: python2-six BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize @@ -62,22 +62,22 @@ BuildRequires: environment(modules) BuildRequires: dos2unix # for testing -BuildRequires: python-nose +BuildRequires: python2-nose BuildRequires: python2-pytest -BuildRequires: python-pytest-cov +BuildRequires: python2-pytest-cov BuildRequires: gettext BuildRequires: texinfo BuildRequires: graphviz -BuildRequires: python-sqlalchemy +BuildRequires: python2-sqlalchemy BuildRequires: python2-mock BuildRequires: python2-simplejson -BuildRequires: python-html5lib -BuildRequires: python-whoosh +BuildRequires: python2-html5lib +BuildRequires: python2-whoosh BuildRequires: python2-snowballstemmer -BuildRequires: python-enum34 +BuildRequires: python2-enum34 BuildRequires: ImageMagick # note: no Python3 xapian binding yet -BuildRequires: xapian-bindings-python +BuildRequires: python2-xapian BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latex BuildRequires: texlive-dvipng @@ -171,9 +171,9 @@ the Python docs: Summary: Python documentation generator Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} Requires: python2-babel -Requires: python-docutils -Requires: python-jinja2 -Requires: python-pygments +Requires: python2-docutils +Requires: python2-jinja2 +Requires: python2-pygments Requires: python2-mock Requires: python2-snowballstemmer Requires: python2-sphinx_rtd_theme @@ -595,6 +595,10 @@ popd %changelog +* Mon Dec 11 2017 Iryna Shcherbina - 1:1.6.5-2 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Mon Nov 06 2017 Charalampos Stratakis - 1:1.6.5-1 - Update to 1.6.5 (bz#1508237) From ad1161d6bca0b6db1d05e0b12e9c7dc1777e5c3a Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 9 Jan 2018 11:46:54 +0100 Subject: [PATCH 095/234] Update to 1.6.6 (bz#1532435) --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf8d990..47766fd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /Sphinx-1.6.3.tar.gz /Sphinx-1.6.4.tar.gz /Sphinx-1.6.5.tar.gz +/Sphinx-1.6.6.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 2cb2bc2..b53680c 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.6.5 -Release: 2%{?dist} +Version: 1.6.6 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -595,6 +595,9 @@ popd %changelog +* Tue Jan 09 2018 Charalampos Stratakis - 1:1.6.6-1 +- Update to 1.6.6 (bz#1532435) + * Mon Dec 11 2017 Iryna Shcherbina - 1:1.6.5-2 - Fix ambiguous Python 2 dependency declarations (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 48a9f07..5c2d7d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.6.5.tar.gz) = c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d +SHA512 (Sphinx-1.6.6.tar.gz) = 5f6a88805b2a032302c70ef59f4ed65fc149feef94ed303d579af67de7297ebd6867481d966d668f5ab00a30238bbfbc09d715582fd74993af230c8e5eede30f From 8e40c34f4a6f375f94e8309690a8c286b7ea976d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 10:57:14 +0000 Subject: [PATCH 096/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b53680c..0aa9e94 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,7 +15,7 @@ Name: python-sphinx Version: 1.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -595,6 +595,9 @@ popd %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 09 2018 Charalampos Stratakis - 1:1.6.6-1 - Update to 1.6.6 (bz#1532435) From 3d9a6101c90e2d42e83883daf131b7d3338eee90 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Mar 2018 15:15:28 +0100 Subject: [PATCH 097/234] Update to 1.7.1 (bz#1534802) --- .gitignore | 1 + python-sphinx.spec | 44 +++++++++++++------------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 47766fd..81ac3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /Sphinx-1.6.4.tar.gz /Sphinx-1.6.5.tar.gz /Sphinx-1.6.6.tar.gz +/Sphinx-1.7.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 0aa9e94..ba0c0f6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.6.6 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -54,6 +54,7 @@ BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize BuildRequires: python2-requests +BuildRequires: python2-packaging BuildRequires: python2-typing BuildRequires: python2-sphinxcontrib-websupport BuildRequires: environment(modules) @@ -132,6 +133,7 @@ BuildRequires: python3-snowballstemmer BuildRequires: python3-six BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-theme-alabaster +BuildRequires: python3-packaging BuildRequires: python3-imagesize BuildRequires: python3-requests BuildRequires: python3-sphinxcontrib-websupport @@ -181,6 +183,7 @@ Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize Requires: python2-requests +Requires: python2-packaging Requires: python2-typing Requires: python2-sphinxcontrib-websupport Requires: environment(modules) @@ -295,6 +298,7 @@ Requires: python3-imagesize Requires: python3-requests Requires: python3-six Requires: python3-sphinxcontrib-websupport +Requires: python3-packaging Recommends: graphviz Recommends: ImageMagick Requires: environment(modules) @@ -374,8 +378,6 @@ This package contains locale files for Sphinx cp %{SOURCE5} . -sed '1d' -i sphinx/pycode/pgen2/token.py - # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js @@ -408,12 +410,6 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i done - -# These appear to be incomplete C extensions to speed up parsing. They are not -# built by setup.py yet. Removing them in %%install so that if sphinx does -# make use of them, and we don't notice, we only remove these source files -# after the build has created the .so's -rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} %endif # with_python3 %py2_install @@ -424,12 +420,6 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i done -# These appear to be incomplete C extensions to speed up parsing. They are not -# built by setup.py yet. Removing them in %%install so that if sphinx does -# make use of them, and we don't notice, we only remove these source files -# after the build has created the .so's -rm %{buildroot}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c} - pushd doc # Deliver man pages install -d %{buildroot}%{_mandir}/man1 @@ -460,7 +450,7 @@ mv doc reST # Move language files to /usr/share; # patch to support this incorporated in 0.6.6 -pushd %{buildroot}%{python_sitelib} +pushd %{buildroot}%{python2_sitelib} for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`; do @@ -518,7 +508,9 @@ done # Currently, all linkcheck tests hit external websites. Since network access # is disabled in koji, we have to disable these. rm tests/test_build_linkcheck.py -LANG=en_US.UTF-8 make test +# Igoring test_api_translator for now as it fails on Fedora. +# The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710 +LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py %if 0%{?with_python3} pushd %{py3dir} # Currently, all linkcheck tests hit external websites. Since network access @@ -529,19 +521,6 @@ popd %endif # with_python3 -%pre -n python2-sphinx -# python-sphinx as shipped in an update to f24 and f25 used alternatives. So -# we need to clean up the alternatives configuration until at least f27 -%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || : - -%if 0%{?with_python3} -%pre -n python3-sphinx -# python-sphinx as shipped in an update to f24 and f25 used alternatives. So -# we need to clean up the alternatives configuration until at least f27 -%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || : -%endif # with_python3 - - %files latex %license LICENSE @@ -595,6 +574,9 @@ popd %changelog +* Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 +- Update to 1.7.1 (bz#1534802) + * Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 5c2d7d9..f70f705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.6.6.tar.gz) = 5f6a88805b2a032302c70ef59f4ed65fc149feef94ed303d579af67de7297ebd6867481d966d668f5ab00a30238bbfbc09d715582fd74993af230c8e5eede30f +SHA512 (Sphinx-1.7.1.tar.gz) = ea9a7b512cde5c39d75d0d5e8856954c334c84f91bba6a9d3b604df1df688639b20115ec71e55f80c802e90234db5e48d5766fbe8619e4a9f2890e1d7aab915f From 61f25030e6b1699e4700aa76749df7645c064524 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 11 Apr 2018 16:00:06 +0200 Subject: [PATCH 098/234] Update to 1.7.2 --- .gitignore | 1 + python-sphinx.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81ac3ef..30051b9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /Sphinx-1.6.5.tar.gz /Sphinx-1.6.6.tar.gz /Sphinx-1.7.1.tar.gz +/Sphinx-1.7.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index ba0c0f6..cc57b89 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.7.1 +Version: 1.7.2 Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -574,6 +574,9 @@ popd %changelog +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-1 +- Update to 1.7.2 (bz#1558968) + * Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 - Update to 1.7.1 (bz#1534802) diff --git a/sources b/sources index f70f705..cbcc203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.7.1.tar.gz) = ea9a7b512cde5c39d75d0d5e8856954c334c84f91bba6a9d3b604df1df688639b20115ec71e55f80c802e90234db5e48d5766fbe8619e4a9f2890e1d7aab915f +SHA512 (Sphinx-1.7.2.tar.gz) = 6cb055d969227c727e1cdd8865ddef700d72217e0ef3700383449921e9310f7ed6266d62cf1928ad64372f93468d457c584fac34f6583714cc8a9a3627785ac3 From 9e75ecd41f7d8a50c6d160275205c53332a7f51c Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Wed, 11 Apr 2018 19:05:47 +0200 Subject: [PATCH 099/234] fix test_autodoc with Python 3.6.5 --- fix-test_autodoc.patch | 32 ++++++++++++++++++++++++++++++++ python-sphinx.spec | 4 ++++ 2 files changed, 36 insertions(+) create mode 100644 fix-test_autodoc.patch diff --git a/fix-test_autodoc.patch b/fix-test_autodoc.patch new file mode 100644 index 0000000..f3d969b --- /dev/null +++ b/fix-test_autodoc.patch @@ -0,0 +1,32 @@ +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 cc57b89..e342f7d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -42,6 +42,10 @@ 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 From baac7bad24c2bf33214573176dd401a3b7c3d0a3 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 11 Apr 2018 14:54:02 +0200 Subject: [PATCH 100/234] Conditionalize the ImageMagick build dependency & tests --- python-sphinx.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index e342f7d..9de6388 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,6 +4,13 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif +%if 0%{?rhel} > 7 +# Build without BuildRequires ImageMagick, to skip imgconverter tests +%bcond_with imagemagick_tests +%else +%bcond_without imagemagick_tests +%endif + # Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming %if 1 %global py3_default 0 @@ -15,7 +22,7 @@ Name: python-sphinx Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -80,7 +87,9 @@ BuildRequires: python2-html5lib BuildRequires: python2-whoosh BuildRequires: python2-snowballstemmer BuildRequires: python2-enum34 +%if %{with imagemagick_tests} BuildRequires: ImageMagick +%endif # note: no Python3 xapian binding yet BuildRequires: python2-xapian BuildRequires: texlive-collection-fontsrecommended @@ -385,12 +394,15 @@ cp %{SOURCE5} . # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js +%if ! %{with imagemagick_tests} +rm tests/test_ext_imgconverter.py +%endif + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} %endif # with_python3 - %build %py2_build %if 0%{?with_python3} @@ -578,6 +590,9 @@ popd %changelog +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-2 +- Conditionalize the ImageMagick build dependency & tests + * Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-1 - Update to 1.7.2 (bz#1558968) From da1eff5e261f52f9963a460df91f97c0a097b1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 14 May 2018 13:59:52 +0200 Subject: [PATCH 101/234] Allow bootstrapping sphinx 1. Introduce --without websupport Sphinx (build)requires sphinxcontrib-websupport but that (build)requires sphinx. This bcond can be used to bootstrap this. 2. Introduce --without tests The tests bring a lot of additional dependencies that make bootstrapping harder. This allows to build without tests. 3. Build the docs with self The documentation was built with 'python', thus importing sphinx from python2's sitelib. Sphinx was installed because of the above mentioned buildrequirement of sphinxcontrib-websupport. Now current sphinx from PWD is used, also python3 is used when available, otherwise python2. Never just python. --- python-sphinx.spec | 56 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9de6388..b844232 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -11,6 +11,11 @@ %bcond_without imagemagick_tests %endif +# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport +%bcond_without websupport +# Also, we don't have all the tests requirements +%bcond_without tests + # Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming %if 1 %global py3_default 0 @@ -67,13 +72,15 @@ BuildRequires: python2-imagesize BuildRequires: python2-requests BuildRequires: python2-packaging BuildRequires: python2-typing +%if %{with websupport} BuildRequires: python2-sphinxcontrib-websupport +%endif BuildRequires: environment(modules) # for fixes BuildRequires: dos2unix -# for testing +%if %{with tests} BuildRequires: python2-nose BuildRequires: python2-pytest BuildRequires: python2-pytest-cov @@ -126,6 +133,7 @@ BuildRequires: tex(tabulary.sty) BuildRequires: tex(polyglossia.sty) BuildRequires: tex(ctablestack.sty) BuildRequires: tex(eu1enc.def) +%endif %if 0%{?with_python3} BuildRequires: python3-devel @@ -134,6 +142,16 @@ BuildRequires: python3-setuptools BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-pygments +BuildRequires: python3-six +BuildRequires: python3-sphinx_rtd_theme +BuildRequires: python3-sphinx-theme-alabaster +BuildRequires: python3-packaging +BuildRequires: python3-imagesize +BuildRequires: python3-requests +%if %{with websupport} +BuildRequires: python3-sphinxcontrib-websupport +%endif +%if %{with tests} BuildRequires: python3-nose BuildRequires: python3-pytest BuildRequires: python3-pytest-cov @@ -143,13 +161,7 @@ BuildRequires: python3-simplejson BuildRequires: python3-html5lib BuildRequires: python3-whoosh BuildRequires: python3-snowballstemmer -BuildRequires: python3-six -BuildRequires: python3-sphinx_rtd_theme -BuildRequires: python3-sphinx-theme-alabaster -BuildRequires: python3-packaging -BuildRequires: python3-imagesize -BuildRequires: python3-requests -BuildRequires: python3-sphinxcontrib-websupport +%endif %endif # with_python3 @@ -198,7 +210,9 @@ Requires: python2-imagesize Requires: python2-requests Requires: python2-packaging Requires: python2-typing +%if %{with websupport} Requires: python2-sphinxcontrib-websupport +%endif Requires: environment(modules) # Needed to get rid of the alternatives config installed in f24 and f25 # versions of the package @@ -310,8 +324,10 @@ Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize Requires: python3-requests Requires: python3-six -Requires: python3-sphinxcontrib-websupport Requires: python3-packaging +%if %{with websupport} +Requires: python3-sphinxcontrib-websupport +%endif Recommends: graphviz Recommends: ImageMagick Requires: environment(modules) @@ -394,10 +410,14 @@ cp %{SOURCE5} . # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js -%if ! %{with imagemagick_tests} +%if %{without imagemagick_tests} rm tests/test_ext_imgconverter.py %endif +%if %{without websupport} +rm tests/test_websupport.py tests/test_api_translator.py +%endif + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -409,9 +429,16 @@ cp -a . %{py3dir} %py3_build %endif # with_python3 +export PYTHONPATH=$PWD pushd doc -make html -make man +%if 0%{?with_python3} +export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py" +%else +export SPHINXBUILD="%{__python2} ../sphinx/cmd/build.py" +%endif + +make html SPHINXBUILD="$SPHINXBUILD" +make man SPHINXBUILD="$SPHINXBUILD" rm -rf _build/html/.buildinfo mv _build/html .. popd @@ -520,10 +547,14 @@ done >> sphinx.lang +%if %{with tests} %check +export PYTHONPATH=$PWD + # Currently, all linkcheck tests hit external websites. Since network access # is disabled in koji, we have to disable these. rm tests/test_build_linkcheck.py + # Igoring test_api_translator for now as it fails on Fedora. # The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710 LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py @@ -535,6 +566,7 @@ rm tests/test_build_linkcheck.py LANG=en_US.UTF-8 PYTHON=python3 make test popd %endif # with_python3 +%endif # with tests %files latex From 74c85146896f3ac340e06e50d1e45534716dd5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 15:12:54 +0200 Subject: [PATCH 102/234] Bootstrap for Python 3.7 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b844232..601e184 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %else @@ -27,7 +29,7 @@ Name: python-sphinx Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -622,6 +624,9 @@ popd %changelog +* Thu Jun 14 2018 Miro Hrončok - 1:1.7.2-3 +- Bootstrap for Python 3.7 + * Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-2 - Conditionalize the ImageMagick build dependency & tests From 6947effe2b2586a68aa73eac941e8ef349edbd95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 15 Jun 2018 11:49:53 +0200 Subject: [PATCH 103/234] Bootstrap for Python 3.7 --- python-sphinx.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 601e184..8db4e15 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,4 @@ %global _without_tests 1 -%global _without_websupport 1 %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %else @@ -29,7 +28,7 @@ Name: python-sphinx Version: 1.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -624,6 +623,9 @@ popd %changelog +* Fri Jun 15 2018 Miro Hrončok - 1:1.7.2-4 +- Bootstrap for Python 3.7 + * Thu Jun 14 2018 Miro Hrončok - 1:1.7.2-3 - Bootstrap for Python 3.7 From 46248b49f8bb8e1578289c66900a78d5b8a69965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Jun 2018 11:14:15 +0200 Subject: [PATCH 104/234] Rebuilt for Python 3.7 --- python-sphinx.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 8db4e15..7cd8b00 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?fedora} || 0%{?rhel} > 7 %global with_python3 1 %else @@ -28,7 +27,7 @@ Name: python-sphinx Version: 1.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Python documentation generator @@ -623,6 +622,9 @@ popd %changelog +* Mon Jun 18 2018 Miro Hrončok - 1:1.7.2-5 +- Rebuilt for Python 3.7 + * Fri Jun 15 2018 Miro Hrončok - 1:1.7.2-4 - Bootstrap for Python 3.7 From b037848b60a90eec9de0f6907072b6e4c78c656c Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 19 Jun 2018 17:19:54 +0200 Subject: [PATCH 105/234] Update to 1.7.5 (bz#1570451) --- .gitignore | 1 + fix-test_autodoc.patch | 32 -------------------------------- python-sphinx.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 fix-test_autodoc.patch 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 From 80327ebb05432a36d290b06327d54e7acec94dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:23:56 +0200 Subject: [PATCH 106/234] Rebuilt for Python 3.7 --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 0d5f7f4..e9b4fe4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -618,6 +618,9 @@ popd %changelog +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-2 +- Rebuilt for Python 3.7 + * Tue Jun 19 2018 Charalampos Stratakis - 1:1.7.5-1 - Update to 1.7.5 (bz#1570451) From 6a162ce61a35d428a90d69d896915d644a92aa9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 19:04:20 +0200 Subject: [PATCH 107/234] Bootstrap for 3.7 once more --- python-sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index e9b4fe4..4097323 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -12,9 +12,9 @@ %endif # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport -%bcond_without websupport +%bcond_with websupport # Also, we don't have all the tests requirements -%bcond_without tests +%bcond_with tests # Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming %if 1 From 334b5cd671dd593de100956dd21a4039c599fd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 19:18:45 +0200 Subject: [PATCH 108/234] Enable websupport --- python-sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4097323..7df79e7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -12,7 +12,7 @@ %endif # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport -%bcond_with websupport +%bcond_without websupport # Also, we don't have all the tests requirements %bcond_with tests @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -618,6 +618,9 @@ popd %changelog +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-3 +- Enable websupport + * Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-2 - Rebuilt for Python 3.7 From 88b03eafc540f4356862231350acc718d9c75732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 19:46:48 +0200 Subject: [PATCH 109/234] Enable tests --- python-sphinx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7df79e7..283eb30 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,7 +14,7 @@ # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport %bcond_without websupport # Also, we don't have all the tests requirements -%bcond_with tests +%bcond_without tests # Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming %if 1 @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -618,6 +618,9 @@ popd %changelog +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-4 +- Enable tests + * Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-3 - Enable websupport From 10b412f00cb3878304cf04fed3034f844d420803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 5 Jul 2018 16:49:09 +0200 Subject: [PATCH 110/234] Add patch to fix build and another for #1589868 --- ...c23ab1cadfe75db6637ca95daa11abc87049.patch | 38 +++++++++++++++++++ python-sphinx.spec | 12 +++++- sphinx-test_theming.diff | 11 ++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 b553c23ab1cadfe75db6637ca95daa11abc87049.patch create mode 100644 sphinx-test_theming.diff diff --git a/b553c23ab1cadfe75db6637ca95daa11abc87049.patch b/b553c23ab1cadfe75db6637ca95daa11abc87049.patch new file mode 100644 index 0000000..c5b39e1 --- /dev/null +++ b/b553c23ab1cadfe75db6637ca95daa11abc87049.patch @@ -0,0 +1,38 @@ +From b553c23ab1cadfe75db6637ca95daa11abc87049 Mon Sep 17 00:00:00 2001 +From: Michel Alexandre Salim +Date: Tue, 3 Jul 2018 09:28:54 -0700 +Subject: [PATCH] Closes #5076: [ext/napoleon] explicitly catch StopIteration + (#5119) + +* Closes #5076: [ext/napoleon] explicitly catch StopIteration + +Per PEP 479, Python 3.7 no longer allows bubbling up StopIteration +outside of a generator. Instead, wrap attribute parsing in a try +block and provide a sane default in case it raises an exception +([]). + +* Fix mypy and flake8 issues +--- + sphinx/ext/napoleon/docstring.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/sphinx/ext/napoleon/docstring.py b/sphinx/ext/napoleon/docstring.py +index b349c761f8..64107d8fb3 100644 +--- a/sphinx/ext/napoleon/docstring.py ++++ b/sphinx/ext/napoleon/docstring.py +@@ -527,7 +527,14 @@ def _parse(self): + self._parsed_lines = self._consume_empty() + + if self._name and (self._what == 'attribute' or self._what == 'data'): +- self._parsed_lines.extend(self._parse_attribute_docstring()) ++ # Implicit stop using StopIteration no longer allowed in ++ # Python 3.7; see PEP 479 ++ res = [] # type: List[unicode] ++ try: ++ res = self._parse_attribute_docstring() ++ except StopIteration: ++ pass ++ self._parsed_lines.extend(res) + return + + while self._line_iter.has_next(): diff --git a/python-sphinx.spec b/python-sphinx.spec index 283eb30..12b8694 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.5 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Python documentation generator @@ -54,6 +54,12 @@ Source6: default-sphinx-command.in # to fetch images, which is not possible in koji or mock. Patch0: xfail-test_latex_remote_images.patch +# Allow extra themes to exist. We pull in python[23]-sphinx-theme-alabaster +# 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 @@ -618,6 +624,10 @@ popd %changelog +* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.5-4 - Enable tests diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff new file mode 100644 index 0000000..12b3ac9 --- /dev/null +++ b/sphinx-test_theming.diff @@ -0,0 +1,11 @@ +--- 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 + + # 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']) From 9622ed923e77d3ceff9a0a49d9f599cef9a60469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Jul 2018 17:17:13 +0200 Subject: [PATCH 111/234] Remove unused dependencies on xapian and simplejson --- python-sphinx.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 12b8694..49fc9a6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.5 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Python documentation generator @@ -91,7 +91,6 @@ BuildRequires: texinfo BuildRequires: graphviz BuildRequires: python2-sqlalchemy BuildRequires: python2-mock -BuildRequires: python2-simplejson BuildRequires: python2-html5lib BuildRequires: python2-whoosh BuildRequires: python2-snowballstemmer @@ -99,8 +98,6 @@ BuildRequires: python2-enum34 %if %{with imagemagick_tests} BuildRequires: ImageMagick %endif -# note: no Python3 xapian binding yet -BuildRequires: python2-xapian BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latex BuildRequires: texlive-dvipng @@ -159,7 +156,6 @@ BuildRequires: python3-pytest BuildRequires: python3-pytest-cov BuildRequires: python3-sqlalchemy BuildRequires: python3-mock -BuildRequires: python3-simplejson BuildRequires: python3-html5lib BuildRequires: python3-whoosh BuildRequires: python3-snowballstemmer @@ -624,6 +620,9 @@ popd %changelog +* Fri Jul 13 2018 Miro Hrončok - 1:1.7.5-6 +- Remove unused dependencies on xapian and simplejson + * Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek - 1:1.7.5-5 - Add patch to fix build if alabaster theme is installed - Add patch for #1589868 From 644e00c17b92923806f33ce3f91b414a322cbe15 Mon Sep 17 00:00:00 2001 From: Marcel Plch Date: Mon, 23 Jul 2018 18:00:01 +0200 Subject: [PATCH 112/234] Update to 1.7.6 --- .gitignore | 1 + python-sphinx.spec | 9 +++++---- sources | 2 +- sphinx-test_theming.diff | 19 ++++++++++--------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 28bb3f3..4a7a095 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/python-sphinx.spec b/python-sphinx.spec index 49fc9a6..9cda3bb 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -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 - 1:1.7.6-1 +- Update to 1.7.6 + * Fri Jul 13 2018 Miro Hrončok - 1:1.7.5-6 - Remove unused dependencies on xapian and simplejson diff --git a/sources b/sources index bf910c5..aca1716 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.7.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8 +SHA512 (Sphinx-1.7.6.tar.gz) = 505c4e92c1a09c48a50d8bd0ec86089bd3f0f5352302ae330e2fba6e61316f40c6ec3726e2cfaeb54de0818127a26ef5364ac92bcf254283022c38c4e95d419c diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff index 12b3ac9..966528a 100644 --- a/sphinx-test_theming.diff +++ b/sphinx-test_theming.diff @@ -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' From 26b3d1a4408659229221b7df908666d4bb080a3b Mon Sep 17 00:00:00 2001 From: Marcel Plch Date: Tue, 31 Jul 2018 16:56:09 +0200 Subject: [PATCH 113/234] Remove unused patch --- ...c23ab1cadfe75db6637ca95daa11abc87049.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 b553c23ab1cadfe75db6637ca95daa11abc87049.patch diff --git a/b553c23ab1cadfe75db6637ca95daa11abc87049.patch b/b553c23ab1cadfe75db6637ca95daa11abc87049.patch deleted file mode 100644 index c5b39e1..0000000 --- a/b553c23ab1cadfe75db6637ca95daa11abc87049.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b553c23ab1cadfe75db6637ca95daa11abc87049 Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Tue, 3 Jul 2018 09:28:54 -0700 -Subject: [PATCH] Closes #5076: [ext/napoleon] explicitly catch StopIteration - (#5119) - -* Closes #5076: [ext/napoleon] explicitly catch StopIteration - -Per PEP 479, Python 3.7 no longer allows bubbling up StopIteration -outside of a generator. Instead, wrap attribute parsing in a try -block and provide a sane default in case it raises an exception -([]). - -* Fix mypy and flake8 issues ---- - sphinx/ext/napoleon/docstring.py | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/sphinx/ext/napoleon/docstring.py b/sphinx/ext/napoleon/docstring.py -index b349c761f8..64107d8fb3 100644 ---- a/sphinx/ext/napoleon/docstring.py -+++ b/sphinx/ext/napoleon/docstring.py -@@ -527,7 +527,14 @@ def _parse(self): - self._parsed_lines = self._consume_empty() - - if self._name and (self._what == 'attribute' or self._what == 'data'): -- self._parsed_lines.extend(self._parse_attribute_docstring()) -+ # Implicit stop using StopIteration no longer allowed in -+ # Python 3.7; see PEP 479 -+ res = [] # type: List[unicode] -+ try: -+ res = self._parse_attribute_docstring() -+ except StopIteration: -+ pass -+ self._parsed_lines.extend(res) - return - - while self._line_iter.has_next(): From de4211c65da64c9daa2ec5a20744b5b05eb38eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 18 Nov 2018 22:08:30 +0100 Subject: [PATCH 114/234] Drop explicit locale setting Python3 now sets unicode locale automatically, this workaround should not be necessary anymore. For python2, let's use the lighter locale. --- python-sphinx.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9cda3bb..7e82d7e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -553,13 +553,13 @@ rm tests/test_build_linkcheck.py # Igoring test_api_translator for now as it fails on Fedora. # The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710 -LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py +LANG=C.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py %if 0%{?with_python3} pushd %{py3dir} # Currently, all linkcheck tests hit external websites. Since network access # is disabled in koji, we have to disable these. rm tests/test_build_linkcheck.py -LANG=en_US.UTF-8 PYTHON=python3 make test +PYTHON=python3 make test popd %endif # with_python3 %endif # with tests @@ -618,6 +618,10 @@ popd %changelog +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.6-1 - Update to 1.7.6 From d38712d2c868d1b037f4e3bebc32c2c130d048bb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:18 +0100 Subject: [PATCH 115/234] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- python-sphinx.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7e82d7e..4606077 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -31,7 +31,6 @@ Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator -Group: Development/Tools # Unless otherwise noted, the license for code is BSD # sphinx/util/stemmer.py Public Domain @@ -307,7 +306,6 @@ builder. %if 0%{?with_python3} %package -n python3-sphinx Summary: Python documentation generator -Group: Development/Tools Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} Requires: python3-babel Requires: python3-docutils @@ -368,7 +366,6 @@ the Python docs: %package doc Summary: Documentation for %{name} -Group: Documentation License: BSD Requires: python(Sphinx) = %{?epoch}:%{version}-%{release} @@ -385,7 +382,6 @@ This package contains documentation in reST and HTML formats. %package locale Summary: Locale files for %{name} -Group: Development/Tools License: BSD %description locale From bd7e5f534fb91199ffab6634e1ecd63244707c43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 09:25:25 +0000 Subject: [PATCH 116/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4606077..a6732bd 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -27,7 +27,7 @@ Name: python-sphinx Version: 1.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -614,6 +614,9 @@ popd %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1:1.7.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 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 From 016c639951d0125cf8b61518d5b90526f551a3cf Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 7 Feb 2019 17:26:36 +0100 Subject: [PATCH 117/234] Update to 1.8.4 --- .gitignore | 1 + python-sphinx.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4a7a095..632e97f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /Sphinx-1.7.2.tar.gz /Sphinx-1.7.5.tar.gz /Sphinx-1.7.6.tar.gz +/Sphinx-1.8.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index a6732bd..d8c5a6e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -26,8 +26,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.7.6 -Release: 3%{?dist} +Version: 1.8.4 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -549,13 +549,13 @@ rm tests/test_build_linkcheck.py # Igoring test_api_translator for now as it fails on Fedora. # The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710 -LANG=C.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py +LANG=C.UTF-8 pytest-2 %if 0%{?with_python3} pushd %{py3dir} # Currently, all linkcheck tests hit external websites. Since network access # is disabled in koji, we have to disable these. rm tests/test_build_linkcheck.py -PYTHON=python3 make test +pytest-3 popd %endif # with_python3 %endif # with tests @@ -614,6 +614,9 @@ popd %changelog +* Thu Feb 07 2019 Alfredo Moralejo - 1:1.8.4-1 +- Update to 1.8.4. + * Sat Feb 02 2019 Fedora Release Engineering - 1:1.7.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index aca1716..77c68f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.7.6.tar.gz) = 505c4e92c1a09c48a50d8bd0ec86089bd3f0f5352302ae330e2fba6e61316f40c6ec3726e2cfaeb54de0818127a26ef5364ac92bcf254283022c38c4e95d419c +SHA512 (Sphinx-1.8.4.tar.gz) = 6821bb56c30b52f357ae55f5db45f056883c457eae62a0751a2b654519a07bca9edccb7678b29fa380379f059c9d8899d9e7b06ceccca5ec26962e6f83bb8578 From d1c43fc6581909d2068b27c4c58a5fa6acd1ab8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 27 Feb 2019 23:02:51 +0100 Subject: [PATCH 118/234] Update to 2.0.0b1 and remove pyton2-sphinx https://fedoraproject.org/wiki/Changes/Sphinx2 --- .gitignore | 1 + README.fedora | 27 -- default-sphinx-command.in | 2 - python-sphinx.spec | 578 ++++++++------------------- python2-sphinx | 6 - python3-sphinx | 6 - sources | 2 +- xfail-test_latex_remote_images.patch | 13 - zz-modules-python-sphinx.csh | 2 - zz-modules-python-sphinx.sh | 2 - 10 files changed, 175 insertions(+), 464 deletions(-) delete mode 100644 README.fedora delete mode 100644 default-sphinx-command.in delete mode 100644 python2-sphinx delete mode 100644 python3-sphinx delete mode 100644 xfail-test_latex_remote_images.patch delete mode 100644 zz-modules-python-sphinx.csh delete mode 100644 zz-modules-python-sphinx.sh diff --git a/.gitignore b/.gitignore index 632e97f..db9788f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /Sphinx-1.7.5.tar.gz /Sphinx-1.7.6.tar.gz /Sphinx-1.8.4.tar.gz +/Sphinx-2.0.0b1.tar.gz diff --git a/README.fedora b/README.fedora deleted file mode 100644 index 67dac5c..0000000 --- a/README.fedora +++ /dev/null @@ -1,27 +0,0 @@ -Sphinx with autodoc is sensitive to whether it is run via Python2 or Python3 -as it uses the Python version that it is invoked with to parse the source -files for docstrings. Unfortunately, there's no logic to detect this within -the sphinx commands and the standard Makefiles generated by sphinx-quickstart -don't give the user any hint that it might be a problem. - -The Fedora package tries to mitigate this problem by allowing the user to -switch between the Python2 and Python3 versions using environment-modules. To -switch to the Python3 commands, use:: - - module swap python-sphinx/python3-sphinx - -To switch to the Python2 version, use:: - - module swap python-sphinx/python2-sphinx - -The default install uses the python2 version of the modules. -If the system administrator wishes to change the default, edit the -/etc/profile.d/zz-modules-python-sphinx.sh and -/etc/profile.d/zz-modules-python-sphinx.csh files to specify a specific -alternative to use. For instance, to make the python3 version the default, -modify it like so:: - - @@ -1,2 +1,2 @@ - # Add path to the default python-sphinx scripts on this version of Fedora - -module load python-sphinx - +module load python-sphinx/python3-sphinx diff --git a/default-sphinx-command.in b/default-sphinx-command.in deleted file mode 100644 index c933d75..0000000 --- a/default-sphinx-command.in +++ /dev/null @@ -1,2 +0,0 @@ -#%Module1.0 -set ModuleVersion "python@PYTHONVER@-sphinx" diff --git a/python-sphinx.spec b/python-sphinx.spec index d8c5a6e..7769849 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,8 +1,12 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%else -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} -%endif +# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport +# Without it we have warnings in docs, but it's not a hard dependency +%bcond_without websupport +# Also, we don't have all the tests requirements +%bcond_without tests + + +# No internet in Koji +%bcond_with internet %if 0%{?rhel} > 7 # Build without BuildRequires ImageMagick, to skip imgconverter tests @@ -11,154 +15,103 @@ %bcond_without imagemagick_tests %endif -# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport -%bcond_without websupport -# Also, we don't have all the tests requirements -%bcond_without tests - -# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming -%if 1 -%global py3_default 0 -%else -%global py3_default 1 -%endif %global upstream_name Sphinx Name: python-sphinx -Version: 1.8.4 +%global general_version 2.0.0 +%global prerel b1 +%global upstream_version %{general_version}%{?prerel} +Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator - # Unless otherwise noted, the license for code is BSD -# sphinx/util/stemmer.py Public Domain -# sphinx/pycode/pgen2 Python -# jquery (MIT or GPLv2) -License: BSD and Public Domain and Python and (MIT or GPLv2) -URL: http://sphinx-doc.org/ -Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -Source1: python2-sphinx -Source2: python3-sphinx -Source3: zz-modules-python-sphinx.sh -Source4: zz-modules-python-sphinx.csh -Source5: README.fedora -# environment-modules file to select whether the py2 or py3 version of -# python-sphinx execuitables is default -Source6: default-sphinx-command.in +# 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 -# Make the test_latex_remote_images an expected failure -# since it requires an active internet connection -# to fetch images, which is not possible in koji or mock. -Patch0: xfail-test_latex_remote_images.patch +URL: https://www.sphinx-doc.org/ +Source0: %{pypi_source %{upstream_name} %{upstream_version}} -# Allow extra themes to exist. We pull in python[23]-sphinx-theme-alabaster +# Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster # which causes that test to fail. -Patch1: sphinx-test_theming.diff +Patch1: sphinx-test_theming.diff BuildArch: noarch -BuildRequires: python2-devel >= 2.4 -BuildRequires: python2-babel -BuildRequires: python2-setuptools -BuildRequires: python2-docutils -BuildRequires: python2-jinja2 -BuildRequires: python2-pygments >= 2.0 -BuildRequires: python2-six -BuildRequires: python2-sphinx_rtd_theme -BuildRequires: python2-sphinx-theme-alabaster -BuildRequires: python2-imagesize -BuildRequires: python2-requests -BuildRequires: python2-packaging -BuildRequires: python2-typing + +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +BuildRequires: python3-babel +BuildRequires: python3-docutils +BuildRequires: python3-imagesize +BuildRequires: python3-jinja2 +BuildRequires: python3-packaging +BuildRequires: python3-pygments +BuildRequires: python3-requests +BuildRequires: python3-sphinxcontrib-applehelp +BuildRequires: python3-sphinxcontrib-devhelp +BuildRequires: python3-sphinxcontrib-htmlhelp +BuildRequires: python3-sphinxcontrib-jsmath +BuildRequires: python3-sphinxcontrib-qthelp +BuildRequires: python3-sphinxcontrib-serializinghtml +BuildRequires: python3-sphinx-theme-alabaster + %if %{with websupport} -BuildRequires: python2-sphinxcontrib-websupport +BuildRequires: python3-sphinxcontrib-websupport %endif -BuildRequires: environment(modules) # for fixes BuildRequires: dos2unix %if %{with tests} -BuildRequires: python2-nose -BuildRequires: python2-pytest -BuildRequires: python2-pytest-cov +BuildRequires: python3-html5lib +BuildRequires: python3-mock +BuildRequires: python3-pytest +BuildRequires: python3-snowballstemmer + BuildRequires: gettext -BuildRequires: texinfo BuildRequires: graphviz -BuildRequires: python2-sqlalchemy -BuildRequires: python2-mock -BuildRequires: python2-html5lib -BuildRequires: python2-whoosh -BuildRequires: python2-snowballstemmer -BuildRequires: python2-enum34 +BuildRequires: texinfo + %if %{with imagemagick_tests} BuildRequires: ImageMagick %endif + BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latex BuildRequires: texlive-dvipng BuildRequires: texlive-dvisvgm -BuildRequires: texlive-ucs -BuildRequires: tex(cmap.sty) -BuildRequires: tex(ecrm1000.tfm) -BuildRequires: tex(footnote.sty) -BuildRequires: tex(framed.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(parskip.sty) -BuildRequires: tex(titlesec.sty) -BuildRequires: tex(threeparttable.sty) -BuildRequires: tex(upquote.sty) -BuildRequires: tex(wrapfig.sty) -BuildRequires: tex(capt-of.sty) -BuildRequires: tex(needspace.sty) -BuildRequires: tex(eqparbox.sty) BuildRequires: tex(amsmath.sty) BuildRequires: tex(amsthm.sty) -BuildRequires: tex(amssymb.sty) -BuildRequires: tex(amsfonts.sty) -BuildRequires: tex(bm.sty) -BuildRequires: tex(palatino.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(eqparbox.sty) -BuildRequires: tex(atbegshi.sty) BuildRequires: tex(anyfontsize.sty) -BuildRequires: tex(luatex85.sty) -BuildRequires: tex(fncychap.sty) -BuildRequires: tex(tabulary.sty) -BuildRequires: tex(polyglossia.sty) +BuildRequires: tex(article.cls) +BuildRequires: tex(capt-of.sty) +BuildRequires: tex(cmap.sty) +BuildRequires: tex(color.sty) BuildRequires: tex(ctablestack.sty) -BuildRequires: tex(eu1enc.def) +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 -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-babel -BuildRequires: python3-setuptools -BuildRequires: python3-docutils -BuildRequires: python3-jinja2 -BuildRequires: python3-pygments -BuildRequires: python3-six -BuildRequires: python3-sphinx_rtd_theme -BuildRequires: python3-sphinx-theme-alabaster -BuildRequires: python3-packaging -BuildRequires: python3-imagesize -BuildRequires: python3-requests -%if %{with websupport} -BuildRequires: python3-sphinxcontrib-websupport -%endif -%if %{with tests} -BuildRequires: python3-nose -BuildRequires: python3-pytest -BuildRequires: python3-pytest-cov -BuildRequires: python3-sqlalchemy -BuildRequires: python3-mock -BuildRequires: python3-html5lib -BuildRequires: python3-whoosh -BuildRequires: python3-snowballstemmer -%endif -%endif # with_python3 - %description Sphinx is a tool that makes it easy to create intelligent and @@ -189,150 +142,26 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package -n python2-sphinx -Summary: Python documentation generator -Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} -Requires: python2-babel -Requires: python2-docutils -Requires: python2-jinja2 -Requires: python2-pygments -Requires: python2-mock -Requires: python2-snowballstemmer -Requires: python2-sphinx_rtd_theme -Requires: python2-six -Requires: python2-sphinx-theme-alabaster -Requires: python2-imagesize -Requires: python2-requests -Requires: python2-packaging -Requires: python2-typing -%if %{with websupport} -Requires: python2-sphinxcontrib-websupport -%endif -Requires: environment(modules) -# Needed to get rid of the alternatives config installed in f24 and f25 -# versions of the package -Requires(pre): /usr/sbin/alternatives -Recommends: graphviz -Recommends: ImageMagick -Obsoletes: python-sphinx <= 1.2.3 -Obsoletes: python-sphinxcontrib-napoleon < 0.5 -Provides: python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release} -Obsoletes: python2-Sphinx <= 1.3.1-4 -Provides: python2-Sphinx = %{?epoch}:%{version}-%{release} -Provides: python(Sphinx) = %{?epoch}:%{version}-%{release} -%{?python_provide:%python_provide python2-sphinx} -Conflicts: python3-sphinx < %{?epoch}:%{version}-%{release} - -%description -n python2-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 latex -Summary: LaTeX builder dependencies for %{name} -Requires: python(Sphinx) = %{?epoch}:%{version}-%{release} -Requires: texlive-collection-fontsrecommended -Requires: texlive-collection-latex -Requires: texlive-dvipng -Requires: texlive-dvisvgm -Requires: texlive-ucs -Requires: tex(cmap.sty) -Requires: tex(ecrm1000.tfm) -Requires: tex(footnote.sty) -Requires: tex(framed.sty) -Requires: tex(multirow.sty) -Requires: tex(parskip.sty) -Requires: tex(titlesec.sty) -Requires: tex(threeparttable.sty) -Requires: tex(upquote.sty) -Requires: tex(wrapfig.sty) -Requires: tex(capt-of.sty) -Requires: tex(needspace.sty) -Requires: tex(eqparbox.sty) -Requires: tex(amsmath.sty) -Requires: tex(amsthm.sty) -Requires: tex(amssymb.sty) -Requires: tex(amsfonts.sty) -Requires: tex(bm.sty) -Requires: tex(palatino.sty) -Requires: tex(multirow.sty) -Requires: tex(eqparbox.sty) -Requires: tex(atbegshi.sty) -Requires: tex(anyfontsize.sty) -Requires: tex(luatex85.sty) -Requires: tex(fncychap.sty) -Requires: tex(tabulary.sty) -Requires: tex(polyglossia.sty) -Requires: tex(ctablestack.sty) -Requires: tex(eu1enc.def) -Obsoletes: python3-sphinx-latex < 1.4.4-2 - -%description 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. - - -%if 0%{?with_python3} %package -n python3-sphinx Summary: Python documentation generator -Requires: python-sphinx-locale = %{?epoch}:%{version}-%{release} -Requires: python3-babel -Requires: python3-docutils -Requires: python3-jinja2 -Requires: python3-pygments -Requires: python3-mock -Requires: python3-snowballstemmer -Requires: python3-sphinx_rtd_theme -Requires: python3-sphinx-theme-alabaster -Requires: python3-imagesize -Requires: python3-requests -Requires: python3-six -Requires: python3-packaging -%if %{with websupport} -Requires: python3-sphinxcontrib-websupport -%endif + Recommends: graphviz Recommends: ImageMagick -Requires: environment(modules) -# Needed to get rid of the alternatives config installed in f24 and f25 -# versions of the package -Requires(pre): /usr/sbin/alternatives -Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 -Provides: python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release} -Provides: python(Sphinx) = %{?epoch}:%{version}-%{release} %{?python_provide:%python_provide python3-sphinx} -Conflicts: python2-Sphinx < %{?epoch}:%{version}-%{release} + +# Bundled JavaScript +Provides: bundled(jquery) = 3.2.1 +Provides: bundled(underscore) = 1.3.1 +Provides: bundled(css3-mediaqueries) = 1.0 + +# Remove in F33 +Obsoletes: python-sphinx-locale < 1:2 +Provides: python-sphinx-locale = %{epoch}:%{version}-%{release} +Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 +Provides: python3-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release} +Conflicts: python2-Sphinx < 1:2 +Conflicts: python2-sphinx < 1:2 +Provides: python(Sphinx) = %{epoch}:%{version}-%{release} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -361,13 +190,64 @@ the Python docs: * 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. -%endif # with_python3 + + +%package -n python3-sphinx-latex +Summary: LaTeX builder dependencies for python3-sphinx + +Requires: python3-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) + +%{?python_provide:%python_provide python3-sphinx-latex} + +# Remove in F33 +Obsoletes: python-sphinx-latex < 1:2 +Provides: python-sphinx-latex = %{epoch}:%{version}-%{release} + +%description -n python3-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} License: BSD -Requires: python(Sphinx) = %{?epoch}:%{version}-%{release} +Recommends: python3-sphinx = %{epoch}:%{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -380,24 +260,8 @@ useful to many other projects. This package contains documentation in reST and HTML formats. -%package locale -Summary: Locale files for %{name} -License: BSD - -%description locale -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 contains locale files for Sphinx - %prep -%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1 - -cp %{SOURCE5} . +%autosetup -n %{upstream_name}-%{upstream_version} -p1 # fix line encoding of bundled jquery.js dos2unix -k ./sphinx/themes/basic/static/jquery.js @@ -406,29 +270,13 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js rm tests/test_ext_imgconverter.py %endif -%if %{without websupport} -rm tests/test_websupport.py tests/test_api_translator.py -%endif - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif # with_python3 export PYTHONPATH=$PWD pushd doc -%if 0%{?with_python3} export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py" -%else -export SPHINXBUILD="%{__python2} ../sphinx/cmd/build.py" -%endif - make html SPHINXBUILD="$SPHINXBUILD" make man SPHINXBUILD="$SPHINXBUILD" rm -rf _build/html/.buildinfo @@ -437,58 +285,42 @@ popd %install -%if 0%{?with_python3} %py3_install + +# For backwards compatibility. Remove around Fedora 33 (with care) install -d %{buildroot}%{_libexecdir}/python3-sphinx for i in sphinx-{apidoc,autogen,build,quickstart}; do - mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} - ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3 - ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i + ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} + ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3 + ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python3-sphinx/$i done -%endif # with_python3 -%py2_install -install -d %{buildroot}%{_libexecdir}/python2-sphinx -for i in sphinx-{apidoc,autogen,build,quickstart}; do - mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version} - ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2 - ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i -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 - ### TODO: these are all the same. Do we really need to ship them three - ### times or is it fine to just ship them as e.g. sphinx-build.1 cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f) - cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|") - cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|") done - -# Remove language files, they're identical to the ones from the -# Python 2 build that will be moved to /usr/share below -find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \; popd -# Clean up non-python files -rm -f %{buildroot}%{python2_sitelib}/sphinx/locale/.DS_Store -rm -rf %{buildroot}%{python2_sitelib}/sphinx/locale/.tx -rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store -rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx - # 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}%{python2_sitelib} +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 \ @@ -499,37 +331,6 @@ do done popd -install -d %{buildroot}%{_modulesdir}/python-sphinx -install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/ -sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx -install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/ -sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx -install -d %{buildroot}%{_sysconfdir}/profile.d -install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh -install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh - -%if %{py3_default} -sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version - -# These symlinks establish a default for when a package is first installed (and -# therefore, environment modules is not loaded). The user can immediately -# switch them by using module swap python-sphinx/python2-sphinx -for filename in sphinx-{build,apidoc,autogen,quickstart} ; do - ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename -done - -%else -sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version - -# These symlinks establish a default for when a package is first installed (and -# therefore, environment modules is not loaded). The user can immediately -# switch them by using module swap python-sphinx/python3-sphinx -for filename in sphinx-{build,apidoc,autogen,quickstart} ; do - ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename -done - -%endif - %find_lang sphinx # Language files; Since these are javascript, it's not immediately obvious to @@ -541,79 +342,46 @@ done %if %{with tests} %check -export PYTHONPATH=$PWD +export PYTHONPATH=%{buildroot}%{python3_sitelib} +export PATH=%{buildroot}%{_bindir}:$PATH -# Currently, all linkcheck tests hit external websites. Since network access -# is disabled in koji, we have to disable these. -rm tests/test_build_linkcheck.py - -# Igoring test_api_translator for now as it fails on Fedora. -# The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710 -LANG=C.UTF-8 pytest-2 -%if 0%{?with_python3} -pushd %{py3dir} -# Currently, all linkcheck tests hit external websites. Since network access -# is disabled in koji, we have to disable these. -rm tests/test_build_linkcheck.py -pytest-3 -popd -%endif # with_python3 +# Currently, all linkcheck tests and test_latex_remote_images need internet +%{__python3} -m pytest \ +%if %{without internet} + -k "not linkcheck and not latex_remote_images" \ +%endif +; %endif # with tests -%files latex -%license LICENSE - -%files locale -f sphinx.lang +%files -n python3-sphinx -f sphinx.lang %license LICENSE +%doc AUTHORS CHANGES EXAMPLES README.rst +%{_bindir}/sphinx-* +%{python3_sitelib}/sphinx/ +%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/ +%{_libexecdir}/python3-sphinx/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* +%{_mandir}/man1/sphinx-* -%files -n python2-sphinx -%license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora -%{_bindir}/sphinx-*-2* -%{_bindir}/sphinx-build -%{_bindir}/sphinx-apidoc -%{_bindir}/sphinx-autogen -%{_bindir}/sphinx-quickstart -%{python2_sitelib}/sphinx/ -%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/ -%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1* -%{_mandir}/man1/* -%{_libexecdir}/python2-sphinx/ -%{_modulesdir}/python-sphinx/python2-sphinx -%if !%{py3_default} -%{_modulesdir}/python-sphinx/.version -%endif -%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh -%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh -%if 0%{?with_python3} +%files -n python3-sphinx-latex +# empty, this is a metapackage -%files -n python3-sphinx -%license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora -%{_bindir}/sphinx-*-3* -%{python3_sitelib}/sphinx/ -%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/ -%{_mandir}/man1/sphinx-*-%{python3_version}.1* -%{_libexecdir}/python3-sphinx/ -%{_modulesdir}/python-sphinx/python3-sphinx -%if %{py3_default} -%{_modulesdir}/python-sphinx/.version -%endif -%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh -%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh - -%endif # with_python3 %files doc +%license LICENSE %doc html reST %changelog +* Wed Feb 27 2019 Miro Hrončok - 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 - 1:1.8.4-1 - Update to 1.8.4. diff --git a/python2-sphinx b/python2-sphinx deleted file mode 100644 index e015ae6..0000000 --- a/python2-sphinx +++ /dev/null @@ -1,6 +0,0 @@ -#%Module 1.0 -# -# python2-sphinx module for use with 'environment modules' package -# -conflict python-sphinx -prepend-path PATH @python2_sphinx_dir@ diff --git a/python3-sphinx b/python3-sphinx deleted file mode 100644 index 6d79fad..0000000 --- a/python3-sphinx +++ /dev/null @@ -1,6 +0,0 @@ -#%Module 1.0 -# -# python2-sphinx module for use with 'environment modules' package -# -conflict python-sphinx -prepend-path PATH @python3_sphinx_dir@ diff --git a/sources b/sources index 77c68f2..b59a4c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.8.4.tar.gz) = 6821bb56c30b52f357ae55f5db45f056883c457eae62a0751a2b654519a07bca9edccb7678b29fa380379f059c9d8899d9e7b06ceccca5ec26962e6f83bb8578 +SHA512 (Sphinx-2.0.0b1.tar.gz) = 6f6e90a152c9ebf96f5ded2966b70e9bb203a1444ada8a0f31a71973d4f475b4dae891119752447f810837c91791c1325c5182d3608f089a09ce797d007c71ee diff --git a/xfail-test_latex_remote_images.patch b/xfail-test_latex_remote_images.patch deleted file mode 100644 index 16e4ddd..0000000 --- a/xfail-test_latex_remote_images.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py -index 55f48cd..78ccecd 100644 ---- a/tests/test_build_latex.py -+++ b/tests/test_build_latex.py -@@ -1009,7 +1009,7 @@ def test_latex_raw_directive(app, status, warning): - assert 'HTML: abc ghi' in result - assert 'LaTeX: abc def ghi' in result - -- -+@pytest.mark.xfail(reason="this test requires internet connection") - @pytest.mark.sphinx('latex', testroot='images') - def test_latex_remote_images(app, status, warning): - app.builder.build_all() diff --git a/zz-modules-python-sphinx.csh b/zz-modules-python-sphinx.csh deleted file mode 100644 index d85799f..0000000 --- a/zz-modules-python-sphinx.csh +++ /dev/null @@ -1,2 +0,0 @@ -# Add path to the default python-sphinx scripts on this version of Fedora -module load python-sphinx >& /dev/null diff --git a/zz-modules-python-sphinx.sh b/zz-modules-python-sphinx.sh deleted file mode 100644 index af36d40..0000000 --- a/zz-modules-python-sphinx.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Add path to the default python-sphinx scripts on this version of Fedora -module load python-sphinx 2> /dev/null From 7cdc32e4ae518d60411c79be9c73168be8c7c731 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Wed, 27 Mar 2019 16:51:14 +0100 Subject: [PATCH 119/234] Update to version 2.0.0b2 --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db9788f..d348deb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /Sphinx-1.7.6.tar.gz /Sphinx-1.8.4.tar.gz /Sphinx-2.0.0b1.tar.gz +/Sphinx-2.0.0b2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 7769849..2fd4fa3 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -20,7 +20,7 @@ Name: python-sphinx %global general_version 2.0.0 -%global prerel b1 +%global prerel b2 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -348,7 +348,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH # Currently, all linkcheck tests and test_latex_remote_images need internet %{__python3} -m pytest \ %if %{without internet} - -k "not linkcheck and not latex_remote_images" \ + -k "not linkcheck and not latex_remote_images and not test_latex_images" \ %endif ; %endif # with tests @@ -377,6 +377,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 +- Update to 2.0.0b2 + * Wed Feb 27 2019 Miro Hrončok - 1:2.0.0~b1-1 - Update to 2.0.0b1 - Drop Python 2 package diff --git a/sources b/sources index b59a4c6..2a08793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.0.0b1.tar.gz) = 6f6e90a152c9ebf96f5ded2966b70e9bb203a1444ada8a0f31a71973d4f475b4dae891119752447f810837c91791c1325c5182d3608f089a09ce797d007c71ee +SHA512 (Sphinx-2.0.0b2.tar.gz) = d1b7e593fac3e7187f6c4237be95fd4e6076ffe5672a0a3c672858936f8b8ca89ae04365bd2a224287f50923d1739f9c0a6032a8f879587b1227a180d4758b69 From 833015ffe7862c4ed5d9234723550d44287f5ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 10 Apr 2019 17:17:55 +0200 Subject: [PATCH 120/234] Update to 2.0.1 (#1697544) --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d348deb..c29e4f7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /Sphinx-1.8.4.tar.gz /Sphinx-2.0.0b1.tar.gz /Sphinx-2.0.0b2.tar.gz +/Sphinx-2.0.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 2fd4fa3..8e407ac 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -19,8 +19,8 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 2.0.0 -%global prerel b2 +%global general_version 2.0.1 +#global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -377,6 +377,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 +- Update to 2.0.1 (#1697544) + * Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 - Update to 2.0.0b2 diff --git a/sources b/sources index 2a08793..1e9bc2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.0.0b2.tar.gz) = d1b7e593fac3e7187f6c4237be95fd4e6076ffe5672a0a3c672858936f8b8ca89ae04365bd2a224287f50923d1739f9c0a6032a8f879587b1227a180d4758b69 +SHA512 (Sphinx-2.0.1.tar.gz) = 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b From dbb50a5e0f7114fa65d9b1edcd81b47a3d577094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 10 Apr 2019 17:25:51 +0200 Subject: [PATCH 121/234] Own the sphinxcontrib directory (#1669790) --- python-sphinx.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 8e407ac..d844fc2 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -331,6 +331,10 @@ do 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 @@ -359,6 +363,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-* %{python3_sitelib}/sphinx/ +%dir %{python3_sitelib}/sphinxcontrib/ %{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/ %{_libexecdir}/python3-sphinx/ %dir %{_datadir}/sphinx/ @@ -379,6 +384,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog * Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 - Update to 2.0.1 (#1697544) +- Own the sphinxcontrib directory (#1669790) * Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 - Update to 2.0.0b2 From 90754897abe81d6e18f543951407a42fe2e65bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 23 Jun 2019 12:29:55 +0200 Subject: [PATCH 122/234] Update to 2.1.2 (#1716158) --- .gitignore | 1 + python-sphinx.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c29e4f7..49bda41 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /Sphinx-2.0.0b1.tar.gz /Sphinx-2.0.0b2.tar.gz /Sphinx-2.0.1.tar.gz +/Sphinx-2.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index d844fc2..27bc230 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -19,7 +19,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 2.0.1 +%global general_version 2.1.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -68,6 +68,9 @@ BuildRequires: python3-sphinxcontrib-websupport BuildRequires: dos2unix %if %{with tests} +# tests import _testcapi +BuildRequires: python3-test + BuildRequires: python3-html5lib BuildRequires: python3-mock BuildRequires: python3-pytest @@ -355,7 +358,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH -k "not linkcheck and not latex_remote_images and not test_latex_images" \ %endif ; -%endif # with tests +%endif %files -n python3-sphinx -f sphinx.lang @@ -382,6 +385,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sun Jun 23 2019 Miro Hrončok - 1:2.1.2-1 +- Update to 2.1.2 (#1716158) + * Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 - Update to 2.0.1 (#1697544) - Own the sphinxcontrib directory (#1669790) diff --git a/sources b/sources index 1e9bc2d..1c13ce2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.0.1.tar.gz) = 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b +SHA512 (Sphinx-2.1.2.tar.gz) = 22696cd143b75c497c36e08b81b10981e80ad10a4f9f42a29165bfed18bacbc33dc2f477926fe795faf9918dce9d283cd1acf03f7289bd50fa93a86e7979d9f1 From e85e617e785ccea1c1ee72ff6827c4bd1e9ce1f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 16:23:39 +0000 Subject: [PATCH 123/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 27bc230..1386cd5 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -23,7 +23,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -385,6 +385,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1:2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Jun 23 2019 Miro Hrončok - 1:2.1.2-1 - Update to 2.1.2 (#1716158) From 8c43a53ed73da5d4d92556034d08b8360ccfb911 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 15 Aug 2019 01:28:28 -0500 Subject: [PATCH 124/234] Rebuild for Python 3.8. --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 1386cd5..8e92602 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -23,7 +23,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -385,6 +385,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Thu Aug 15 2019 Richard Shaw - 1:2.1.2-3 +- Rebuild for Python 3.8. + * Fri Jul 26 2019 Fedora Release Engineering - 1:2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a06c535b39062714878cc76beb7f2cea8da5623e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 17:31:12 +0200 Subject: [PATCH 125/234] Bootstrap for Python 3.8 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 8e92602..4df6b10 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -23,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -385,6 +387,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Thu Aug 15 2019 Miro Hrončok - 1:2.1.2-4 +- Bootstrap for Python 3.8 + * Thu Aug 15 2019 Richard Shaw - 1:2.1.2-3 - Rebuild for Python 3.8. From 92839f3f56b5b41de8acf743948957ea558bf31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 15:31:19 +0200 Subject: [PATCH 126/234] Rebuilt for Python 3.8 --- python-sphinx.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4df6b10..ba9174f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -25,7 +23,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Python documentation generator @@ -387,6 +385,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Aug 16 2019 Miro Hrončok - 1:2.1.2-5 +- Rebuilt for Python 3.8 + * Thu Aug 15 2019 Miro Hrončok - 1:2.1.2-4 - Bootstrap for Python 3.8 From a42c28ce7c96e2a7eeb01ddd3f5e5ee1a672b5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 16:09:54 +0200 Subject: [PATCH 127/234] Deselect test_gettext_definition_terms, test_text_definition_terms --- python-sphinx.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index ba9174f..c73a79d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -353,9 +353,10 @@ export PYTHONPATH=%{buildroot}%{python3_sitelib} export PATH=%{buildroot}%{_bindir}:$PATH # Currently, all linkcheck tests and test_latex_remote_images need internet +# XXX investigate test_gettext_definition_terms test_text_definition_terms %{__python3} -m pytest \ %if %{without internet} - -k "not linkcheck and not latex_remote_images and not test_latex_images" \ + -k "not linkcheck and not latex_remote_images and not test_latex_images and not test_gettext_definition_terms and not test_text_definition_terms" \ %endif ; %endif From fea4d52ef1739064e42e6a8512a3d26175e4113e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:31:05 +0200 Subject: [PATCH 128/234] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c73a79d..31f880d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -23,7 +23,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Python documentation generator @@ -386,6 +386,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Fri Aug 16 2019 Miro Hrončok - 1:2.1.2-5 - Rebuilt for Python 3.8 From 3a5b12f6882ed762637c8cbd1030a0692a6a2f05 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 10 Dec 2019 17:49:04 +0100 Subject: [PATCH 129/234] Update to 2.2.0 (rhbz#1743018) --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49bda41..94f48fa 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /Sphinx-2.0.0b2.tar.gz /Sphinx-2.0.1.tar.gz /Sphinx-2.1.2.tar.gz +/Sphinx-2.2.0.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 31f880d..66e6b0d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -19,11 +19,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 2.1.2 +%global general_version 2.2.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 6%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -386,6 +386,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Tue Dec 10 2019 Charalampos Stratakis - 1:2.2.0-1 +- Update to 2.2.0 (rhbz#1743018) + * Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 1c13ce2..16319bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.1.2.tar.gz) = 22696cd143b75c497c36e08b81b10981e80ad10a4f9f42a29165bfed18bacbc33dc2f477926fe795faf9918dce9d283cd1acf03f7289bd50fa93a86e7979d9f1 +SHA512 (Sphinx-2.2.0.tar.gz) = 5d5832a6e966782ced58ecfe26e164636ef9433862c3ed299663f69c90d5d1173bbaf9d29410939d35163e740a1aeb6db460e8fdcf6b92eadfcb6e88a2fbcc38 From 153c8a4054b2a8cdf85f9b6ff6f85ce0722f22c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Dec 2019 18:00:39 +0100 Subject: [PATCH 130/234] Update to 2.2.2 (rhbz#1743018) --- .gitignore | 1 + python-sphinx.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 94f48fa..cde7b57 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /Sphinx-2.0.1.tar.gz /Sphinx-2.1.2.tar.gz /Sphinx-2.2.0.tar.gz +/Sphinx-2.2.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 66e6b0d..96f088d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -19,7 +19,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 2.2.0 +%global general_version 2.2.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -386,8 +386,8 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog -* Tue Dec 10 2019 Charalampos Stratakis - 1:2.2.0-1 -- Update to 2.2.0 (rhbz#1743018) +* Tue Dec 10 2019 Miro Hrončok - 1:2.2.2-1 +- Update to 2.2.2 (rhbz#1743018) * Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 16319bd..84a6655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.2.0.tar.gz) = 5d5832a6e966782ced58ecfe26e164636ef9433862c3ed299663f69c90d5d1173bbaf9d29410939d35163e740a1aeb6db460e8fdcf6b92eadfcb6e88a2fbcc38 +SHA512 (Sphinx-2.2.2.tar.gz) = 2aaed5980c6fb3bf1a8b2911bbf5d7b8a2d9356e2e9faad58e9ac93e76f76e0c5f40243774553a719dfe982e5e683821545db56142cd8e3db914e97e363124f1 From 63a8f7aefb969fd3df6ef5112d8645e47ec6276f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Dec 2019 18:10:22 +0100 Subject: [PATCH 131/234] Stop skipping some tests that used to fail --- python-sphinx.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 96f088d..7c07a89 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -352,11 +352,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib export PYTHONPATH=%{buildroot}%{python3_sitelib} export PATH=%{buildroot}%{_bindir}:$PATH -# Currently, all linkcheck tests and test_latex_remote_images need internet -# XXX investigate test_gettext_definition_terms test_text_definition_terms +# Currently, all linkcheck tests and test_latex_images need internet %{__python3} -m pytest \ %if %{without internet} - -k "not linkcheck and not latex_remote_images and not test_latex_images and not test_gettext_definition_terms and not test_text_definition_terms" \ + -k "not linkcheck and not test_latex_images" \ %endif ; %endif From bf5a2d48d8085a256bb54501b0ad4a50c26995b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 15:25:27 +0000 Subject: [PATCH 132/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7c07a89..6f87b99 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -23,7 +23,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -385,6 +385,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1:2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Dec 10 2019 Miro Hrončok - 1:2.2.2-1 - Update to 2.2.2 (rhbz#1743018) From d237e99bb9e320a539e2e653f8cc92a821244266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 11 May 2020 13:19:19 +0200 Subject: [PATCH 133/234] Fix tests for Python3.9.0a5+ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1829705 --- ffb1ca3a.patch | 22 ++++++++++++++++++++++ python-sphinx.spec | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 ffb1ca3a.patch diff --git a/ffb1ca3a.patch b/ffb1ca3a.patch new file mode 100644 index 0000000..6977cbd --- /dev/null +++ b/ffb1ca3a.patch @@ -0,0 +1,22 @@ +From ffb1ca3aaafe86b6bc44fe28e4000477e97ba3e8 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +Date: Sat, 18 Apr 2020 19:53:18 +0900 +Subject: [PATCH] test: Add a docstring to avoid an error on py39a5+ + +--- + tests/roots/test-ext-autodoc/target/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/roots/test-ext-autodoc/target/__init__.py b/tests/roots/test-ext-autodoc/target/__init__.py +index e28eeef8a6..b6684ee85b 100644 +--- a/tests/roots/test-ext-autodoc/target/__init__.py ++++ b/tests/roots/test-ext-autodoc/target/__init__.py +@@ -145,6 +145,8 @@ def prop2(self): + + + class StrRepr(str): ++ """docstring""" ++ + def __repr__(self): + return self + diff --git a/python-sphinx.spec b/python-sphinx.spec index 6f87b99..26ef433 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -40,6 +40,9 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff +# Backport: test: Add a docstring to avoid an error on py39a5+ +Patch2: https://github.com/sphinx-doc/sphinx/commit/ffb1ca3a.patch + BuildArch: noarch BuildRequires: python3-devel From 7afb2d61aa4ba3551474d740f56322dc83b209ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 20 May 2020 09:58:05 +0200 Subject: [PATCH 134/234] Skip latex tests See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/ILL6SD5U74RTVPDEK4WU743USLSQCIA3/ --- python-sphinx.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index 26ef433..0b6c8dd 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -15,6 +15,8 @@ %bcond_without imagemagick_tests %endif +# During texlive updates, sometimes the latex environment is unstable +%bcond_with latex_tests %global upstream_name Sphinx @@ -87,6 +89,7 @@ BuildRequires: texinfo BuildRequires: ImageMagick %endif +%if %{with latex_tests} BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latex BuildRequires: texlive-dvipng @@ -117,6 +120,7 @@ BuildRequires: tex(upquote.sty) BuildRequires: tex(utf8x.def) BuildRequires: tex(wrapfig.sty) %endif +%endif %description From 23b5cdf21e0a4a96acedc46e56778cb1003aad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 May 2020 17:34:35 +0200 Subject: [PATCH 135/234] Backport another patch from upstream for Python 3.9 support --- 46372726.patch | 41 +++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 4 ++++ 2 files changed, 45 insertions(+) create mode 100644 46372726.patch diff --git a/46372726.patch b/46372726.patch new file mode 100644 index 0000000..ec60f7b --- /dev/null +++ b/46372726.patch @@ -0,0 +1,41 @@ +From f236cd03e4853fd8b07a307e334c5110a78c1335 Mon Sep 17 00:00:00 2001 +From: Eric Wieser +Date: Mon, 27 Apr 2020 14:44:37 +0100 +Subject: [PATCH] Do not emit type arguments twice + +Fixes gh-7567 +--- + sphinx/util/inspect.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py +index 20af75628..4977af07f 100644 +--- a/sphinx/util/inspect.py ++++ b/sphinx/util/inspect.py +@@ -505,8 +505,13 @@ class Signature: + qualname = self.format_annotation(annotation.__origin__) # ex. Union + elif hasattr(annotation, '__qualname__'): + qualname = '%s.%s' % (module, annotation.__qualname__) ++ elif hasattr(annotation, '__origin__'): ++ # instantiated generic provided by a user ++ qualname = self.format_annotation(annotation.__origin__) + else: +- qualname = repr(annotation) ++ # we weren't able to extract the base type, appending arguments would ++ # only make them appear twice ++ return repr(annotation) + + if getattr(annotation, '__args__', None): + if qualname == 'Union': +@@ -519,7 +524,7 @@ class Signature: + args = ', '.join(self.format_annotation(a) for a in annotation.__args__[:-1]) + returns = self.format_annotation(annotation.__args__[-1]) + return '%s[[%s], %s]' % (qualname, args, returns) +- elif annotation._special: ++ elif getattr(annotation, '_special', False): + return qualname + else: + args = ', '.join(self.format_annotation(a) for a in annotation.__args__) +-- +2.26.2 + diff --git a/python-sphinx.spec b/python-sphinx.spec index 0b6c8dd..064abda 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -45,6 +45,10 @@ Patch1: sphinx-test_theming.diff # Backport: test: Add a docstring to avoid an error on py39a5+ Patch2: https://github.com/sphinx-doc/sphinx/commit/ffb1ca3a.patch +# Backport: Do not emit type arguments twice (needed for Python 3.9) +# Rebased from https://github.com/sphinx-doc/sphinx/commit/46372726 +Patch3: 46372726.patch + BuildArch: noarch BuildRequires: python3-devel From 19463ebbdd8532c5d6dc08768732e39621b04a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 19:20:34 +0200 Subject: [PATCH 136/234] Bootstrap for Python 3.9 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 064abda..5d60035 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -25,7 +27,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -396,6 +398,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri May 22 2020 Miro Hrončok - 1:2.2.2-3 +- Bootstrap for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 1:2.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 1a1e29e5a888acf94a78f72b7568063a619ef845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 09:21:40 +0200 Subject: [PATCH 137/234] Rebuilt for Python 3.9 --- python-sphinx.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 5d60035..d28b2ae 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -27,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -398,6 +396,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 1:2.2.2-3 - Bootstrap for Python 3.9 From 95033b7db023025f1829d5f4a3e58be78961c184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 28 May 2020 20:46:34 +0200 Subject: [PATCH 138/234] Reenable latex tests --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d28b2ae..069c2e4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -16,7 +16,7 @@ %endif # During texlive updates, sometimes the latex environment is unstable -%bcond_with latex_tests +%bcond_without latex_tests %global upstream_name Sphinx From e4c8578188e7aa0f85e3ea4ece8fff65e4a9e387 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 30 Jun 2020 17:48:30 +0200 Subject: [PATCH 139/234] Update to 3.1.1 (#1783776) --- .gitignore | 1 + 46372726.patch | 41 ----------------------------------------- ffb1ca3a.patch | 22 ---------------------- python-sphinx.spec | 14 +++++--------- sources | 2 +- 5 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 46372726.patch delete mode 100644 ffb1ca3a.patch diff --git a/.gitignore b/.gitignore index cde7b57..80d3fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /Sphinx-2.1.2.tar.gz /Sphinx-2.2.0.tar.gz /Sphinx-2.2.2.tar.gz +/Sphinx-3.1.1.tar.gz diff --git a/46372726.patch b/46372726.patch deleted file mode 100644 index ec60f7b..0000000 --- a/46372726.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f236cd03e4853fd8b07a307e334c5110a78c1335 Mon Sep 17 00:00:00 2001 -From: Eric Wieser -Date: Mon, 27 Apr 2020 14:44:37 +0100 -Subject: [PATCH] Do not emit type arguments twice - -Fixes gh-7567 ---- - sphinx/util/inspect.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py -index 20af75628..4977af07f 100644 ---- a/sphinx/util/inspect.py -+++ b/sphinx/util/inspect.py -@@ -505,8 +505,13 @@ class Signature: - qualname = self.format_annotation(annotation.__origin__) # ex. Union - elif hasattr(annotation, '__qualname__'): - qualname = '%s.%s' % (module, annotation.__qualname__) -+ elif hasattr(annotation, '__origin__'): -+ # instantiated generic provided by a user -+ qualname = self.format_annotation(annotation.__origin__) - else: -- qualname = repr(annotation) -+ # we weren't able to extract the base type, appending arguments would -+ # only make them appear twice -+ return repr(annotation) - - if getattr(annotation, '__args__', None): - if qualname == 'Union': -@@ -519,7 +524,7 @@ class Signature: - args = ', '.join(self.format_annotation(a) for a in annotation.__args__[:-1]) - returns = self.format_annotation(annotation.__args__[-1]) - return '%s[[%s], %s]' % (qualname, args, returns) -- elif annotation._special: -+ elif getattr(annotation, '_special', False): - return qualname - else: - args = ', '.join(self.format_annotation(a) for a in annotation.__args__) --- -2.26.2 - diff --git a/ffb1ca3a.patch b/ffb1ca3a.patch deleted file mode 100644 index 6977cbd..0000000 --- a/ffb1ca3a.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ffb1ca3aaafe86b6bc44fe28e4000477e97ba3e8 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -Date: Sat, 18 Apr 2020 19:53:18 +0900 -Subject: [PATCH] test: Add a docstring to avoid an error on py39a5+ - ---- - tests/roots/test-ext-autodoc/target/__init__.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/roots/test-ext-autodoc/target/__init__.py b/tests/roots/test-ext-autodoc/target/__init__.py -index e28eeef8a6..b6684ee85b 100644 ---- a/tests/roots/test-ext-autodoc/target/__init__.py -+++ b/tests/roots/test-ext-autodoc/target/__init__.py -@@ -145,6 +145,8 @@ def prop2(self): - - - class StrRepr(str): -+ """docstring""" -+ - def __repr__(self): - return self - diff --git a/python-sphinx.spec b/python-sphinx.spec index 069c2e4..71bb040 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,11 +21,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 2.2.2 +%global general_version 3.1.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -42,13 +42,6 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff -# Backport: test: Add a docstring to avoid an error on py39a5+ -Patch2: https://github.com/sphinx-doc/sphinx/commit/ffb1ca3a.patch - -# Backport: Do not emit type arguments twice (needed for Python 3.9) -# Rebased from https://github.com/sphinx-doc/sphinx/commit/46372726 -Patch3: 46372726.patch - BuildArch: noarch BuildRequires: python3-devel @@ -396,6 +389,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 +- Update to 3.1.1 (#1783776) + * Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 84a6655..33594ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-2.2.2.tar.gz) = 2aaed5980c6fb3bf1a8b2911bbf5d7b8a2d9356e2e9faad58e9ac93e76f76e0c5f40243774553a719dfe982e5e683821545db56142cd8e3db914e97e363124f1 +SHA512 (Sphinx-3.1.1.tar.gz) = 0c97cab085b1d8152cefde73a7e2116e83426a1ff071c8be9b37ae8e8cf82e9abefacad2cb37a86e1754fbdf57a8dc05ee3041d7dde506fa103babb82c380293 From 686ccb777b11449ea101289374bb5c59ad81e532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 30 Jun 2020 18:28:53 +0200 Subject: [PATCH 140/234] Fix e-mail address in changelog --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 71bb040..ce9b7b4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -389,7 +389,7 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog -* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 +* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 - Update to 3.1.1 (#1783776) * Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 From 39005de2f4047afbafc9434df6c506855c637fc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 03:58:57 +0000 Subject: [PATCH 141/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index ce9b7b4..642659e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -389,6 +389,9 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1:3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 - Update to 3.1.1 (#1783776) From 1d11fd11e24c61a0d04d0b2aef7f45106f3640bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Aug 2020 02:03:30 +0200 Subject: [PATCH 142/234] Update to 3.1.2 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1853901 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 80d3fa7..a63ee1a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /Sphinx-2.2.0.tar.gz /Sphinx-2.2.2.tar.gz /Sphinx-3.1.1.tar.gz +/Sphinx-3.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 642659e..27f556a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,11 +21,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.1.1 +%global general_version 3.1.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -389,6 +389,10 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Fri Aug 07 2020 Miro Hrončok - 1:3.1.2-1 +- Update to 3.1.2 +- Fixes rhbz#1853901 + * Wed Jul 29 2020 Fedora Release Engineering - 1:3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 33594ab..eca1bd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.1.1.tar.gz) = 0c97cab085b1d8152cefde73a7e2116e83426a1ff071c8be9b37ae8e8cf82e9abefacad2cb37a86e1754fbdf57a8dc05ee3041d7dde506fa103babb82c380293 +SHA512 (Sphinx-3.1.2.tar.gz) = d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9 From 884ff2afc1463b0fd2ec49ef18d28ff3ce2679b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sat, 8 Aug 2020 20:54:13 +0200 Subject: [PATCH 143/234] spec: replace hardcoded python3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric Pierret (fepitre) --- python-sphinx.spec | 76 +++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 27f556a..ddfcde0 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -44,26 +44,26 @@ Patch1: sphinx-test_theming.diff BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python3-babel -BuildRequires: python3-docutils -BuildRequires: python3-imagesize -BuildRequires: python3-jinja2 -BuildRequires: python3-packaging -BuildRequires: python3-pygments -BuildRequires: python3-requests -BuildRequires: python3-sphinxcontrib-applehelp -BuildRequires: python3-sphinxcontrib-devhelp -BuildRequires: python3-sphinxcontrib-htmlhelp -BuildRequires: python3-sphinxcontrib-jsmath -BuildRequires: python3-sphinxcontrib-qthelp -BuildRequires: python3-sphinxcontrib-serializinghtml -BuildRequires: python3-sphinx-theme-alabaster +BuildRequires: python%{python3_pkgversion}-babel +BuildRequires: python%{python3_pkgversion}-docutils +BuildRequires: python%{python3_pkgversion}-imagesize +BuildRequires: python%{python3_pkgversion}-jinja2 +BuildRequires: python%{python3_pkgversion}-packaging +BuildRequires: python%{python3_pkgversion}-pygments +BuildRequires: python%{python3_pkgversion}-requests +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-applehelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-jsmath +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml +BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster %if %{with websupport} -BuildRequires: python3-sphinxcontrib-websupport +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport %endif # for fixes @@ -71,12 +71,12 @@ BuildRequires: dos2unix %if %{with tests} # tests import _testcapi -BuildRequires: python3-test +BuildRequires: python%{python3_pkgversion}-test -BuildRequires: python3-html5lib -BuildRequires: python3-mock -BuildRequires: python3-pytest -BuildRequires: python3-snowballstemmer +BuildRequires: python%{python3_pkgversion}-html5lib +BuildRequires: python%{python3_pkgversion}-mock +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-snowballstemmer BuildRequires: gettext BuildRequires: graphviz @@ -149,12 +149,12 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package -n python3-sphinx +%package -n python%{python3_pkgversion}-sphinx Summary: Python documentation generator Recommends: graphviz Recommends: ImageMagick -%{?python_provide:%python_provide python3-sphinx} +%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx} # Bundled JavaScript Provides: bundled(jquery) = 3.2.1 @@ -164,13 +164,13 @@ Provides: bundled(css3-mediaqueries) = 1.0 # Remove in F33 Obsoletes: python-sphinx-locale < 1:2 Provides: python-sphinx-locale = %{epoch}:%{version}-%{release} -Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0 -Provides: python3-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release} +Obsoletes: python%{python3_pkgversion}-sphinxcontrib-napoleon < 0.3.0 +Provides: python%{python3_pkgversion}-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release} Conflicts: python2-Sphinx < 1:2 Conflicts: python2-sphinx < 1:2 Provides: python(Sphinx) = %{epoch}:%{version}-%{release} -%description -n python3-sphinx +%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 @@ -199,10 +199,10 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package -n python3-sphinx-latex -Summary: LaTeX builder dependencies for python3-sphinx +%package -n python%{python3_pkgversion}-sphinx-latex +Summary: LaTeX builder dependencies for python%{python3_pkgversion}-sphinx -Requires: python3-sphinx = %{epoch}:%{version}-%{release} +Requires: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release} Requires: texlive-collection-fontsrecommended Requires: texlive-collection-latex Requires: texlive-dvipng @@ -233,13 +233,13 @@ Requires: tex(upquote.sty) Requires: tex(utf8x.def) Requires: tex(wrapfig.sty) -%{?python_provide:%python_provide python3-sphinx-latex} +%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx-latex} # Remove in F33 Obsoletes: python-sphinx-latex < 1:2 Provides: python-sphinx-latex = %{epoch}:%{version}-%{release} -%description -n python3-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 @@ -254,7 +254,7 @@ builder. %package doc Summary: Documentation for %{name} License: BSD -Recommends: python3-sphinx = %{epoch}:%{version}-%{release} +Recommends: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release} %description doc Sphinx is a tool that makes it easy to create intelligent and @@ -295,11 +295,11 @@ popd %py3_install # For backwards compatibility. Remove around Fedora 33 (with care) -install -d %{buildroot}%{_libexecdir}/python3-sphinx +install -d %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3 - ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python3-sphinx/$i + ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx/$i done # Clean up non-python files @@ -365,21 +365,21 @@ export PATH=%{buildroot}%{_bindir}:$PATH %endif -%files -n python3-sphinx -f sphinx.lang +%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang %license LICENSE %doc AUTHORS CHANGES EXAMPLES README.rst %{_bindir}/sphinx-* %{python3_sitelib}/sphinx/ %dir %{python3_sitelib}/sphinxcontrib/ %{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/ -%{_libexecdir}/python3-sphinx/ +%{_libexecdir}/python%{python3_pkgversion}-sphinx/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* %{_mandir}/man1/sphinx-* -%files -n python3-sphinx-latex +%files -n python%{python3_pkgversion}-sphinx-latex # empty, this is a metapackage From 5bf9c0647924debd31bbe6207820536311cbf48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 Aug 2020 13:05:00 +0200 Subject: [PATCH 144/234] Update to 3.2.1 - Remove compatibility symbolic links from /usr/libexec/ - Use %pytest --- .gitignore | 1 + python-sphinx.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a63ee1a..ab3e126 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /Sphinx-2.2.2.tar.gz /Sphinx-3.1.1.tar.gz /Sphinx-3.1.2.tar.gz +/Sphinx-3.2.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index ddfcde0..4e3f8b1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,7 +21,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.1.2 +%global general_version 3.2.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -294,12 +294,10 @@ popd %install %py3_install -# For backwards compatibility. Remove around Fedora 33 (with care) -install -d %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx +# For backwards compatibility. Remove with care, if at all for i in sphinx-{apidoc,autogen,build,quickstart}; do ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version} ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3 - ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx/$i done # Clean up non-python files @@ -353,11 +351,8 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %if %{with tests} %check -export PYTHONPATH=%{buildroot}%{python3_sitelib} -export PATH=%{buildroot}%{_bindir}:$PATH - # Currently, all linkcheck tests and test_latex_images need internet -%{__python3} -m pytest \ +%pytest \ %if %{without internet} -k "not linkcheck and not test_latex_images" \ %endif @@ -372,7 +367,6 @@ export PATH=%{buildroot}%{_bindir}:$PATH %{python3_sitelib}/sphinx/ %dir %{python3_sitelib}/sphinxcontrib/ %{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/ -%{_libexecdir}/python%{python3_pkgversion}-sphinx/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* @@ -389,6 +383,11 @@ export PATH=%{buildroot}%{_bindir}:$PATH %changelog +* Tue Aug 18 2020 Miro Hrončok - 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 - 1:3.1.2-1 - Update to 3.1.2 - Fixes rhbz#1853901 diff --git a/sources b/sources index eca1bd6..78ae4bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.1.2.tar.gz) = d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9 +SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb From 976a71363dab1064b9376ee3be420785da894b56 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Wed, 14 Oct 2020 10:03:17 +0200 Subject: [PATCH 145/234] Backport commit to fix sphinx with latest version of pygments --- ...4a2e88ea71edc728aff3b078d34c2f374f06.patch | 36 +++++++++++++++++++ python-sphinx.spec | 10 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 85b24a2e88ea71edc728aff3b078d34c2f374f06.patch diff --git a/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch b/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch new file mode 100644 index 0000000..99c8180 --- /dev/null +++ b/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch @@ -0,0 +1,36 @@ +From 85b24a2e88ea71edc728aff3b078d34c2f374f06 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +Date: Sun, 13 Sep 2020 09:16:32 +0900 +Subject: [PATCH] Fix our test failed with pygments-2.7.0 + +Since pygments-2.7.0, it has changed the style of output HTML. +That makes our test broken. This fixes it to pass with new pygments. +--- + tests/test_build_html.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/tests/test_build_html.py b/tests/test_build_html.py +index e949f11572..1efc6c14a6 100644 +--- a/tests/test_build_html.py ++++ b/tests/test_build_html.py +@@ -10,8 +10,10 @@ + + import os + import re ++from distutils.version import LooseVersion + from itertools import cycle, chain + ++import pygments + import pytest + from html5lib import HTMLParser + +@@ -1591,4 +1593,8 @@ def test_html_codeblock_linenos_style_inline(app): + app.build() + content = (app.outdir / 'index.html').read_text() + +- assert '1 ' in content ++ pygments_version = tuple(LooseVersion(pygments.__version__).version) ++ if pygments_version > (2, 7): ++ assert '1' in content ++ else: ++ assert '1 ' in content diff --git a/python-sphinx.spec b/python-sphinx.spec index 4e3f8b1..73e5299 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -42,6 +42,11 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff +# Latest version of python-pygments (2.7.1) breaks python-sphinx. +# It is already fixed in upstream and this patch can be removed +# once new version of python-sphinx is released. +Patch2: https://github.com/sphinx-doc/sphinx/commit/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -383,6 +388,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Oct 14 2020 Tomas Hrnciar - 1:3.2.1-2 +- Backport commit to fix python-sphinx with python-pygments v2.7.1 + * Tue Aug 18 2020 Miro Hrončok - 1:3.2.1-1 - Update to 3.2.1 - Remove compatibility symbolic links from /usr/libexec/ From 9e608a0fa5483dffbf664d8de29bda8ae86a93aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Nov 2020 21:27:41 +0100 Subject: [PATCH 146/234] Update to 3.3.1 --- .gitignore | 1 + ...4a2e88ea71edc728aff3b078d34c2f374f06.patch | 36 ------------------- python-sphinx.spec | 15 ++++---- sources | 2 +- 4 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 85b24a2e88ea71edc728aff3b078d34c2f374f06.patch diff --git a/.gitignore b/.gitignore index ab3e126..a0af189 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /Sphinx-3.1.1.tar.gz /Sphinx-3.1.2.tar.gz /Sphinx-3.2.1.tar.gz +/Sphinx-3.3.1.tar.gz diff --git a/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch b/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch deleted file mode 100644 index 99c8180..0000000 --- a/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 85b24a2e88ea71edc728aff3b078d34c2f374f06 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -Date: Sun, 13 Sep 2020 09:16:32 +0900 -Subject: [PATCH] Fix our test failed with pygments-2.7.0 - -Since pygments-2.7.0, it has changed the style of output HTML. -That makes our test broken. This fixes it to pass with new pygments. ---- - tests/test_build_html.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index e949f11572..1efc6c14a6 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -10,8 +10,10 @@ - - import os - import re -+from distutils.version import LooseVersion - from itertools import cycle, chain - -+import pygments - import pytest - from html5lib import HTMLParser - -@@ -1591,4 +1593,8 @@ def test_html_codeblock_linenos_style_inline(app): - app.build() - content = (app.outdir / 'index.html').read_text() - -- assert '1 ' in content -+ pygments_version = tuple(LooseVersion(pygments.__version__).version) -+ if pygments_version > (2, 7): -+ assert '1' in content -+ else: -+ assert '1 ' in content diff --git a/python-sphinx.spec b/python-sphinx.spec index 73e5299..28ae35f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,11 +21,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.2.1 +%global general_version 3.3.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -42,11 +42,6 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff -# Latest version of python-pygments (2.7.1) breaks python-sphinx. -# It is already fixed in upstream and this patch can be removed -# once new version of python-sphinx is released. -Patch2: https://github.com/sphinx-doc/sphinx/commit/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel @@ -162,7 +157,7 @@ Recommends: ImageMagick %{?python_provide:%python_provide python%{python3_pkgversion}-sphinx} # Bundled JavaScript -Provides: bundled(jquery) = 3.2.1 +Provides: bundled(jquery) = 3.5.1 Provides: bundled(underscore) = 1.3.1 Provides: bundled(css3-mediaqueries) = 1.0 @@ -388,6 +383,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Nov 23 2020 Miro Hrončok - 1:3.3.1-1 +- Update to 3.3.1 +- Fixes: rhbz#1893752 + * Wed Oct 14 2020 Tomas Hrnciar - 1:3.2.1-2 - Backport commit to fix python-sphinx with python-pygments v2.7.1 diff --git a/sources b/sources index 78ae4bf..6a32e82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb +SHA512 (Sphinx-3.3.1.tar.gz) = bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78 From bcde98f61bb78a38f45ced426aa85aebcb5bfb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Nov 2020 21:33:35 +0100 Subject: [PATCH 147/234] Remove old Obsoletes, Provides and Conflicts --- python-sphinx.spec | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 28ae35f..7972a9d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -154,22 +154,12 @@ Summary: Python documentation generator Recommends: graphviz Recommends: ImageMagick -%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx} # Bundled JavaScript Provides: bundled(jquery) = 3.5.1 Provides: bundled(underscore) = 1.3.1 Provides: bundled(css3-mediaqueries) = 1.0 -# Remove in F33 -Obsoletes: python-sphinx-locale < 1:2 -Provides: python-sphinx-locale = %{epoch}:%{version}-%{release} -Obsoletes: python%{python3_pkgversion}-sphinxcontrib-napoleon < 0.3.0 -Provides: python%{python3_pkgversion}-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release} -Conflicts: python2-Sphinx < 1:2 -Conflicts: python2-sphinx < 1:2 -Provides: python(Sphinx) = %{epoch}:%{version}-%{release} - %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 @@ -233,11 +223,8 @@ Requires: tex(upquote.sty) Requires: tex(utf8x.def) Requires: tex(wrapfig.sty) -%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx-latex} - -# Remove in F33 -Obsoletes: python-sphinx-latex < 1:2 -Provides: python-sphinx-latex = %{epoch}:%{version}-%{release} +# 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 From 67bdc19f103aca62fb949ed3f4c5a50c5fe4a97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 23 Nov 2020 22:10:07 +0100 Subject: [PATCH 148/234] Convert to pyproject macros This adds an (optional) test dependency on Cython + gcc. This removes an unused dependency on mock. Not using %{pyproject_files} because the %install section is a mess. --- python-sphinx.spec | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7972a9d..591ae7a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -45,22 +45,7 @@ Patch1: sphinx-test_theming.diff BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools - -BuildRequires: python%{python3_pkgversion}-babel -BuildRequires: python%{python3_pkgversion}-docutils -BuildRequires: python%{python3_pkgversion}-imagesize -BuildRequires: python%{python3_pkgversion}-jinja2 -BuildRequires: python%{python3_pkgversion}-packaging -BuildRequires: python%{python3_pkgversion}-pygments -BuildRequires: python%{python3_pkgversion}-requests -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-applehelp -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-jsmath -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp -BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml -BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster +BuildRequires: pyproject-rpm-macros %if %{with websupport} BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport @@ -73,11 +58,7 @@ BuildRequires: dos2unix # tests import _testcapi BuildRequires: python%{python3_pkgversion}-test -BuildRequires: python%{python3_pkgversion}-html5lib -BuildRequires: python%{python3_pkgversion}-mock -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-snowballstemmer - +BuildRequires: gcc BuildRequires: gettext BuildRequires: graphviz BuildRequires: texinfo @@ -264,13 +245,22 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js 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 %{?with_tests:-x test} + %build -%py3_build +%pyproject_wheel export PYTHONPATH=$PWD pushd doc -export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py" +export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py" make html SPHINXBUILD="$SPHINXBUILD" make man SPHINXBUILD="$SPHINXBUILD" rm -rf _build/html/.buildinfo @@ -279,7 +269,7 @@ popd %install -%py3_install +%pyproject_install # For backwards compatibility. Remove with care, if at all for i in sphinx-{apidoc,autogen,build,quickstart}; do @@ -353,7 +343,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %{_bindir}/sphinx-* %{python3_sitelib}/sphinx/ %dir %{python3_sitelib}/sphinxcontrib/ -%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/ +%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* From daad1311b147bf9cd71c7c77c443fd532ae5e721 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 5 Dec 2020 13:00:02 +0000 Subject: [PATCH 149/234] Unset -s from python shebang --- python-sphinx.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 591ae7a..df1623b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,6 +4,9 @@ # 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 +# with user-installed modules (#1903763) +%global py3_shebang_flags %nil # No internet in Koji %bcond_with internet @@ -25,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -360,6 +363,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Sat Dec 05 2020 Mattia Verga - 1:3.3.1-2 +- Unset -s from python shebang +- Fixes: rhbz#1903763 + * Mon Nov 23 2020 Miro Hrončok - 1:3.3.1-1 - Update to 3.3.1 - Fixes: rhbz#1893752 From 82817e3a80b034d9ab7ec433eb5b88017b09c23c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:01:30 +0000 Subject: [PATCH 150/234] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- python-sphinx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index df1623b..37df0c5 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -47,6 +47,7 @@ Patch1: sphinx-test_theming.diff BuildArch: noarch +BuildRequires: make BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros From 450055494362988aec4f33f092a4c5daa9e579c8 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 19 Jan 2021 13:46:27 +0100 Subject: [PATCH 151/234] Update to 3.4.3 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a0af189..1827335 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /Sphinx-3.1.2.tar.gz /Sphinx-3.2.1.tar.gz /Sphinx-3.3.1.tar.gz +/Sphinx-3.4.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 37df0c5..c988030 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.3.1 +%global general_version 3.4.3 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Jan 19 2021 Charalampos Stratakis - 1:3.4.3-1 +- Update to 3.4.3 +- Fixes rhbz#1909494 + * Sat Dec 05 2020 Mattia Verga - 1:3.3.1-2 - Unset -s from python shebang - Fixes: rhbz#1903763 diff --git a/sources b/sources index 6a32e82..e4ad815 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.3.1.tar.gz) = bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78 +SHA512 (Sphinx-3.4.3.tar.gz) = 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa From f7572144d251aa37b3cb62fbfb3317a75bd151ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 13:30:25 +0000 Subject: [PATCH 152/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index c988030..c10729a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 19 2021 Charalampos Stratakis - 1:3.4.3-1 - Update to 3.4.3 - Fixes rhbz#1909494 From 5c12b536410e2e976efcb315014036a564778204 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Wed, 10 Mar 2021 20:26:20 +0100 Subject: [PATCH 153/234] Update to 3.5.2 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1827335..e546194 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /Sphinx-3.2.1.tar.gz /Sphinx-3.3.1.tar.gz /Sphinx-3.4.3.tar.gz +/Sphinx-3.5.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index c10729a..d5cbe06 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.4.3 +%global general_version 3.5.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Mar 10 2021 Charalampos Stratakis - 1:3.5.2-1 +- Update 3.5.2 +- Fixes rhbz#1928459 + * Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e4ad815..7c73c70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.4.3.tar.gz) = 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa +SHA512 (Sphinx-3.5.2.tar.gz) = 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9 From 4459819cfc0feb5eb539c301e7af23965adb3d5d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 1 Apr 2021 10:30:34 +0200 Subject: [PATCH 154/234] Update to 3.5.3 --- .gitignore | 1 + python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e546194..829c477 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /Sphinx-3.3.1.tar.gz /Sphinx-3.4.3.tar.gz /Sphinx-3.5.2.tar.gz +/Sphinx-3.5.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index d5cbe06..4c7e0d9 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.5.2 +%global general_version 3.5.3 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Apr 01 2021 Karolina Surma - 1:3.5.3-1 +- Update to 3.5.3 +- Fixes rhbz#1941161 + * Wed Mar 10 2021 Charalampos Stratakis - 1:3.5.2-1 - Update 3.5.2 - Fixes rhbz#1928459 diff --git a/sources b/sources index 7c73c70..a8b5c49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.5.2.tar.gz) = 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9 +SHA512 (Sphinx-3.5.3.tar.gz) = 4e2cb1c3632ec131cc724f306bbe084691c2178620d1dec130d3bc8be3ee116c14093863ec768242965be9f28c74ed704768b23a62a1510ff00bf1c2edb810df From 12770577f78f5d5931144180449245b450713504 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Wed, 21 Apr 2021 11:38:23 +0200 Subject: [PATCH 155/234] Enable runtime dependencies when built without tests Runtime dependencies are currently brought in only when built with tests as a part of -x option of %pyproject_buildrequires. But they are also needed when building without tests, because in-tree sphinx is used to build the documentation. --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 4c7e0d9..1f9e988 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -256,7 +256,7 @@ sed -i '/typed_ast/d' setup.py %generate_buildrequires -%pyproject_buildrequires %{?with_tests:-x test} +%pyproject_buildrequires -r %{?with_tests:-x test} %build From 2fb9084204d65590a055a5c449b0f2de4161dbb9 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 10 May 2021 16:19:46 +0200 Subject: [PATCH 156/234] Update to 3.5.4 --- .gitignore | 1 + python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 829c477..6aa6aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /Sphinx-3.4.3.tar.gz /Sphinx-3.5.2.tar.gz /Sphinx-3.5.3.tar.gz +/Sphinx-3.5.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 1f9e988..ec72679 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.5.3 +%global general_version 3.5.4 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon May 10 2021 Karolina Surma - 1:3.5.4-1 +- Update to 3.5.4 +- Fixes rhbz#1949477 + * Thu Apr 01 2021 Karolina Surma - 1:3.5.3-1 - Update to 3.5.3 - Fixes rhbz#1941161 diff --git a/sources b/sources index a8b5c49..ef6c88d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.5.3.tar.gz) = 4e2cb1c3632ec131cc724f306bbe084691c2178620d1dec130d3bc8be3ee116c14093863ec768242965be9f28c74ed704768b23a62a1510ff00bf1c2edb810df +SHA512 (Sphinx-3.5.4.tar.gz) = 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125 From 25af7978b41047489915d5e4d0d980ee2bb09407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 11 May 2021 10:36:13 +0200 Subject: [PATCH 157/234] Temporarily skip test_signature_annotations to unblock Python 3.10 rebuild --- python-sphinx.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index ec72679..141c29a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -333,9 +333,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %if %{with tests} %check # Currently, all linkcheck tests and test_latex_images need internet +# test_signature_annotations is broken on Python 3.10 (at least in 3.5.4) %pytest \ %if %{without internet} - -k "not linkcheck and not test_latex_images" \ + -k "not linkcheck and not test_latex_images and not test_signature_annotations" \ %endif ; %endif From 1376b3f859e528f73823e338bbe9010b023030f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 19:11:49 +0200 Subject: [PATCH 158/234] Bootstrap for Python 3.10 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 141c29a..7acb2cd 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -28,7 +30,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -365,6 +367,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Jun 02 2021 Python Maint - 1:3.5.4-2 +- Bootstrap for Python 3.10 + * Mon May 10 2021 Karolina Surma - 1:3.5.4-1 - Update to 3.5.4 - Fixes rhbz#1949477 From 04e7c13b7b413ccd1c6e5c84c8d29101adc6689b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 13:18:32 +0200 Subject: [PATCH 159/234] Rebuilt for Python 3.10 --- python-sphinx.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 7acb2cd..ce2fabc 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -30,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -367,6 +365,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Jun 03 2021 Python Maint - 1:3.5.4-3 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 1:3.5.4-2 - Bootstrap for Python 3.10 From d76c73ce9eb1efccb7e1e7dd01fb054e44b3b52d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 25 May 2021 15:02:24 +0200 Subject: [PATCH 160/234] Update to 4.0.2 --- .gitignore | 1 + python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6aa6aa9..8e09796 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /Sphinx-3.5.2.tar.gz /Sphinx-3.5.3.tar.gz /Sphinx-3.5.4.tar.gz +/Sphinx-4.0.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index ce2fabc..893b404 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 3.5.4 +%global general_version 4.0.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -365,6 +365,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jun 11 2021 Karolina Surma - 1:4.0.2-1 +- Update to 4.0.2 +- Fixes rhbz#1948279 + * Thu Jun 03 2021 Python Maint - 1:3.5.4-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index ef6c88d..1eb95c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-3.5.4.tar.gz) = 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125 +SHA512 (Sphinx-4.0.2.tar.gz) = 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec From eb75429039d90151f11524ff69987b06acb57b86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 09:36:24 +0000 Subject: [PATCH 161/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 893b404..5e22b6c 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -365,6 +365,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:4.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 11 2021 Karolina Surma - 1:4.0.2-1 - Update to 4.0.2 - Fixes rhbz#1948279 From 0453f9e3b78d1de4c1992ce7aa11cb2cea819f67 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 3 Aug 2021 13:49:42 +0200 Subject: [PATCH 162/234] Update to 4.1.2 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e09796..e859f97 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /Sphinx-3.5.3.tar.gz /Sphinx-3.5.4.tar.gz /Sphinx-4.0.2.tar.gz +/Sphinx-4.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 5e22b6c..7c77cd7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.0.2 +%global general_version 4.1.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -365,6 +365,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Aug 02 2021 Karolina Surma - 1:4.1.2-1 +- Update to 4.1.2 +- Fixes rhbz#1979326 + * Fri Jul 23 2021 Fedora Release Engineering - 1:4.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 1eb95c1..6773ca8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.0.2.tar.gz) = 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec +SHA512 (Sphinx-4.1.2.tar.gz) = 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457 From 924f1b1e382cf79763e2e2b741e88b6822da4f42 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 3 Aug 2021 18:00:12 +0200 Subject: [PATCH 163/234] Backport a patch to make python-sphinx work with Python 3.10-rc1 types.Union was renamed to types.UnionType, causing Sphinx to crash --- python-sphinx.spec | 4 ++ rename-types-Union-to-types-UnionType.patch | 49 +++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 rename-types-Union-to-types-UnionType.patch diff --git a/python-sphinx.spec b/python-sphinx.spec index 7c77cd7..6b4300d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -44,6 +44,9 @@ 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 +Patch2: rename-types-Union-to-types-UnionType.patch BuildArch: noarch @@ -368,6 +371,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib * Mon Aug 02 2021 Karolina Surma - 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 - 1:4.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/rename-types-Union-to-types-UnionType.patch b/rename-types-Union-to-types-UnionType.patch new file mode 100644 index 0000000..a6b8c35 --- /dev/null +++ b/rename-types-Union-to-types-UnionType.patch @@ -0,0 +1,49 @@ +From 8b2031c747e7c7e6b845ee2e3db47de617d33cc6 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +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 From cc7f8dfbf3fe6f049e5c5fd77ec070839b785e7f Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 18 Aug 2021 12:11:39 +0200 Subject: [PATCH 164/234] Fix tests with python-pygments >= 2.10 --- fix-tests-with-pygments-210.patch | 62 +++++++++++++++++++++++++++++++ python-sphinx.spec | 8 +++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 fix-tests-with-pygments-210.patch diff --git a/fix-tests-with-pygments-210.patch b/fix-tests-with-pygments-210.patch new file mode 100644 index 0000000..8577fc0 --- /dev/null +++ b/fix-tests-with-pygments-210.patch @@ -0,0 +1,62 @@ +From 06ec5b027d01e8f7717e4687f89f335e83545ff9 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +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 = ("""#include """ +- """<stdio.h>""") ++ if pygments_version < (2, 10, 0): ++ expected_expr = ("""#include """ ++ """<stdio.h>""") ++ else: ++ expected_expr = ("""#include""" ++ """ """ ++ """<stdio.h>""") + 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 = ("""#include """ +- """<STDIO.H>""") ++ if pygments_version < (2, 10, 0): ++ expected_expr = ("""#include """ ++ """<STDIO.H>""") ++ else: ++ expected_expr = ("""#include""" ++ """ """ ++ """<STDIO.H>""") + assert_count(expected_expr, result, 1) + + # literal block in list item should be translated diff --git a/python-sphinx.spec b/python-sphinx.spec index 6b4300d..65adf2a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -47,6 +47,9 @@ 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 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 BuildArch: noarch @@ -368,6 +371,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Aug 18 2021 Karolina Surma - 1:4.1.2-2 +- Patch python-sphinx to work with python-pygments >=2.10 + * Mon Aug 02 2021 Karolina Surma - 1:4.1.2-1 - Update to 4.1.2 - Fixes rhbz#1979326 From f0f09a5087607371d10c3acf83930fb35a2b446b Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 16 Sep 2021 10:50:00 +0200 Subject: [PATCH 165/234] Backport bugfixes from upstream 4.1.x branch for compatibility with Python 3.10-rc2 --- ...ng-objects-correctly-with-Python-310.patch | 35 ++++++++++++++++++ ...te-correct-reference-to-parent-class.patch | 36 +++++++++++++++++++ python-sphinx.spec | 17 ++++++++- ...Annotated-correctly-with-Python-3.10.patch | 26 ++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 display-typing-objects-correctly-with-Python-310.patch create mode 100644 generate-correct-reference-to-parent-class.patch create mode 100644 render-typing-Annotated-correctly-with-Python-3.10.patch diff --git a/display-typing-objects-correctly-with-Python-310.patch b/display-typing-objects-correctly-with-Python-310.patch new file mode 100644 index 0000000..50f98f2 --- /dev/null +++ b/display-typing-objects-correctly-with-Python-310.patch @@ -0,0 +1,35 @@ +From 648af37d864b5d76bbe833785d664e40d56d9768 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +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]) diff --git a/generate-correct-reference-to-parent-class.patch b/generate-correct-reference-to-parent-class.patch new file mode 100644 index 0000000..1ad91d9 --- /dev/null +++ b/generate-correct-reference-to-parent-class.patch @@ -0,0 +1,36 @@ +From d0c97e9eb57126e38b7b018a101df1ecb1ad12b8 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +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__) diff --git a/python-sphinx.spec b/python-sphinx.spec index 65adf2a..8b2d1a8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -46,10 +46,21 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} 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 @@ -371,6 +382,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Sep 16 2021 Karolina Surma - 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 + * Wed Aug 18 2021 Karolina Surma - 1:4.1.2-2 - Patch python-sphinx to work with python-pygments >=2.10 diff --git a/render-typing-Annotated-correctly-with-Python-3.10.patch b/render-typing-Annotated-correctly-with-Python-3.10.patch new file mode 100644 index 0000000..041de41 --- /dev/null +++ b/render-typing-Annotated-correctly-with-Python-3.10.patch @@ -0,0 +1,26 @@ +From b82d3ef05a75b6dad9679f8746db5ef89785c7c0 Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA +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__ From 9dc09b9e7964448b39498199eff0ed10fefafb68 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 20 Sep 2021 15:18:51 +0200 Subject: [PATCH 166/234] Enable one of previously deselected tests --- python-sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 8b2d1a8..227350b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -350,10 +350,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %if %{with tests} %check # Currently, all linkcheck tests and test_latex_images need internet -# test_signature_annotations is broken on Python 3.10 (at least in 3.5.4) %pytest \ %if %{without internet} - -k "not linkcheck and not test_latex_images and not test_signature_annotations" \ + -k "not linkcheck and not test_latex_images" \ %endif ; %endif @@ -385,6 +384,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib * Thu Sep 16 2021 Karolina Surma - 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 - 1:4.1.2-2 - Patch python-sphinx to work with python-pygments >=2.10 From 8aeee581aaa7790e03d3871f2f943bb26710792e Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 21 Sep 2021 12:05:07 +0200 Subject: [PATCH 167/234] Update to 4.2.0 --- .gitignore | 1 + ...ng-objects-correctly-with-Python-310.patch | 35 ----------- fix-tests-with-pygments-210.patch | 62 ------------------- ...te-correct-reference-to-parent-class.patch | 36 ----------- python-sphinx.spec | 25 ++------ rename-types-Union-to-types-UnionType.patch | 49 --------------- ...Annotated-correctly-with-Python-3.10.patch | 26 -------- sources | 2 +- 8 files changed, 8 insertions(+), 228 deletions(-) delete mode 100644 display-typing-objects-correctly-with-Python-310.patch delete mode 100644 fix-tests-with-pygments-210.patch delete mode 100644 generate-correct-reference-to-parent-class.patch delete mode 100644 rename-types-Union-to-types-UnionType.patch delete mode 100644 render-typing-Annotated-correctly-with-Python-3.10.patch diff --git a/.gitignore b/.gitignore index e859f97..50d3e94 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /Sphinx-3.5.4.tar.gz /Sphinx-4.0.2.tar.gz /Sphinx-4.1.2.tar.gz +/Sphinx-4.2.0.tar.gz diff --git a/display-typing-objects-correctly-with-Python-310.patch b/display-typing-objects-correctly-with-Python-310.patch deleted file mode 100644 index 50f98f2..0000000 --- a/display-typing-objects-correctly-with-Python-310.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 648af37d864b5d76bbe833785d664e40d56d9768 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -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]) diff --git a/fix-tests-with-pygments-210.patch b/fix-tests-with-pygments-210.patch deleted file mode 100644 index 8577fc0..0000000 --- a/fix-tests-with-pygments-210.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 06ec5b027d01e8f7717e4687f89f335e83545ff9 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -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 = ("""#include """ -- """<stdio.h>""") -+ if pygments_version < (2, 10, 0): -+ expected_expr = ("""#include """ -+ """<stdio.h>""") -+ else: -+ expected_expr = ("""#include""" -+ """ """ -+ """<stdio.h>""") - 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 = ("""#include """ -- """<STDIO.H>""") -+ if pygments_version < (2, 10, 0): -+ expected_expr = ("""#include """ -+ """<STDIO.H>""") -+ else: -+ expected_expr = ("""#include""" -+ """ """ -+ """<STDIO.H>""") - assert_count(expected_expr, result, 1) - - # literal block in list item should be translated diff --git a/generate-correct-reference-to-parent-class.patch b/generate-correct-reference-to-parent-class.patch deleted file mode 100644 index 1ad91d9..0000000 --- a/generate-correct-reference-to-parent-class.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d0c97e9eb57126e38b7b018a101df1ecb1ad12b8 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -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__) diff --git a/python-sphinx.spec b/python-sphinx.spec index 227350b..ce92daa 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.1.2 +%global general_version 4.2.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -44,23 +44,6 @@ 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 @@ -381,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Sep 17 2021 Karolina Surma - 1:4.2.0-1 +- Update to 4.2.0 +- Fixes rhbz#2003427 + * Thu Sep 16 2021 Karolina Surma - 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 diff --git a/rename-types-Union-to-types-UnionType.patch b/rename-types-Union-to-types-UnionType.patch deleted file mode 100644 index a6b8c35..0000000 --- a/rename-types-Union-to-types-UnionType.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8b2031c747e7c7e6b845ee2e3db47de617d33cc6 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -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 diff --git a/render-typing-Annotated-correctly-with-Python-3.10.patch b/render-typing-Annotated-correctly-with-Python-3.10.patch deleted file mode 100644 index 041de41..0000000 --- a/render-typing-Annotated-correctly-with-Python-3.10.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b82d3ef05a75b6dad9679f8746db5ef89785c7c0 Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -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__ diff --git a/sources b/sources index 6773ca8..5f19416 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.1.2.tar.gz) = 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457 +SHA512 (Sphinx-4.2.0.tar.gz) = 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75 From 2e80cab0b5f478791cb3d0d4ae0575ff6c2f543d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 19 Nov 2021 15:38:40 +0100 Subject: [PATCH 168/234] Update to 4.3.0 --- .gitignore | 1 + python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 50d3e94..8fdd926 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /Sphinx-4.0.2.tar.gz /Sphinx-4.1.2.tar.gz /Sphinx-4.2.0.tar.gz +/Sphinx-4.3.0.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index ce92daa..9c2572c 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.2.0 +%global general_version 4.3.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Nov 19 2021 Karolina Surma - 1:4.3.0-1 +- Update to 4.3.0 +- Fixes rhbz#2022111 + * Fri Sep 17 2021 Karolina Surma - 1:4.2.0-1 - Update to 4.2.0 - Fixes rhbz#2003427 diff --git a/sources b/sources index 5f19416..a818132 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.2.0.tar.gz) = 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75 +SHA512 (Sphinx-4.3.0.tar.gz) = ba3463135dc578024819d9c70b3707d4465c4a71aa305474f7b34b14e276ee491e029bb8bc93c05ed1463a6bc63a82e0507c16ede7046fd1216e31553027e449 From 644aef964cc9115ede1ee229f896612ed318702b Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 29 Nov 2021 16:56:13 +0100 Subject: [PATCH 169/234] Update to 4.3.1 --- .gitignore | 1 + python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8fdd926..bbe40c2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /Sphinx-4.1.2.tar.gz /Sphinx-4.2.0.tar.gz /Sphinx-4.3.0.tar.gz +/Sphinx-4.3.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 9c2572c..74ca67d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.3.0 +%global general_version 4.3.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Nov 29 2021 Karolina Surma - 1:4.3.1-1 +- Update to 4.3.1 +- Fixes rhbz#2027059 + * Fri Nov 19 2021 Karolina Surma - 1:4.3.0-1 - Update to 4.3.0 - Fixes rhbz#2022111 diff --git a/sources b/sources index a818132..522a0fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.3.0.tar.gz) = ba3463135dc578024819d9c70b3707d4465c4a71aa305474f7b34b14e276ee491e029bb8bc93c05ed1463a6bc63a82e0507c16ede7046fd1216e31553027e449 +SHA512 (Sphinx-4.3.1.tar.gz) = 0b7ceb369783d30685c10783fe10b58e92a2f5ae50dda1b6cfb021b0d33fb424a2c6cddc6b97018b63347127fc74ed4f7a442c312ce9e75ceb537f127a46bb9d From 7dfe865724a11d93705dadeed3eeffde00c29d3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 15:38:10 +0000 Subject: [PATCH 170/234] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 74ca67d..5d578a2 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1:4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 29 2021 Karolina Surma - 1:4.3.1-1 - Update to 4.3.1 - Fixes rhbz#2027059 From ca6027ecf052f194d241242771e2e05c4dd3072a Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 1 Feb 2022 20:24:33 +0100 Subject: [PATCH 171/234] Add rpminspect file --- rpminspect.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..bd3a5a4 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,4 @@ +# exclude XML template (not always valid) from XML validity check: +xml: + ignore: + - /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml From b0978bafd9b047086c6d1ab3f16c06ea53ae63a6 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 19 Jan 2022 10:30:33 +0100 Subject: [PATCH 172/234] Update to 4.4.0 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- sphinx-test_theming.diff | 10 +++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bbe40c2..247a3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /Sphinx-4.2.0.tar.gz /Sphinx-4.3.0.tar.gz /Sphinx-4.3.1.tar.gz +/Sphinx-4.4.0.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 5d578a2..b078b31 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.3.1 +%global general_version 4.4.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Feb 01 2022 Karolina Surma - 1:4.4.0-1 +- Update to 4.4.0 +- Fixes rhbz#2033955 + * Fri Jan 21 2022 Fedora Release Engineering - 1:4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 522a0fd..fa001e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.3.1.tar.gz) = 0b7ceb369783d30685c10783fe10b58e92a2f5ae50dda1b6cfb021b0d33fb424a2c6cddc6b97018b63347127fc74ed4f7a442c312ce9e75ceb537f127a46bb9d +SHA512 (Sphinx-4.4.0.tar.gz) = f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640 diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff index 966528a..18e3cb0 100644 --- a/sphinx-test_theming.diff +++ b/sphinx-test_theming.diff @@ -5,8 +5,8 @@ diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_them 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' +- assert set(app.registry.html_themes.keys()) == set(themes) ++ assert set(app.registry.html_themes.keys()) >= set(themes) + assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme' + assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip' + assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles' From 055cf1292aa2db2c834949b97a3efd8bbc180482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 23 Mar 2022 12:31:47 +0100 Subject: [PATCH 173/234] Prepare spec for multiple flags in %py3_shebang_flags See the relevant change of packaging guidelines: https://pagure.io/packaging-committee/pull-request/1165 tl;dr If we ever add more flags, we want to remove s here, not all flags. --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b078b31..ee84325 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ # Unset -s on python shebang to allow RPM-installed sphinx to be used # with user-installed modules (#1903763) -%global py3_shebang_flags %nil +%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) # No internet in Koji %bcond_with internet From 81f3c96c10e1d034821e80658617213631d8a58f Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 1 Apr 2022 13:10:52 +0200 Subject: [PATCH 174/234] Update to 4.5.0 --- .gitignore | 1 + 10336.patch | 23 +++++++++++++++++++++++ python-sphinx.spec | 10 +++++++++- sources | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 10336.patch diff --git a/.gitignore b/.gitignore index 247a3ab..cc02dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /Sphinx-4.3.0.tar.gz /Sphinx-4.3.1.tar.gz /Sphinx-4.4.0.tar.gz +/Sphinx-4.5.0.tar.gz diff --git a/10336.patch b/10336.patch new file mode 100644 index 0000000..f79d764 --- /dev/null +++ b/10336.patch @@ -0,0 +1,23 @@ +From a314927e7451c255f7d4678feef32048dab5f9b2 Mon Sep 17 00:00:00 2001 +From: Adam Turner <9087854+aa-turner@users.noreply.github.com> +Date: Sat, 9 Apr 2022 20:38:47 +0100 +Subject: [PATCH] Fix test_restify + +--- + sphinx/util/typing.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py +index 1534b2c8ee..8e48b184bc 100644 +--- a/sphinx/util/typing.py ++++ b/sphinx/util/typing.py +@@ -215,6 +215,9 @@ def _restify_py37(cls: Optional[Type], mode: str = 'fully-qualified-except-typin + return text + elif isinstance(cls, typing._SpecialForm): + return ':py:obj:`~%s.%s`' % (cls.__module__, cls._name) ++ elif sys.version_info >= (3, 11) and cls is typing.Any: ++ # handle bpo-46998 ++ return f':py:obj:`~{cls.__module__}.{cls.__name__}`' + elif hasattr(cls, '__qualname__'): + if cls.__module__ == 'typing': + return ':py:class:`~%s.%s`' % (cls.__module__, cls.__qualname__) diff --git a/python-sphinx.spec b/python-sphinx.spec index ee84325..b8dbed1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.4.0 +%global general_version 4.5.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -45,6 +45,10 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff +# Fix test_restify for Python 3.11 +# https://github.com/sphinx-doc/sphinx/pull/10336 +Patch2: https://github.com/sphinx-doc/sphinx/pull/10336.patch + BuildArch: noarch BuildRequires: make @@ -364,6 +368,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Apr 01 2022 Karolina Surma - 1:4.5.0-1 +- Update to 4.5.0 +- Fixes rhbz#2068924 + * Tue Feb 01 2022 Karolina Surma - 1:4.4.0-1 - Update to 4.4.0 - Fixes rhbz#2033955 diff --git a/sources b/sources index fa001e2..d5a34f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.4.0.tar.gz) = f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640 +SHA512 (Sphinx-4.5.0.tar.gz) = b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c From be9e7b1508d0cd6d1c62b62dba4b86933767544d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:04:49 +0200 Subject: [PATCH 175/234] Bootstrap for Python 3.11 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index b8dbed1..fd01f7d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -28,7 +30,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -368,6 +370,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Jun 13 2022 Python Maint - 1:4.5.0-2 +- Bootstrap for Python 3.11 + * Fri Apr 01 2022 Karolina Surma - 1:4.5.0-1 - Update to 4.5.0 - Fixes rhbz#2068924 From 0b8783612431efa155a2de5aaf7543607ca92602 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 21:14:17 +0200 Subject: [PATCH 176/234] Rebuilt for Python 3.11 --- python-sphinx.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index fd01f7d..72edb53 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -30,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -370,6 +368,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Jun 13 2022 Python Maint - 1:4.5.0-3 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 1:4.5.0-2 - Bootstrap for Python 3.11 From a0cc515b741eeff308e8f0c862c251c6829e7a5a Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 21 Jun 2022 11:55:21 +0200 Subject: [PATCH 177/234] Update to 5.0.2 --- .gitignore | 1 + 10336.patch | 23 ----------------------- python-sphinx.spec | 11 +++++------ sources | 2 +- sphinx-test_theming.diff | 2 +- 5 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 10336.patch diff --git a/.gitignore b/.gitignore index cc02dd5..99f1348 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /Sphinx-4.3.1.tar.gz /Sphinx-4.4.0.tar.gz /Sphinx-4.5.0.tar.gz +/Sphinx-5.0.2.tar.gz diff --git a/10336.patch b/10336.patch deleted file mode 100644 index f79d764..0000000 --- a/10336.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a314927e7451c255f7d4678feef32048dab5f9b2 Mon Sep 17 00:00:00 2001 -From: Adam Turner <9087854+aa-turner@users.noreply.github.com> -Date: Sat, 9 Apr 2022 20:38:47 +0100 -Subject: [PATCH] Fix test_restify - ---- - sphinx/util/typing.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py -index 1534b2c8ee..8e48b184bc 100644 ---- a/sphinx/util/typing.py -+++ b/sphinx/util/typing.py -@@ -215,6 +215,9 @@ def _restify_py37(cls: Optional[Type], mode: str = 'fully-qualified-except-typin - return text - elif isinstance(cls, typing._SpecialForm): - return ':py:obj:`~%s.%s`' % (cls.__module__, cls._name) -+ elif sys.version_info >= (3, 11) and cls is typing.Any: -+ # handle bpo-46998 -+ return f':py:obj:`~{cls.__module__}.{cls.__name__}`' - elif hasattr(cls, '__qualname__'): - if cls.__module__ == 'typing': - return ':py:class:`~%s.%s`' % (cls.__module__, cls.__qualname__) diff --git a/python-sphinx.spec b/python-sphinx.spec index 72edb53..addc958 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 4.5.0 +%global general_version 5.0.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -45,10 +45,6 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff -# Fix test_restify for Python 3.11 -# https://github.com/sphinx-doc/sphinx/pull/10336 -Patch2: https://github.com/sphinx-doc/sphinx/pull/10336.patch - BuildArch: noarch BuildRequires: make @@ -368,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Jun 21 2022 Karolina Surma - 1:5.0.2-1 +- Update to 5.0.2 + * Mon Jun 13 2022 Python Maint - 1:4.5.0-3 - Rebuilt for Python 3.11 diff --git a/sources b/sources index d5a34f0..3452c44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-4.5.0.tar.gz) = b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c +SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6 diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff index 18e3cb0..975305e 100644 --- a/sphinx-test_theming.diff +++ b/sphinx-test_theming.diff @@ -1,7 +1,7 @@ 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 @@ +@@ -25,7 +25,7 @@ themes.append('alabaster') # test Theme class API From 2fbf62bfba44f36eafe3f14a62cc86511cb511f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 22:27:44 +0000 Subject: [PATCH 178/234] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index addc958..0d9b1dc 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 21 2022 Karolina Surma - 1:5.0.2-1 - Update to 5.0.2 From 2da599dd9a36f511cc0345603833c3368c16b847 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 17 Aug 2022 10:05:18 +0200 Subject: [PATCH 179/234] Update to 5.1.1 --- .gitignore | 1 + python-sphinx.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99f1348..b44e532 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /Sphinx-4.4.0.tar.gz /Sphinx-4.5.0.tar.gz /Sphinx-5.0.2.tar.gz +/Sphinx-5.1.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 0d9b1dc..d58ea23 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 5.0.2 +%global general_version 5.1.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 +- Update to 5.1.1 +- Fixes rhbz#2110473 + * Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 3452c44..dab4f7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6 +SHA512 (Sphinx-5.1.1.tar.gz) = 82cb4c435b0f6cee6bf80b81028f06e425e3d6fb5614e64b1f5a8c715ece80b697b5b55e04f3afe26236bb4590de9cd41008d6480c4b3d895803d83e914afff3 From 9104ffe5536a0e88842dc18bde13ff3a5b084b85 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 22 Aug 2022 13:56:02 +0200 Subject: [PATCH 180/234] Remove reST docs from the -doc package, ship only HTML --- python-sphinx.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d58ea23..ccfdbd3 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -236,7 +236,7 @@ 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 contains documentation in reST and HTML formats. +This package contains documentation in the HTML format. %prep @@ -294,12 +294,6 @@ do 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} @@ -360,13 +354,14 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %files doc %license LICENSE -%doc html reST +%doc html %changelog * Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 - Update to 5.1.1 - Fixes rhbz#2110473 +- Remove reST documentation from the -doc package, ship only HTML * Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9c0d32b9af4250ff3ee5d95c8eac5836d062861e Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 22 Aug 2022 14:00:23 +0200 Subject: [PATCH 181/234] Remove duplicate files from the built documentation --- python-sphinx.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index ccfdbd3..6d4896b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -268,6 +268,10 @@ export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py" make html SPHINXBUILD="$SPHINXBUILD" make man SPHINXBUILD="$SPHINXBUILD" rm -rf _build/html/.buildinfo +# Those files are copied to _build/html/_images and loaded to the +# html pages from there - we can safely remove the duplicated and unused files +rm -rf _build/html/_static/themes _build/html/_static/tutorial +rm -f _build/html/_static/more.png _build/html/_static/translation.svg mv _build/html .. popd From d24b3b01a975bfaf3220d6d9e3ed41d2c1ae09b4 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 5 Oct 2022 10:41:45 +0200 Subject: [PATCH 182/234] Update to 5.3.0 --- .gitignore | 2 ++ python-sphinx.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b44e532..b4a2dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /Sphinx-4.5.0.tar.gz /Sphinx-5.0.2.tar.gz /Sphinx-5.1.1.tar.gz +/Sphinx-5.2.3.tar.gz +/Sphinx-5.3.0.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 6d4896b..2633ff1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,7 +24,7 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 5.1.1 +%global general_version 5.3.0 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -249,11 +249,6 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js 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} @@ -331,9 +326,11 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %if %{with tests} %check # Currently, all linkcheck tests and test_latex_images need internet +# test_build_latex_doc needs internet to download pictures, +# but fails also with it enabled, we decided to skip it entirely %pytest \ %if %{without internet} - -k "not linkcheck and not test_latex_images" \ + -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \ %endif ; %endif @@ -345,7 +342,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %{_bindir}/sphinx-* %{python3_sitelib}/sphinx/ %dir %{python3_sitelib}/sphinxcontrib/ -%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/ +%{python3_sitelib}/sphinx-%{upstream_version}.dist-info/ %dir %{_datadir}/sphinx/ %dir %{_datadir}/sphinx/locale %dir %{_datadir}/sphinx/locale/* @@ -362,6 +359,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Nov 08 2022 Karolina Surma - 1:5.3.0-1 +- Update to 5.3.0 +- Fixes rhbz#2129546 + * Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 - Update to 5.1.1 - Fixes rhbz#2110473 diff --git a/sources b/sources index dab4f7a..051ef77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-5.1.1.tar.gz) = 82cb4c435b0f6cee6bf80b81028f06e425e3d6fb5614e64b1f5a8c715ece80b697b5b55e04f3afe26236bb4590de9cd41008d6480c4b3d895803d83e914afff3 +SHA512 (Sphinx-5.3.0.tar.gz) = cd2321409f7566c6333d6fc5c4eb4ed2d07490923b0c8762a31f062d9e5d86bbd9bd2c2bb3b93a00b37f31940173404dba8259de940fe402a248cf66a72cd7ae From 750789355926b7e3aab97a9420c42a87834c7179 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 17:26:13 +0000 Subject: [PATCH 183/234] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 2633ff1..3207bbf 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -359,6 +359,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1:5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 08 2022 Karolina Surma - 1:5.3.0-1 - Update to 5.3.0 - Fixes rhbz#2129546 From a31453064c1cf8a12df76439ec0a7634ff9b9e29 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 31 Jan 2023 16:26:54 +0100 Subject: [PATCH 184/234] Fix tests failures with Pygments 2.14 --- fix-tests-with-pygments-2.14.patch | 114 +++++++++++++++++++++++++++++ python-sphinx.spec | 10 ++- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 fix-tests-with-pygments-2.14.patch diff --git a/fix-tests-with-pygments-2.14.patch b/fix-tests-with-pygments-2.14.patch new file mode 100644 index 0000000..986e7d5 --- /dev/null +++ b/fix-tests-with-pygments-2.14.patch @@ -0,0 +1,114 @@ +From c3bf917fcf18c5211b220a7b294b7e6012c2d510 Mon Sep 17 00:00:00 2001 +From: Adam Turner <9087854+aa-turner@users.noreply.github.com> +Date: Sun, 1 Jan 2023 19:17:03 +0000 +Subject: [PATCH] Fix tests for Pygments 2.14 + +Pygments 2.14 was released on 01/01/2023 [0] + +[0]: https://pygments.org/docs/changelog/#version-2-14-0 + +--- + pyproject.toml | 2 +- + tests/test_ext_viewcode.py | 27 +++++++++++++++++++-------- + tests/test_intl.py | 11 +++++++++-- + 3 files changed, 29 insertions(+), 11 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 0e059b5..c02ce20 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -64,7 +64,7 @@ dependencies = [ + "sphinxcontrib-serializinghtml>=1.1.5", + "sphinxcontrib-qthelp", + "Jinja2>=3.0", +- "Pygments>=2.12", ++ "Pygments>=2.13", + "docutils>=0.14,<0.20", + "snowballstemmer>=2.0", + "babel>=2.9", +diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py +index 7750b8d..6d443d1 100644 +--- a/tests/test_ext_viewcode.py ++++ b/tests/test_ext_viewcode.py +@@ -2,6 +2,7 @@ + + import re + ++import pygments + import pytest + + +@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning): + + result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8') + result = re.sub('', '', result) # filter pygments classes +- assert ('
[docs]' +- '@decorator\n' +- 'class Class1' +- '(object):\n' +- ' """\n' +- ' this is Class1\n' +- ' """
\n') in result ++ if pygments.__version__ >= '2.14.0': ++ assert ('
[docs]' ++ '@decorator\n' ++ 'class Class1' ++ '(object):\n' ++ ' """\n' ++ ' this is Class1\n' ++ ' """
\n') in result ++ else: ++ assert ('
[docs]' ++ '@decorator\n' ++ 'class Class1' ++ '(object):\n' ++ ' """\n' ++ ' this is Class1\n' ++ ' """
\n') in result + + + @pytest.mark.sphinx('epub', testroot='ext-viewcode') +diff --git a/tests/test_intl.py b/tests/test_intl.py +index 796d95b..0c4b838 100644 +--- a/tests/test_intl.py ++++ b/tests/test_intl.py +@@ -6,6 +6,7 @@ Runs the text builder in the test root. + import os + import re + ++import pygments + import docutils + import pytest + from babel.messages import mofile, pofile +@@ -1105,8 +1106,11 @@ def test_additional_targets_should_not_be_translated(app): + expected_expr = ("""literal""" + """-""" + """block\n""" +- """in """ ++ """in""" ++ """ """ + """list""") ++ if pygments.__version__ < '2.14.0': ++ expected_expr = expected_expr.replace(""" """, ' ') + assert_count(expected_expr, result, 1) + + # doctest block should not be translated but be highlighted +@@ -1184,8 +1188,11 @@ def test_additional_targets_should_be_translated(app): + expected_expr = ("""LITERAL""" + """-""" + """BLOCK\n""" +- """IN """ ++ """IN""" ++ """ """ + """LIST""") ++ if pygments.__version__ < '2.14.0': ++ expected_expr = expected_expr.replace(""" """, ' ') + assert_count(expected_expr, result, 1) + + # doctest block should not be translated but be highlighted +-- +2.39.1 + diff --git a/python-sphinx.spec b/python-sphinx.spec index 3207bbf..5455f7d 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -45,6 +45,11 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff +# Backported upstream commit included in Sphinx 6+ ensures compatibility +# with python-pygments 2.14+ +# https://github.com/sphinx-doc/sphinx/commit/965768bfda2a00ba6 +Patch2: fix-tests-with-pygments-2.14.patch + BuildArch: noarch BuildRequires: make @@ -359,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Jan 31 2023 Karolina Surma - 1:5.3.0-3 +- Fix tests with python-pygments 2.14+ + * Fri Jan 20 2023 Fedora Release Engineering - 1:5.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 84bf048c914292701e532ebf3743f49b1f076130 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 9 Mar 2023 09:51:20 +0100 Subject: [PATCH 185/234] Fix test failures - fix test failures related to Babel 2.12 - remove the tests that required setuptools in the environment --- fix-tests-with-babel-2.12.patch | 48 +++++++++++++++++++++++++++++++++ python-sphinx.spec | 16 ++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 fix-tests-with-babel-2.12.patch diff --git a/fix-tests-with-babel-2.12.patch b/fix-tests-with-babel-2.12.patch new file mode 100644 index 0000000..e1992f2 --- /dev/null +++ b/fix-tests-with-babel-2.12.patch @@ -0,0 +1,48 @@ +From c5641702b552d71bc99c1ba3b45073488a30d398 Mon Sep 17 00:00:00 2001 +From: Adam Turner <9087854+aa-turner@users.noreply.github.com> +Date: Sun, 5 Mar 2023 13:32:37 +0000 +Subject: [PATCH] Update tests for Babel 2.12 (CLDR 42) + +--- + tests/test_util_i18n.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/tests/test_util_i18n.py b/tests/test_util_i18n.py +index e52e27671d8..7be6f3e779a 100644 +--- a/tests/test_util_i18n.py ++++ b/tests/test_util_i18n.py +@@ -4,12 +4,15 @@ + import os + import warnings + ++import babel + import pytest + from babel.messages.mofile import read_mo + + from sphinx.errors import SphinxError + from sphinx.util import i18n + ++BABEL_VERSION = tuple(map(int, babel.__version__.split('.'))) ++ + + def test_catalog_info_for_file_and_path(): + cat = i18n.CatalogInfo('path', 'domain', 'utf-8') +@@ -78,10 +81,16 @@ def test_format_date(): + format = '%x' + assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016' + format = '%X' +- assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM' ++ if BABEL_VERSION >= (2, 12): ++ assert i18n.format_date(format, date=datet, language='en') == '5:11:17\u202fAM' ++ else: ++ assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM' + assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016' + format = '%c' +- assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM' ++ if BABEL_VERSION >= (2, 12): ++ assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17\u202fAM' ++ else: ++ assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM' + assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016' + + # timezone diff --git a/python-sphinx.spec b/python-sphinx.spec index 5455f7d..fd4d0fe 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -50,6 +50,10 @@ Patch1: sphinx-test_theming.diff # https://github.com/sphinx-doc/sphinx/commit/965768bfda2a00ba6 Patch2: fix-tests-with-pygments-2.14.patch +# Backported upstream commit ensures compatibility with Babel 2.12 +# https://github.com/sphinx-doc/sphinx/commit/c5641702b +Patch3: fix-tests-with-babel-2.12.patch + BuildArch: noarch BuildRequires: make @@ -254,6 +258,12 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js rm tests/test_ext_imgconverter.py %endif +# Remove the tests that rely on setuptools +# https://github.com/sphinx-doc/sphinx/commit/44326fe2476db44e8c2a60d9326c9c3ac2865c03 +rm -r tests/roots/test-setup/ +rm tests/roots/test-theming/{MANIFEST.in,setup.py} +rm tests/test_setup_command.py + %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x test} @@ -364,6 +374,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Mar 09 2023 Karolina Surma - 1:5.3.0-4 +- Fix tests related to missing setuptools and Babel 2.12 +- Fixes rhbz#2176685 + * Tue Jan 31 2023 Karolina Surma - 1:5.3.0-3 - Fix tests with python-pygments 2.14+ From 9a29732cf9f355a4ee6fa483d466a68f7436f6c9 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 9 Mar 2023 14:09:19 +0100 Subject: [PATCH 186/234] Update to 6.1.3 --- .gitignore | 1 + fix-tests-with-pygments-2.14.patch | 114 ----------------------------- python-sphinx.spec | 26 ++----- sources | 2 +- 4 files changed, 9 insertions(+), 134 deletions(-) delete mode 100644 fix-tests-with-pygments-2.14.patch diff --git a/.gitignore b/.gitignore index b4a2dc4..27c8b8c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /Sphinx-5.1.1.tar.gz /Sphinx-5.2.3.tar.gz /Sphinx-5.3.0.tar.gz +/Sphinx-6.1.3.tar.gz diff --git a/fix-tests-with-pygments-2.14.patch b/fix-tests-with-pygments-2.14.patch deleted file mode 100644 index 986e7d5..0000000 --- a/fix-tests-with-pygments-2.14.patch +++ /dev/null @@ -1,114 +0,0 @@ -From c3bf917fcf18c5211b220a7b294b7e6012c2d510 Mon Sep 17 00:00:00 2001 -From: Adam Turner <9087854+aa-turner@users.noreply.github.com> -Date: Sun, 1 Jan 2023 19:17:03 +0000 -Subject: [PATCH] Fix tests for Pygments 2.14 - -Pygments 2.14 was released on 01/01/2023 [0] - -[0]: https://pygments.org/docs/changelog/#version-2-14-0 - ---- - pyproject.toml | 2 +- - tests/test_ext_viewcode.py | 27 +++++++++++++++++++-------- - tests/test_intl.py | 11 +++++++++-- - 3 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 0e059b5..c02ce20 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -64,7 +64,7 @@ dependencies = [ - "sphinxcontrib-serializinghtml>=1.1.5", - "sphinxcontrib-qthelp", - "Jinja2>=3.0", -- "Pygments>=2.12", -+ "Pygments>=2.13", - "docutils>=0.14,<0.20", - "snowballstemmer>=2.0", - "babel>=2.9", -diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py -index 7750b8d..6d443d1 100644 ---- a/tests/test_ext_viewcode.py -+++ b/tests/test_ext_viewcode.py -@@ -2,6 +2,7 @@ - - import re - -+import pygments - import pytest - - -@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning): - - result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8') - result = re.sub('', '', result) # filter pygments classes -- assert ('
[docs]' -- '@decorator\n' -- 'class Class1' -- '(object):\n' -- ' """\n' -- ' this is Class1\n' -- ' """
\n') in result -+ if pygments.__version__ >= '2.14.0': -+ assert ('
[docs]' -+ '@decorator\n' -+ 'class Class1' -+ '(object):\n' -+ ' """\n' -+ ' this is Class1\n' -+ ' """
\n') in result -+ else: -+ assert ('
[docs]' -+ '@decorator\n' -+ 'class Class1' -+ '(object):\n' -+ ' """\n' -+ ' this is Class1\n' -+ ' """
\n') in result - - - @pytest.mark.sphinx('epub', testroot='ext-viewcode') -diff --git a/tests/test_intl.py b/tests/test_intl.py -index 796d95b..0c4b838 100644 ---- a/tests/test_intl.py -+++ b/tests/test_intl.py -@@ -6,6 +6,7 @@ Runs the text builder in the test root. - import os - import re - -+import pygments - import docutils - import pytest - from babel.messages import mofile, pofile -@@ -1105,8 +1106,11 @@ def test_additional_targets_should_not_be_translated(app): - expected_expr = ("""literal""" - """-""" - """block\n""" -- """in """ -+ """in""" -+ """ """ - """list""") -+ if pygments.__version__ < '2.14.0': -+ expected_expr = expected_expr.replace(""" """, ' ') - assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted -@@ -1184,8 +1188,11 @@ def test_additional_targets_should_be_translated(app): - expected_expr = ("""LITERAL""" - """-""" - """BLOCK\n""" -- """IN """ -+ """IN""" -+ """ """ - """LIST""") -+ if pygments.__version__ < '2.14.0': -+ expected_expr = expected_expr.replace(""" """, ' ') - assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted --- -2.39.1 - diff --git a/python-sphinx.spec b/python-sphinx.spec index fd4d0fe..dd7b298 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,19 +24,17 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 5.3.0 +%global general_version 6.1.3 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?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 +License: BSD and MIT URL: https://www.sphinx-doc.org/ Source0: %{pypi_source %{upstream_name} %{upstream_version}} @@ -45,10 +43,6 @@ Source0: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch1: sphinx-test_theming.diff -# Backported upstream commit included in Sphinx 6+ ensures compatibility -# with python-pygments 2.14+ -# https://github.com/sphinx-doc/sphinx/commit/965768bfda2a00ba6 -Patch2: fix-tests-with-pygments-2.14.patch # Backported upstream commit ensures compatibility with Babel 2.12 # https://github.com/sphinx-doc/sphinx/commit/c5641702b @@ -64,9 +58,6 @@ BuildRequires: pyproject-rpm-macros BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport %endif -# for fixes -BuildRequires: dos2unix - %if %{with tests} # tests import _testcapi BuildRequires: python%{python3_pkgversion}-test @@ -149,10 +140,6 @@ 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 @@ -251,9 +238,6 @@ This package contains documentation in the HTML format. %prep %autosetup -n %{upstream_name}-%{upstream_version} -p1 -# 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 @@ -374,6 +358,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Mar 10 2023 Karolina Surma - 1:6.1.3-1 +- Update to 6.1.3 +- Fixes rhbz#2135122 + * Thu Mar 09 2023 Karolina Surma - 1:5.3.0-4 - Fix tests related to missing setuptools and Babel 2.12 - Fixes rhbz#2176685 diff --git a/sources b/sources index 051ef77..744927d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-5.3.0.tar.gz) = cd2321409f7566c6333d6fc5c4eb4ed2d07490923b0c8762a31f062d9e5d86bbd9bd2c2bb3b93a00b37f31940173404dba8259de940fe402a248cf66a72cd7ae +SHA512 (Sphinx-6.1.3.tar.gz) = 97970f9c25355a5d40dedc7386415b84634f753f1f384ea2bbcee127ffcb637deca088daac615dce21518a32270b70e7e268321c72a4997d64d5eae99edadfbe From fa49ab85f05d0c522d96b3fca7ca4474840283e9 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 9 Mar 2023 14:10:10 +0100 Subject: [PATCH 187/234] Convert license to SPDX tag --- python-sphinx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index dd7b298..25e3516 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -32,9 +32,9 @@ Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator -# Unless otherwise noted, the license for code is BSD +# Unless otherwise noted, the license for code is BSD-2-Clause # sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT -License: BSD and MIT +License: BSD-2-Clause AND MIT URL: https://www.sphinx-doc.org/ Source0: %{pypi_source %{upstream_name} %{upstream_version}} From e46bed5658146dc2d52b0be2416dbbc13aeab089 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 17 Mar 2023 08:49:25 +0100 Subject: [PATCH 188/234] Undefine dedicated macro %_py3_shebang_s It is more readable and less magical. --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 25e3516..754ea9a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ # Unset -s on python shebang to allow RPM-installed sphinx to be used # with user-installed modules (#1903763) -%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//) +%undefine _py3_shebang_s # No internet in Koji %bcond_with internet From fd31a7629c3bdd2732f83e709893b99dc9eca714 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 17 Mar 2023 08:55:12 +0100 Subject: [PATCH 189/234] Stop enumerating sources and patches --- python-sphinx.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 754ea9a..60c76a5 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -37,16 +37,16 @@ Summary: Python documentation generator License: BSD-2-Clause AND MIT URL: https://www.sphinx-doc.org/ -Source0: %{pypi_source %{upstream_name} %{upstream_version}} +Source: %{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 +Patch: sphinx-test_theming.diff # Backported upstream commit ensures compatibility with Babel 2.12 # https://github.com/sphinx-doc/sphinx/commit/c5641702b -Patch3: fix-tests-with-babel-2.12.patch +Patch: fix-tests-with-babel-2.12.patch BuildArch: noarch From 5311862e59d268bd4b430f59c80c66136b7e74a3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 30 May 2023 12:48:43 -0400 Subject: [PATCH 190/234] Avoid html5lib test dependency in RHEL builds python-html5lib is unwanted in RHEL. --- python-sphinx.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 60c76a5..67fae3a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -248,6 +248,10 @@ rm -r tests/roots/test-setup/ rm tests/roots/test-theming/{MANIFEST.in,setup.py} rm tests/test_setup_command.py +%if %{defined rhel} +# unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182 +sed -i '/html5lib/d' pyproject.toml +%endif %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x test} @@ -327,7 +331,15 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib # Currently, all linkcheck tests and test_latex_images need internet # test_build_latex_doc needs internet to download pictures, # but fails also with it enabled, we decided to skip it entirely +# In RHEL builds, skip tests which use html5lib (excluded above) %pytest \ +%if %{defined rhel} + --ignore tests/test_build_html.py \ + --ignore tests/test_build_latex.py \ + --ignore tests/test_build_texinfo.py \ + --ignore tests/test_domain_std.py \ + --ignore tests/test_smartquotes.py \ +%endif %if %{without internet} -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \ %endif @@ -358,6 +370,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed May 31 2023 Yaakov Selkowitz - 1:6.1.3-2 +- Avoid html5lib test dependency in RHEL builds + * Fri Mar 10 2023 Karolina Surma - 1:6.1.3-1 - Update to 6.1.3 - Fixes rhbz#2135122 From 4b48db9c7940b0de9856144b9d7dbe9bcf081abc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:24:40 +0200 Subject: [PATCH 191/234] Bootstrap for Python 3.12 --- python-sphinx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 67fae3a..581805b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_tests 1 +%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -28,7 +30,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -370,6 +372,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Jun 13 2023 Python Maint - 1:6.1.3-3 +- Bootstrap for Python 3.12 + * Wed May 31 2023 Yaakov Selkowitz - 1:6.1.3-2 - Avoid html5lib test dependency in RHEL builds From 44a9235d5a3ffd60a2da4b254fe735540d128631 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 08:19:41 +0200 Subject: [PATCH 192/234] Rebuilt for Python 3.12 --- python-sphinx.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 581805b..8cd5ae3 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_tests 1 -%global _without_websupport 1 # When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency %bcond_without websupport @@ -30,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -372,6 +370,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jun 16 2023 Python Maint - 1:6.1.3-4 +- Rebuilt for Python 3.12 + * Tue Jun 13 2023 Python Maint - 1:6.1.3-3 - Bootstrap for Python 3.12 From 43d6afce76aeda33416a3ed61f912c26640608f7 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 2 May 2023 13:41:28 +0200 Subject: [PATCH 193/234] Update to 6.2.1 --- .gitignore | 1 + fix-tests-with-babel-2.12.patch | 48 --------------------------------- python-sphinx.spec | 18 +++++-------- sources | 2 +- 4 files changed, 8 insertions(+), 61 deletions(-) delete mode 100644 fix-tests-with-babel-2.12.patch diff --git a/.gitignore b/.gitignore index 27c8b8c..ad21f1c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /Sphinx-5.2.3.tar.gz /Sphinx-5.3.0.tar.gz /Sphinx-6.1.3.tar.gz +/Sphinx-6.2.1.tar.gz diff --git a/fix-tests-with-babel-2.12.patch b/fix-tests-with-babel-2.12.patch deleted file mode 100644 index e1992f2..0000000 --- a/fix-tests-with-babel-2.12.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c5641702b552d71bc99c1ba3b45073488a30d398 Mon Sep 17 00:00:00 2001 -From: Adam Turner <9087854+aa-turner@users.noreply.github.com> -Date: Sun, 5 Mar 2023 13:32:37 +0000 -Subject: [PATCH] Update tests for Babel 2.12 (CLDR 42) - ---- - tests/test_util_i18n.py | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/tests/test_util_i18n.py b/tests/test_util_i18n.py -index e52e27671d8..7be6f3e779a 100644 ---- a/tests/test_util_i18n.py -+++ b/tests/test_util_i18n.py -@@ -4,12 +4,15 @@ - import os - import warnings - -+import babel - import pytest - from babel.messages.mofile import read_mo - - from sphinx.errors import SphinxError - from sphinx.util import i18n - -+BABEL_VERSION = tuple(map(int, babel.__version__.split('.'))) -+ - - def test_catalog_info_for_file_and_path(): - cat = i18n.CatalogInfo('path', 'domain', 'utf-8') -@@ -78,10 +81,16 @@ def test_format_date(): - format = '%x' - assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016' - format = '%X' -- assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM' -+ if BABEL_VERSION >= (2, 12): -+ assert i18n.format_date(format, date=datet, language='en') == '5:11:17\u202fAM' -+ else: -+ assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM' - assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016' - format = '%c' -- assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM' -+ if BABEL_VERSION >= (2, 12): -+ assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17\u202fAM' -+ else: -+ assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM' - assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016' - - # timezone diff --git a/python-sphinx.spec b/python-sphinx.spec index 8cd5ae3..9f0c83e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -24,11 +24,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 6.1.3 +%global general_version 6.2.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -44,10 +44,6 @@ Source: %{pypi_source %{upstream_name} %{upstream_version}} Patch: sphinx-test_theming.diff -# Backported upstream commit ensures compatibility with Babel 2.12 -# https://github.com/sphinx-doc/sphinx/commit/c5641702b -Patch: fix-tests-with-babel-2.12.patch - BuildArch: noarch BuildRequires: make @@ -242,12 +238,6 @@ This package contains documentation in the HTML format. rm tests/test_ext_imgconverter.py %endif -# Remove the tests that rely on setuptools -# https://github.com/sphinx-doc/sphinx/commit/44326fe2476db44e8c2a60d9326c9c3ac2865c03 -rm -r tests/roots/test-setup/ -rm tests/roots/test-theming/{MANIFEST.in,setup.py} -rm tests/test_setup_command.py - %if %{defined rhel} # unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182 sed -i '/html5lib/d' pyproject.toml @@ -370,6 +360,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Jun 26 2023 Karolina Surma - 1:6.2.1-1 +- Update to 6.2.1 +- Fixes rhbz#2188968 + * Fri Jun 16 2023 Python Maint - 1:6.1.3-4 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 744927d..861e1df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-6.1.3.tar.gz) = 97970f9c25355a5d40dedc7386415b84634f753f1f384ea2bbcee127ffcb637deca088daac615dce21518a32270b70e7e268321c72a4997d64d5eae99edadfbe +SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062 From d236f3e2ecdebf472f23e8fa85de20735f23cc38 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 26 Jun 2023 19:11:21 +0200 Subject: [PATCH 194/234] Use the correct SPDX tag for -doc subpackage's license --- python-sphinx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 9f0c83e..d60e18a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -217,7 +217,7 @@ builder. %package doc Summary: Documentation for %{name} -License: BSD +License: BSD-2-Clause Recommends: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release} %description doc From 0896827c70e394527d09e26ab12c2751428439b0 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 13 Jul 2023 11:28:02 +0200 Subject: [PATCH 195/234] Don't use sphinxcontrib-websupport to build the documentation on RHEL --- python-sphinx.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index d60e18a..a884fa3 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,6 +1,7 @@ -# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport +# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport # Without it we have warnings in docs, but it's not a hard dependency -%bcond_without websupport +# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency +%bcond websupport %{undefined rhel} # Also, we don't have all the tests requirements %bcond_without tests @@ -28,7 +29,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -360,6 +361,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Jul 13 2023 Karolina Surma - 1:6.2.1-2 +- Don't use websupport to build documentation on RHEL + * Mon Jun 26 2023 Karolina Surma - 1:6.2.1-1 - Update to 6.2.1 - Fixes rhbz#2188968 From f907d7218a24a205a0d64dde99edf31e5360b06d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 14 Jul 2023 09:44:34 +0200 Subject: [PATCH 196/234] Modernize %bconds --- python-sphinx.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index a884fa3..eac02b3 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -3,24 +3,20 @@ # We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency %bcond websupport %{undefined rhel} # Also, we don't have all the tests requirements -%bcond_without tests +%bcond tests 1 # Unset -s on python shebang to allow RPM-installed sphinx to be used # with user-installed modules (#1903763) %undefine _py3_shebang_s # No internet in Koji -%bcond_with internet +%bcond internet 0 -%if 0%{?rhel} > 7 # Build without BuildRequires ImageMagick, to skip imgconverter tests -%bcond_with imagemagick_tests -%else -%bcond_without imagemagick_tests -%endif +%bcond imagemagick_tests %{undefined rhel} # During texlive updates, sometimes the latex environment is unstable -%bcond_without latex_tests +%bcond latex_tests 1 %global upstream_name Sphinx From d36e4d737bfb66f7b497ff14b343a587671f7140 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 14:14:17 +0000 Subject: [PATCH 197/234] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index eac02b3..5cfc93b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -357,6 +357,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1:6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 13 2023 Karolina Surma - 1:6.2.1-2 - Don't use websupport to build documentation on RHEL From cd973c604ca0036bc0822dcfd8aaa37e23cce9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 27 Jul 2023 10:36:15 +0200 Subject: [PATCH 198/234] Don't use filelock to test this package on RHEL --- python-sphinx.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 5cfc93b..5f501b8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,6 +14,8 @@ # Build without BuildRequires ImageMagick, to skip imgconverter tests %bcond imagemagick_tests %{undefined rhel} +# Same for filelock -- we don't want it in RHEL just to run a handful of tests here +%bcond filelock_tests %{undefined rhel} # During texlive updates, sometimes the latex environment is unstable %bcond latex_tests 1 @@ -25,7 +27,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -235,6 +237,11 @@ This package contains documentation in the HTML format. rm tests/test_ext_imgconverter.py %endif +%if %{without filelock_tests} +sed -i '/filelock/d' pyproject.toml +rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py +%endif + %if %{defined rhel} # unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182 sed -i '/html5lib/d' pyproject.toml @@ -357,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Jul 27 2023 Miro Hrončok - 1:6.2.1-4 +- Don't use filelock to test this package on RHEL + * Fri Jul 21 2023 Fedora Release Engineering - 1:6.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b64fb4b5b380a5d84ee5f1130f4a349d73d719d5 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 19 Jun 2023 12:30:21 +0200 Subject: [PATCH 199/234] Update to 7.0.1 --- .gitignore | 1 + python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ad21f1c..806e3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /Sphinx-5.3.0.tar.gz /Sphinx-6.1.3.tar.gz /Sphinx-6.2.1.tar.gz +/Sphinx-7.0.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 5f501b8..4f5a10b 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -23,11 +23,11 @@ %global upstream_name Sphinx Name: python-sphinx -%global general_version 6.2.1 +%global general_version 7.0.1 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -364,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Aug 07 2023 Karolina Surma - 1:7.0.1-1 +- Update to 7.0.1 + * Thu Jul 27 2023 Miro Hrončok - 1:6.2.1-4 - Don't use filelock to test this package on RHEL diff --git a/sources b/sources index 861e1df..e349895 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062 +SHA512 (Sphinx-7.0.1.tar.gz) = 3edbb0460dd5679a26ec8f13f25e4802e6a211735986b42f2ee8d5a15ace6eca044654da3bdca2be235130d9e81dbca1d80a070f8aa762df383b3415a2c1fba3 From 55bd0f7f4a601045dda57d0d9c54aa98d1652e91 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 14 Aug 2023 10:43:24 +0200 Subject: [PATCH 200/234] Update to 7.1.2 --- .gitignore | 1 + 85ffb3b0.patch | 100 +++++++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 10 ++++- sources | 2 +- 4 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 85ffb3b0.patch diff --git a/.gitignore b/.gitignore index 806e3ee..ef4595c 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /Sphinx-6.1.3.tar.gz /Sphinx-6.2.1.tar.gz /Sphinx-7.0.1.tar.gz +/sphinx-7.1.2.tar.gz diff --git a/85ffb3b0.patch b/85ffb3b0.patch new file mode 100644 index 0000000..97de128 --- /dev/null +++ b/85ffb3b0.patch @@ -0,0 +1,100 @@ +From 85ffb3b0fdcfefd5484e3fa895a46e3d11d7284f Mon Sep 17 00:00:00 2001 +From: Adam Turner <9087854+aa-turner@users.noreply.github.com> +Date: Mon, 7 Aug 2023 21:51:05 +0100 +Subject: [PATCH] Fix ``test_assets_order`` for Pygments 2.16 + +--- + tests/roots/test-html_file_checksum/conf.py | 1 + + tests/roots/test-html_file_checksum/index.rst | 0 + tests/roots/test-html_file_checksum/static/empty.js | 0 + .../roots/test-html_file_checksum/static/script.js | 1 + + .../test-html_file_checksum/static/stylesheet-a.css | 1 + + .../test-html_file_checksum/static/stylesheet-b.css | 1 + + tests/test_build_html.py | 13 ++++++++----- + 7 files changed, 12 insertions(+), 5 deletions(-) + create mode 100644 tests/roots/test-html_file_checksum/conf.py + create mode 100644 tests/roots/test-html_file_checksum/index.rst + create mode 100644 tests/roots/test-html_file_checksum/static/empty.js + create mode 100644 tests/roots/test-html_file_checksum/static/script.js + create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-a.css + create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-b.css + +diff --git a/tests/roots/test-html_file_checksum/conf.py b/tests/roots/test-html_file_checksum/conf.py +new file mode 100644 +index 00000000000..f9188142153 +--- /dev/null ++++ b/tests/roots/test-html_file_checksum/conf.py +@@ -0,0 +1 @@ ++html_static_path = ['static'] +diff --git a/tests/roots/test-html_file_checksum/index.rst b/tests/roots/test-html_file_checksum/index.rst +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/tests/roots/test-html_file_checksum/static/empty.js b/tests/roots/test-html_file_checksum/static/empty.js +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/tests/roots/test-html_file_checksum/static/script.js b/tests/roots/test-html_file_checksum/static/script.js +new file mode 100644 +index 00000000000..9a21456003e +--- /dev/null ++++ b/tests/roots/test-html_file_checksum/static/script.js +@@ -0,0 +1 @@ ++/* Script */ +diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-a.css b/tests/roots/test-html_file_checksum/static/stylesheet-a.css +new file mode 100644 +index 00000000000..3a5d802510d +--- /dev/null ++++ b/tests/roots/test-html_file_checksum/static/stylesheet-a.css +@@ -0,0 +1 @@ ++/* Stylesheet A */ +diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-b.css b/tests/roots/test-html_file_checksum/static/stylesheet-b.css +new file mode 100644 +index 00000000000..ad5ff28f692 +--- /dev/null ++++ b/tests/roots/test-html_file_checksum/static/stylesheet-b.css +@@ -0,0 +1 @@ ++/* Stylesheet B */ +diff --git a/tests/test_build_html.py b/tests/test_build_html.py +index 9a6326c69f5..5a10c964ae0 100644 +--- a/tests/test_build_html.py ++++ b/tests/test_build_html.py +@@ -10,6 +10,7 @@ + import pytest + from html5lib import HTMLParser + ++import sphinx.builders.html + from sphinx.builders.html import validate_html_extra_path, validate_html_static_path + from sphinx.errors import ConfigError + from sphinx.testing.util import strip_escseq +@@ -1172,7 +1173,9 @@ def test_html_assets(app): + + + @pytest.mark.sphinx('html', testroot='html_assets') +-def test_assets_order(app): ++def test_assets_order(app, monkeypatch): ++ monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '') ++ + app.add_css_file('normal.css') + app.add_css_file('early.css', priority=100) + app.add_css_file('late.css', priority=750) +@@ -1188,8 +1191,8 @@ def test_assets_order(app): + # css_files + expected = [ + '_static/early.css', +- '_static/pygments.css?v=b3523f8e', +- '_static/alabaster.css?v=039e1c02', ++ '_static/pygments.css', ++ '_static/alabaster.css', + 'https://example.com/custom.css', + '_static/normal.css', + '_static/late.css', +@@ -1202,8 +1205,8 @@ def test_assets_order(app): + # js_files + expected = [ + '_static/early.js', +- '_static/doctools.js?v=888ff710', +- '_static/sphinx_highlight.js?v=4825356b', ++ '_static/doctools.js', ++ '_static/sphinx_highlight.js', + 'https://example.com/script.js', + '_static/normal.js', + '_static/late.js', diff --git a/python-sphinx.spec b/python-sphinx.spec index 4f5a10b..50faca8 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -20,10 +20,10 @@ # During texlive updates, sometimes the latex environment is unstable %bcond latex_tests 1 -%global upstream_name Sphinx +%global upstream_name sphinx Name: python-sphinx -%global general_version 7.0.1 +%global general_version 7.1.2 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -42,6 +42,8 @@ Source: %{pypi_source %{upstream_name} %{upstream_version}} # which causes that test to fail. Patch: sphinx-test_theming.diff +# Fix test_assets_order for Sphinx 7.1.2 +Patch: https://github.com/sphinx-doc/sphinx/commit/85ffb3b0.patch BuildArch: noarch @@ -364,6 +366,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Aug 14 2023 Karolina Surma - 1:7.1.2-1 +- Update to 7.1.2 +- Fixes rhbz#2225274 + * Mon Aug 07 2023 Karolina Surma - 1:7.0.1-1 - Update to 7.0.1 diff --git a/sources b/sources index e349895..c6d348a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-7.0.1.tar.gz) = 3edbb0460dd5679a26ec8f13f25e4802e6a211735986b42f2ee8d5a15ace6eca044654da3bdca2be235130d9e81dbca1d80a070f8aa762df383b3415a2c1fba3 +SHA512 (sphinx-7.1.2.tar.gz) = d6bccdaa476c700bef444736bb439a4097b9cd40d9c2fce1c3bb889f3677b6d17fe2833b0d3cf4cd3e43927f5fe6f59825f290dabeb2736e77f7f1f26c84d2ec From d3ad84c154606595b6f0534d2b1aabee022ab2f6 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 14 Aug 2023 10:44:58 +0200 Subject: [PATCH 201/234] Use sphinx instead of the %{upstream_name} macro It's easily readable and the upstream name doesn't change that often. --- python-sphinx.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 50faca8..69ac6a1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -20,8 +20,6 @@ # During texlive updates, sometimes the latex environment is unstable %bcond latex_tests 1 -%global upstream_name sphinx - Name: python-sphinx %global general_version 7.1.2 #global prerel ... @@ -36,7 +34,7 @@ Summary: Python documentation generator License: BSD-2-Clause AND MIT URL: https://www.sphinx-doc.org/ -Source: %{pypi_source %{upstream_name} %{upstream_version}} +Source: %{pypi_source sphinx %{upstream_version}} # Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster # which causes that test to fail. @@ -233,7 +231,7 @@ This package contains documentation in the HTML format. %prep -%autosetup -n %{upstream_name}-%{upstream_version} -p1 +%autosetup -n sphinx-%{upstream_version} -p1 %if %{without imagemagick_tests} rm tests/test_ext_imgconverter.py From 5f7ebc734f7c83c479c9cb7596bdaa97daddd953 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 21 Sep 2023 14:08:55 +0200 Subject: [PATCH 202/234] Fix test_dark_style with python-pygments 2.16+ --- 083d573b.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 8 ++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 083d573b.patch diff --git a/083d573b.patch b/083d573b.patch new file mode 100644 index 0000000..f014777 --- /dev/null +++ b/083d573b.patch @@ -0,0 +1,56 @@ +From 083d573b7cf42d98f6c946715f52becba11d674b Mon Sep 17 00:00:00 2001 +From: Adam Turner <9087854+aa-turner@users.noreply.github.com> +Date: Mon, 7 Aug 2023 21:02:25 +0100 +Subject: [PATCH] Fix ``test_dark_style`` for Pygments 2.16 + +--- + tests/test_theming.py | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +diff --git a/tests/test_theming.py b/tests/test_theming.py +index 7473cb371c5..e3bd2a0f016 100644 +--- a/tests/test_theming.py ++++ b/tests/test_theming.py +@@ -5,6 +5,7 @@ + import alabaster + import pytest + ++import sphinx.builders.html + from sphinx.theming import ThemeError + + +@@ -91,18 +92,31 @@ def test_staticfiles(app, status, warning): + + @pytest.mark.sphinx(testroot='theming', + confoverrides={'html_theme': 'test-theme'}) +-def test_dark_style(app, status, warning): ++def test_dark_style(app, monkeypatch): ++ monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '') ++ + style = app.builder.dark_highlighter.formatter_args.get('style') + assert style.__name__ == 'MonokaiStyle' + + app.build() + assert (app.outdir / '_static' / 'pygments_dark.css').exists() + ++ css_file, properties = app.registry.css_files[0] ++ assert css_file == 'pygments_dark.css' ++ assert "media" in properties ++ assert properties["media"] == '(prefers-color-scheme: dark)' ++ ++ assert sorted(app.builder.css_files) == [ ++ '_static/classic.css', ++ '_static/pygments.css', ++ '_static/pygments_dark.css', ++ ] ++ + result = (app.outdir / 'index.html').read_text(encoding='utf8') +- assert '' in result ++ assert '' in result + assert ('') in result ++ 'href="_static/pygments_dark.css" />') in result + + + @pytest.mark.sphinx(testroot='theming') diff --git a/python-sphinx.spec b/python-sphinx.spec index 69ac6a1..46acb07 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -43,6 +43,9 @@ Patch: sphinx-test_theming.diff # Fix test_assets_order for Sphinx 7.1.2 Patch: https://github.com/sphinx-doc/sphinx/commit/85ffb3b0.patch +# Fix test_dark_style with Pygments 2.16+ +Patch: https://github.com/sphinx-doc/sphinx/commit/083d573b.patch + BuildArch: noarch BuildRequires: make @@ -364,6 +367,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Sep 21 2023 Karolina Surma - 1:7.1.2-2 +- Fix FTBFS with Pygments 2.16+ + * Mon Aug 14 2023 Karolina Surma - 1:7.1.2-1 - Update to 7.1.2 - Fixes rhbz#2225274 From 72bb1987ee1cb1700563d7d8f4ad076fcb0f2915 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 1 Sep 2023 10:17:06 +0200 Subject: [PATCH 203/234] Update to 7.2.6 --- .gitignore | 1 + 083d573b.patch | 56 ---------------------- 85ffb3b0.patch | 100 --------------------------------------- python-sphinx.spec | 22 +++++---- sources | 2 +- sphinx-test_theming.diff | 6 +-- 6 files changed, 19 insertions(+), 168 deletions(-) delete mode 100644 083d573b.patch delete mode 100644 85ffb3b0.patch diff --git a/.gitignore b/.gitignore index ef4595c..fd204f3 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /Sphinx-6.2.1.tar.gz /Sphinx-7.0.1.tar.gz /sphinx-7.1.2.tar.gz +/sphinx-7.2.6.tar.gz diff --git a/083d573b.patch b/083d573b.patch deleted file mode 100644 index f014777..0000000 --- a/083d573b.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 083d573b7cf42d98f6c946715f52becba11d674b Mon Sep 17 00:00:00 2001 -From: Adam Turner <9087854+aa-turner@users.noreply.github.com> -Date: Mon, 7 Aug 2023 21:02:25 +0100 -Subject: [PATCH] Fix ``test_dark_style`` for Pygments 2.16 - ---- - tests/test_theming.py | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/tests/test_theming.py b/tests/test_theming.py -index 7473cb371c5..e3bd2a0f016 100644 ---- a/tests/test_theming.py -+++ b/tests/test_theming.py -@@ -5,6 +5,7 @@ - import alabaster - import pytest - -+import sphinx.builders.html - from sphinx.theming import ThemeError - - -@@ -91,18 +92,31 @@ def test_staticfiles(app, status, warning): - - @pytest.mark.sphinx(testroot='theming', - confoverrides={'html_theme': 'test-theme'}) --def test_dark_style(app, status, warning): -+def test_dark_style(app, monkeypatch): -+ monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '') -+ - style = app.builder.dark_highlighter.formatter_args.get('style') - assert style.__name__ == 'MonokaiStyle' - - app.build() - assert (app.outdir / '_static' / 'pygments_dark.css').exists() - -+ css_file, properties = app.registry.css_files[0] -+ assert css_file == 'pygments_dark.css' -+ assert "media" in properties -+ assert properties["media"] == '(prefers-color-scheme: dark)' -+ -+ assert sorted(app.builder.css_files) == [ -+ '_static/classic.css', -+ '_static/pygments.css', -+ '_static/pygments_dark.css', -+ ] -+ - result = (app.outdir / 'index.html').read_text(encoding='utf8') -- assert '' in result -+ assert '' in result - assert ('') in result -+ 'href="_static/pygments_dark.css" />') in result - - - @pytest.mark.sphinx(testroot='theming') diff --git a/85ffb3b0.patch b/85ffb3b0.patch deleted file mode 100644 index 97de128..0000000 --- a/85ffb3b0.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 85ffb3b0fdcfefd5484e3fa895a46e3d11d7284f Mon Sep 17 00:00:00 2001 -From: Adam Turner <9087854+aa-turner@users.noreply.github.com> -Date: Mon, 7 Aug 2023 21:51:05 +0100 -Subject: [PATCH] Fix ``test_assets_order`` for Pygments 2.16 - ---- - tests/roots/test-html_file_checksum/conf.py | 1 + - tests/roots/test-html_file_checksum/index.rst | 0 - tests/roots/test-html_file_checksum/static/empty.js | 0 - .../roots/test-html_file_checksum/static/script.js | 1 + - .../test-html_file_checksum/static/stylesheet-a.css | 1 + - .../test-html_file_checksum/static/stylesheet-b.css | 1 + - tests/test_build_html.py | 13 ++++++++----- - 7 files changed, 12 insertions(+), 5 deletions(-) - create mode 100644 tests/roots/test-html_file_checksum/conf.py - create mode 100644 tests/roots/test-html_file_checksum/index.rst - create mode 100644 tests/roots/test-html_file_checksum/static/empty.js - create mode 100644 tests/roots/test-html_file_checksum/static/script.js - create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-a.css - create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-b.css - -diff --git a/tests/roots/test-html_file_checksum/conf.py b/tests/roots/test-html_file_checksum/conf.py -new file mode 100644 -index 00000000000..f9188142153 ---- /dev/null -+++ b/tests/roots/test-html_file_checksum/conf.py -@@ -0,0 +1 @@ -+html_static_path = ['static'] -diff --git a/tests/roots/test-html_file_checksum/index.rst b/tests/roots/test-html_file_checksum/index.rst -new file mode 100644 -index 00000000000..e69de29bb2d -diff --git a/tests/roots/test-html_file_checksum/static/empty.js b/tests/roots/test-html_file_checksum/static/empty.js -new file mode 100644 -index 00000000000..e69de29bb2d -diff --git a/tests/roots/test-html_file_checksum/static/script.js b/tests/roots/test-html_file_checksum/static/script.js -new file mode 100644 -index 00000000000..9a21456003e ---- /dev/null -+++ b/tests/roots/test-html_file_checksum/static/script.js -@@ -0,0 +1 @@ -+/* Script */ -diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-a.css b/tests/roots/test-html_file_checksum/static/stylesheet-a.css -new file mode 100644 -index 00000000000..3a5d802510d ---- /dev/null -+++ b/tests/roots/test-html_file_checksum/static/stylesheet-a.css -@@ -0,0 +1 @@ -+/* Stylesheet A */ -diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-b.css b/tests/roots/test-html_file_checksum/static/stylesheet-b.css -new file mode 100644 -index 00000000000..ad5ff28f692 ---- /dev/null -+++ b/tests/roots/test-html_file_checksum/static/stylesheet-b.css -@@ -0,0 +1 @@ -+/* Stylesheet B */ -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index 9a6326c69f5..5a10c964ae0 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -10,6 +10,7 @@ - import pytest - from html5lib import HTMLParser - -+import sphinx.builders.html - from sphinx.builders.html import validate_html_extra_path, validate_html_static_path - from sphinx.errors import ConfigError - from sphinx.testing.util import strip_escseq -@@ -1172,7 +1173,9 @@ def test_html_assets(app): - - - @pytest.mark.sphinx('html', testroot='html_assets') --def test_assets_order(app): -+def test_assets_order(app, monkeypatch): -+ monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '') -+ - app.add_css_file('normal.css') - app.add_css_file('early.css', priority=100) - app.add_css_file('late.css', priority=750) -@@ -1188,8 +1191,8 @@ def test_assets_order(app): - # css_files - expected = [ - '_static/early.css', -- '_static/pygments.css?v=b3523f8e', -- '_static/alabaster.css?v=039e1c02', -+ '_static/pygments.css', -+ '_static/alabaster.css', - 'https://example.com/custom.css', - '_static/normal.css', - '_static/late.css', -@@ -1202,8 +1205,8 @@ def test_assets_order(app): - # js_files - expected = [ - '_static/early.js', -- '_static/doctools.js?v=888ff710', -- '_static/sphinx_highlight.js?v=4825356b', -+ '_static/doctools.js', -+ '_static/sphinx_highlight.js', - 'https://example.com/script.js', - '_static/normal.js', - '_static/late.js', diff --git a/python-sphinx.spec b/python-sphinx.spec index 46acb07..9d835ad 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -21,11 +21,11 @@ %bcond latex_tests 1 Name: python-sphinx -%global general_version 7.1.2 +%global general_version 7.2.6 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -40,12 +40,6 @@ Source: %{pypi_source sphinx %{upstream_version}} # which causes that test to fail. Patch: sphinx-test_theming.diff -# Fix test_assets_order for Sphinx 7.1.2 -Patch: https://github.com/sphinx-doc/sphinx/commit/85ffb3b0.patch - -# Fix test_dark_style with Pygments 2.16+ -Patch: https://github.com/sphinx-doc/sphinx/commit/083d573b.patch - BuildArch: noarch BuildRequires: make @@ -250,6 +244,14 @@ rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py sed -i '/html5lib/d' pyproject.toml %endif +# Sphinx' tests import from each other, this feature is not supported by +# the 'importlib' import mode in pytest. Upstream mitigates this by invoking +# `python -m pytest` rather than `pytest` directly, but in the context of the +# RPM build we explicitly want to test the installed library rather than the +# one from PWD. +# https://github.com/sphinx-doc/sphinx/issues/11740 +sed -i '/"--import-mode=importlib",/d' pyproject.toml + %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x test} @@ -367,6 +369,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Oct 26 2023 Karolina Surma - 1:7.2.6-1 +- Update to 7.2.6 +- Fixes rhbz#2232469 + * Thu Sep 21 2023 Karolina Surma - 1:7.1.2-2 - Fix FTBFS with Pygments 2.16+ diff --git a/sources b/sources index c6d348a..aaab39a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sphinx-7.1.2.tar.gz) = d6bccdaa476c700bef444736bb439a4097b9cd40d9c2fce1c3bb889f3677b6d17fe2833b0d3cf4cd3e43927f5fe6f59825f290dabeb2736e77f7f1f26c84d2ec +SHA512 (sphinx-7.2.6.tar.gz) = 9a42e38c3c54429cc008b58892297ade4ccdd67561ee671e42a1fae976955895bb5383d58cb66a4f9f7edd1cc50dc2d1f083efeef036eac9fffc205979d3ccbc diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff index 975305e..30994a1 100644 --- a/sphinx-test_theming.diff +++ b/sphinx-test_theming.diff @@ -7,6 +7,6 @@ diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_them # test Theme class API - assert set(app.registry.html_themes.keys()) == set(themes) + assert set(app.registry.html_themes.keys()) >= set(themes) - assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme' - assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip' - assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles' + assert app.registry.html_themes['test-theme'] == str(app.srcdir / 'test_theme' / 'test-theme') + assert app.registry.html_themes['ziptheme'] == str(app.srcdir / 'ziptheme.zip') + assert app.registry.html_themes['staticfiles'] == str(app.srcdir / 'test_theme' / 'staticfiles') From 3ae8dffd9306dffdca1bc3c7aa36547f0547e967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 8 Nov 2023 12:48:25 +0100 Subject: [PATCH 204/234] Weaken the runtime dependency on the first party sphinxcontrib packages For now, we don't BuildRequire them, to allow orphaning + retirement without reporting sphinx as impacted. Later, we can BuildRequire the remaining ones to produce a more complete documentation. --- 11747.patch | 189 +++++++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 38 ++++++++- 2 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 11747.patch diff --git a/11747.patch b/11747.patch new file mode 100644 index 0000000..4c41402 --- /dev/null +++ b/11747.patch @@ -0,0 +1,189 @@ +From a8371a919b4f1552853a879377251ad25c3d988f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 6 Nov 2023 13:44:17 +0100 +Subject: [PATCH] Make the first party extensions optional, add [extensions] + extra + +--- + pyproject.toml | 33 +++++++++++++++++++++++++++------ + sphinx/application.py | 18 ++++++++++++++---- + sphinx/testing/fixtures.py | 6 ++++++ + tests/test_api_translator.py | 2 ++ + tests/test_build_html.py | 3 +++ + 5 files changed, 52 insertions(+), 10 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a0ada3cd3ae..7cb0112897a 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,12 +55,6 @@ classifiers = [ + "Topic :: Utilities", + ] + dependencies = [ +- "sphinxcontrib-applehelp", +- "sphinxcontrib-devhelp", +- "sphinxcontrib-jsmath", +- "sphinxcontrib-htmlhelp>=2.0.0", +- "sphinxcontrib-serializinghtml>=1.1.9", +- "sphinxcontrib-qthelp", + "Jinja2>=3.0", + "Pygments>=2.14", + "docutils>=0.18.1,<0.21", +@@ -76,8 +70,35 @@ dependencies = [ + dynamic = ["version"] + + [project.optional-dependencies] ++applehelp = [ ++ "sphinxcontrib-applehelp", ++] ++devhelp = [ ++ "sphinxcontrib-devhelp", ++] ++jsmath = [ ++ "sphinxcontrib-jsmath", ++] ++htmlhelp = [ ++ "sphinxcontrib-htmlhelp>=2.0.0", ++] ++serializinghtml = [ ++ "sphinxcontrib-serializinghtml>=1.1.9", ++] ++qthelp = [ ++ "sphinxcontrib-qthelp", ++] ++extensions = [ ++ "sphinx[applehelp]", ++ "sphinx[devhelp]", ++ "sphinx[jsmath]", ++ "sphinx[htmlhelp]", ++ "sphinx[serializinghtml]", ++ "sphinx[qthelp]", ++] + docs = [ + "sphinxcontrib-websupport", ++ "sphinx[extensions]", + ] + lint = [ + "flake8>=3.5.0", +diff --git a/sphinx/application.py b/sphinx/application.py +index d5fbaa9f30a..776bafa1ee3 100644 +--- a/sphinx/application.py ++++ b/sphinx/application.py +@@ -24,7 +24,12 @@ + from sphinx import locale, package_dir + from sphinx.config import Config + from sphinx.environment import BuildEnvironment +-from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError ++from sphinx.errors import ( ++ ApplicationError, ++ ConfigError, ++ ExtensionError, ++ VersionRequirementError, ++) + from sphinx.events import EventManager + from sphinx.highlighting import lexer_classes + from sphinx.locale import __ +@@ -226,7 +231,7 @@ def __init__(self, srcdir: str | os.PathLike[str], confdir: str | os.PathLike[st + # load all built-in extension modules, first-party extension modules, + # and first-party themes + for extension in builtin_extensions: +- self.setup_extension(extension) ++ self.setup_extension(extension, optional=extension in _first_party_extensions) + + # load all user-given extension modules + for extension in self.config.extensions: +@@ -395,7 +400,7 @@ def build(self, force_all: bool = False, filenames: list[str] | None = None) -> + + # ---- general extensibility interface ------------------------------------- + +- def setup_extension(self, extname: str) -> None: ++ def setup_extension(self, extname: str, optional: bool = False) -> None: + """Import and setup a Sphinx extension module. + + Load the extension given by the module *name*. Use this if your +@@ -403,7 +408,12 @@ def setup_extension(self, extname: str) -> None: + called twice. + """ + logger.debug('[app] setting up extension: %r', extname) +- self.registry.load_extension(self, extname) ++ try: ++ self.registry.load_extension(self, extname) ++ except ExtensionError: ++ logger.debug('[app] extension not found: %r', extname) ++ if not optional: ++ raise + + @staticmethod + def require_sphinx(version: tuple[int, int] | str) -> None: +diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py +index 0cc4882fe1c..f57f709b415 100644 +--- a/sphinx/testing/fixtures.py ++++ b/sphinx/testing/fixtures.py +@@ -22,6 +22,7 @@ + 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,' + ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.' + ), ++ 'sphinxcontrib(...): required sphinxcontrib.* extensions', + 'test_params(shared_result=...): test parameters.', + ] + +@@ -67,6 +68,11 @@ def app_params(request: Any, test_params: dict, shared_result: SharedResult, + sphinx.application.Sphinx initialization + """ + ++ # ##### process pytest.mark.sphinxcontrib ++ for info in reversed(list(request.node.iter_markers("sphinxcontrib"))): ++ for arg in info.args: ++ pytest.importorskip("sphinxcontrib." + arg) ++ + # ##### process pytest.mark.sphinx + + pargs = {} +diff --git a/tests/test_api_translator.py b/tests/test_api_translator.py +index 9f2bd448863..81575b71946 100644 +--- a/tests/test_api_translator.py ++++ b/tests/test_api_translator.py +@@ -36,6 +36,7 @@ def test_singlehtml_set_translator_for_singlehtml(app, status, warning): + assert translator_class.__name__ == 'ConfSingleHTMLTranslator' + + ++@pytest.mark.sphinxcontrib('serializinghtml') + @pytest.mark.sphinx('pickle', testroot='api-set-translator') + def test_pickle_set_translator_for_pickle(app, status, warning): + translator_class = app.builder.get_translator_class() +@@ -43,6 +44,7 @@ def test_pickle_set_translator_for_pickle(app, status, warning): + assert translator_class.__name__ == 'ConfPickleTranslator' + + ++@pytest.mark.sphinxcontrib('serializinghtml') + @pytest.mark.sphinx('json', testroot='api-set-translator') + def test_json_set_translator_for_json(app, status, warning): + translator_class = app.builder.get_translator_class() +diff --git a/tests/test_build_html.py b/tests/test_build_html.py +index a89a6fcafaf..8bd44111853 100644 +--- a/tests/test_build_html.py ++++ b/tests/test_build_html.py +@@ -1547,6 +1547,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('serializinghtml', 'jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath']}) +@@ -1567,6 +1568,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' # The another one is chosen + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath'], +@@ -1575,6 +1577,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.mathjax'], diff --git a/python-sphinx.spec b/python-sphinx.spec index 9d835ad..bc1b7fb 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Python documentation generator @@ -40,6 +40,21 @@ Source: %{pypi_source sphinx %{upstream_version}} # which causes that test to fail. Patch: sphinx-test_theming.diff +# Make the first party extensions optional +# This removes the runtime dependencies on: +# - sphinxcontrib.applehelp +# - sphinxcontrib.devhelp +# - sphinxcontrib.jsmath +# - sphinxcontrib.htmlhelp +# - sphinxcontrib.serializinghtml +# - sphinxcontrib.qthelp +# The majority of Fedora RPM packages does not need any of those. +# By removing the dependencies, we minimize the stuff that's pulled into +# the buildroots of 700+ of packages. +# +# The change is proposed upstream. +Patch: https://github.com/sphinx-doc/sphinx/pull/11747.patch + BuildArch: noarch BuildRequires: make @@ -132,6 +147,17 @@ Summary: Python documentation generator Recommends: graphviz Recommends: ImageMagick +# Upstream Requires those, but we have a patch to remove the dependency. +# We keep them Recommended to preserve the default user experience. +# (We don't desire them in RHEL.) +%if %{undefined rhel} +Recommends: python%{python3_pkgversion}-sphinxcontrib-applehelp +Recommends: python%{python3_pkgversion}-sphinxcontrib-devhelp +Recommends: python%{python3_pkgversion}-sphinxcontrib-jsmath +Recommends: python%{python3_pkgversion}-sphinxcontrib-htmlhelp +Recommends: python%{python3_pkgversion}-sphinxcontrib-serializinghtml +Recommends: python%{python3_pkgversion}-sphinxcontrib-qthelp +%endif %description -n python%{python3_pkgversion}-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -369,6 +395,16 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Nov 08 2023 Miro Hrončok - 1:7.2.6-2 +- Weaken the runtime dependency on: + - python3-sphinxcontrib-applehelp + - python3-sphinxcontrib-devhelp + - python3-sphinxcontrib-jsmath + - python3-sphinxcontrib-htmlhelp + - python3-sphinxcontrib-serializinghtml + - python3-sphinxcontrib-qthelp +- Packages that want to use them during build need to BuildRequire them explicitly + * Thu Oct 26 2023 Karolina Surma - 1:7.2.6-1 - Update to 7.2.6 - Fixes rhbz#2232469 From 3a7f1fc94433ce60de4621e196607f8d4f07bbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 16 Nov 2023 12:43:10 +0100 Subject: [PATCH 205/234] Repurpose the websupport bcond to a sphinxcontrib bcond On Fedora, BuildRequire the sphinxcontrib packages to build the documentation. We don't BR the packages that are orphaned, we anticipate their retirement. --- python-sphinx.spec | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index bc1b7fb..6bba4f7 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,7 +1,7 @@ -# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport -# Without it we have warnings in docs, but it's not a hard dependency -# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency -%bcond websupport %{undefined rhel} +# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-* +# Without the packages, we have warnings in docs, but it's not a hard dependency +# We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies +%bcond sphinxcontrib %{undefined rhel} # Also, we don't have all the tests requirements %bcond tests 1 @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Python documentation generator @@ -61,7 +61,12 @@ BuildRequires: make BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pyproject-rpm-macros -%if %{with websupport} +%if %{with sphinxcontrib} +# applehelp and jsmath have been orphaned, we cannot use the [docs] extra directly +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml +BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport %endif @@ -149,11 +154,9 @@ Recommends: ImageMagick # Upstream Requires those, but we have a patch to remove the dependency. # We keep them Recommended to preserve the default user experience. -# (We don't desire them in RHEL.) -%if %{undefined rhel} -Recommends: python%{python3_pkgversion}-sphinxcontrib-applehelp +%if %{with sphinxcontrib} +# applehelp and jsmath have been orphaned Recommends: python%{python3_pkgversion}-sphinxcontrib-devhelp -Recommends: python%{python3_pkgversion}-sphinxcontrib-jsmath Recommends: python%{python3_pkgversion}-sphinxcontrib-htmlhelp Recommends: python%{python3_pkgversion}-sphinxcontrib-serializinghtml Recommends: python%{python3_pkgversion}-sphinxcontrib-qthelp @@ -395,6 +398,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Thu Nov 16 2023 Miro Hrončok - 1:7.2.6-3 +- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation + * Wed Nov 08 2023 Miro Hrončok - 1:7.2.6-2 - Weaken the runtime dependency on: - python3-sphinxcontrib-applehelp From 70abcdbd9fa660d5c2571e3faad6b0248f6d6c35 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 12 Dec 2023 14:11:44 +0100 Subject: [PATCH 206/234] Fix test failures with Python 3.11.7, 3.12.1 and later --- 11774.patch | 69 ++++++++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 9 +++++- 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 11774.patch diff --git a/11774.patch b/11774.patch new file mode 100644 index 0000000..47370b2 --- /dev/null +++ b/11774.patch @@ -0,0 +1,69 @@ +From bc8939b34037f81b8610f3b26caec128ee20a2f4 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Tue, 28 Nov 2023 14:43:58 +0100 +Subject: [PATCH] Adjust the expected string to match Python 3.11+ changed + output + +--- + tests/test_ext_autodoc_configs.py | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +diff --git a/tests/test_ext_autodoc_configs.py b/tests/test_ext_autodoc_configs.py +index 45bc729b73e..0994c08e899 100644 +--- a/tests/test_ext_autodoc_configs.py ++++ b/tests/test_ext_autodoc_configs.py +@@ -11,6 +11,7 @@ + from .test_ext_autodoc import do_autodoc + + IS_PYPY = platform.python_implementation() == 'PyPy' ++IS_PY311_AND_LATER = sys.version_info >= (3, 11) + + + @contextmanager +@@ -1627,7 +1628,10 @@ def test_autodoc_default_options(app): + assert ' Iterate squares of each value.' in actual + if not IS_PYPY: + assert ' .. py:attribute:: CustomIter.__weakref__' in actual +- assert ' list of weak references to the object (if defined)' in actual ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' in actual ++ else: ++ assert ' list of weak references to the object (if defined)' in actual + + # :exclude-members: None - has no effect. Unlike :members:, + # :special-members:, etc. where None == "include all", here None means +@@ -1651,7 +1655,10 @@ def test_autodoc_default_options(app): + assert ' Iterate squares of each value.' in actual + if not IS_PYPY: + assert ' .. py:attribute:: CustomIter.__weakref__' in actual +- assert ' list of weak references to the object (if defined)' in actual ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' in actual ++ else: ++ assert ' list of weak references to the object (if defined)' in actual + assert ' .. py:method:: CustomIter.snafucate()' in actual + assert ' Makes this snafucated.' in actual + +@@ -1698,7 +1705,10 @@ def test_autodoc_default_options_with_values(app): + assert ' Iterate squares of each value.' in actual + if not IS_PYPY: + assert ' .. py:attribute:: CustomIter.__weakref__' not in actual +- assert ' list of weak references to the object (if defined)' not in actual ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' not in actual ++ else: ++ assert ' list of weak references to the object (if defined)' not in actual + + # with :exclude-members: + app.config.autodoc_default_options = { +@@ -1722,6 +1732,9 @@ def test_autodoc_default_options_with_values(app): + assert ' Iterate squares of each value.' in actual + if not IS_PYPY: + assert ' .. py:attribute:: CustomIter.__weakref__' not in actual +- assert ' list of weak references to the object (if defined)' not in actual ++ if IS_PY311_AND_LATER: ++ assert ' list of weak references to the object' not in actual ++ else: ++ assert ' list of weak references to the object (if defined)' not in actual + assert ' .. py:method:: CustomIter.snafucate()' not in actual + assert ' Makes this snafucated.' not in actual diff --git a/python-sphinx.spec b/python-sphinx.spec index 6bba4f7..6b74c11 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Python documentation generator @@ -55,6 +55,10 @@ Patch: sphinx-test_theming.diff # The change is proposed upstream. Patch: https://github.com/sphinx-doc/sphinx/pull/11747.patch +# Fix the expected test docstring to match output in Python 3.11.7, 3.12.1 and later +# Proposed upstream. +Patch: https://github.com/sphinx-doc/sphinx/pull/11774.patch + BuildArch: noarch BuildRequires: make @@ -398,6 +402,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Tue Dec 12 2023 Karolina Surma - 1:7.2.6-4 +- Fix the tests run when building with Python 3.11.7, 3.12.1 and later + * Thu Nov 16 2023 Miro Hrončok - 1:7.2.6-3 - On Fedora, BuildRequire the sphinxcontrib packages to build the documentation From 8af563fb2bfa91ec0c4292d466ea8d6df5c90d5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 07:19:13 +0000 Subject: [PATCH 207/234] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-sphinx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 6b74c11..3f1edcc 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Python documentation generator @@ -402,6 +402,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1:7.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 12 2023 Karolina Surma - 1:7.2.6-4 - Fix the tests run when building with Python 3.11.7, 3.12.1 and later From 854fb579d548ef24efa867ce2401acf3554d6954 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 15 Jan 2024 16:15:10 +0100 Subject: [PATCH 208/234] Suppress traceback when importing the weakened sphinxcontrib* dependencies --- ...-the-first-party-extensions-optional.patch | 93 +++++++++++-------- python-sphinx.spec | 10 +- 2 files changed, 61 insertions(+), 42 deletions(-) rename 11747.patch => Make-the-first-party-extensions-optional.patch (68%) diff --git a/11747.patch b/Make-the-first-party-extensions-optional.patch similarity index 68% rename from 11747.patch rename to Make-the-first-party-extensions-optional.patch index 4c41402..ad3985a 100644 --- a/11747.patch +++ b/Make-the-first-party-extensions-optional.patch @@ -1,19 +1,22 @@ -From a8371a919b4f1552853a879377251ad25c3d988f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 6 Nov 2023 13:44:17 +0100 +From 9699465414515f0eba76d05069e755b5bcf34eef Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Mon, 15 Jan 2024 16:19:32 +0100 Subject: [PATCH] Make the first party extensions optional, add [extensions] extra + +Co-authored-by: Miro Hrončok --- pyproject.toml | 33 +++++++++++++++++++++++++++------ - sphinx/application.py | 18 ++++++++++++++---- + sphinx/application.py | 6 +++--- + sphinx/registry.py | 9 ++++++--- sphinx/testing/fixtures.py | 6 ++++++ tests/test_api_translator.py | 2 ++ tests/test_build_html.py | 3 +++ - 5 files changed, 52 insertions(+), 10 deletions(-) + 6 files changed, 47 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index a0ada3cd3ae..7cb0112897a 100644 +index 8f93701..41c28c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,12 +55,6 @@ classifiers = [ @@ -66,60 +69,69 @@ index a0ada3cd3ae..7cb0112897a 100644 lint = [ "flake8>=3.5.0", diff --git a/sphinx/application.py b/sphinx/application.py -index d5fbaa9f30a..776bafa1ee3 100644 +index d5fbaa9..b030dab 100644 --- a/sphinx/application.py +++ b/sphinx/application.py -@@ -24,7 +24,12 @@ - from sphinx import locale, package_dir - from sphinx.config import Config - from sphinx.environment import BuildEnvironment --from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError -+from sphinx.errors import ( -+ ApplicationError, -+ ConfigError, -+ ExtensionError, -+ VersionRequirementError, -+) - from sphinx.events import EventManager - from sphinx.highlighting import lexer_classes - from sphinx.locale import __ -@@ -226,7 +231,7 @@ def __init__(self, srcdir: str | os.PathLike[str], confdir: str | os.PathLike[st +@@ -226,7 +226,7 @@ class Sphinx: # load all built-in extension modules, first-party extension modules, # and first-party themes for extension in builtin_extensions: - self.setup_extension(extension) -+ self.setup_extension(extension, optional=extension in _first_party_extensions) ++ self.setup_extension(extension, skip_nonimportable=extension in _first_party_extensions) # load all user-given extension modules for extension in self.config.extensions: -@@ -395,7 +400,7 @@ def build(self, force_all: bool = False, filenames: list[str] | None = None) -> +@@ -395,7 +395,7 @@ class Sphinx: # ---- general extensibility interface ------------------------------------- - def setup_extension(self, extname: str) -> None: -+ def setup_extension(self, extname: str, optional: bool = False) -> None: ++ def setup_extension(self, extname: str, skip_nonimportable: bool = False) -> None: """Import and setup a Sphinx extension module. Load the extension given by the module *name*. Use this if your -@@ -403,7 +408,12 @@ def setup_extension(self, extname: str) -> None: +@@ -403,7 +403,7 @@ class Sphinx: called twice. """ logger.debug('[app] setting up extension: %r', extname) - self.registry.load_extension(self, extname) -+ try: -+ self.registry.load_extension(self, extname) -+ except ExtensionError: -+ logger.debug('[app] extension not found: %r', extname) -+ if not optional: -+ raise ++ self.registry.load_extension(self, extname, skip_nonimportable=skip_nonimportable) @staticmethod def require_sphinx(version: tuple[int, int] | str) -> None: +diff --git a/sphinx/registry.py b/sphinx/registry.py +index 501661d..96d4554 100644 +--- a/sphinx/registry.py ++++ b/sphinx/registry.py +@@ -430,7 +430,7 @@ class SphinxComponentRegistry: + def add_html_theme(self, name: str, theme_path: str) -> None: + self.html_themes[name] = theme_path + +- def load_extension(self, app: Sphinx, extname: str) -> None: ++ def load_extension(self, app: Sphinx, extname: str, skip_nonimportable: bool = False) -> None: + """Load a Sphinx extension.""" + if extname in app.extensions: # already loaded + return +@@ -446,9 +446,12 @@ class SphinxComponentRegistry: + try: + mod = import_module(extname) + except ImportError as err: ++ msg = __('Could not import extension %s') ++ if skip_nonimportable: ++ logger.debug(msg % extname) ++ return + logger.verbose(__('Original exception:\n') + traceback.format_exc()) +- raise ExtensionError(__('Could not import extension %s') % extname, +- err) from err ++ raise ExtensionError(msg % extname, err) from err + + setup = getattr(mod, 'setup', None) + if setup is None: diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py -index 0cc4882fe1c..f57f709b415 100644 +index 0cc4882..f57f709 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py -@@ -22,6 +22,7 @@ +@@ -22,6 +22,7 @@ DEFAULT_ENABLED_MARKERS = [ 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,' ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.' ), @@ -140,7 +152,7 @@ index 0cc4882fe1c..f57f709b415 100644 pargs = {} diff --git a/tests/test_api_translator.py b/tests/test_api_translator.py -index 9f2bd448863..81575b71946 100644 +index 9f2bd44..81575b7 100644 --- a/tests/test_api_translator.py +++ b/tests/test_api_translator.py @@ -36,6 +36,7 @@ def test_singlehtml_set_translator_for_singlehtml(app, status, warning): @@ -160,10 +172,10 @@ index 9f2bd448863..81575b71946 100644 def test_json_set_translator_for_json(app, status, warning): translator_class = app.builder.get_translator_class() diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index a89a6fcafaf..8bd44111853 100644 +index 07f101d..c512a33 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py -@@ -1547,6 +1547,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): +@@ -1544,6 +1544,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): assert app.builder.math_renderer_name == 'imgmath' @@ -171,7 +183,7 @@ index a89a6fcafaf..8bd44111853 100644 @pytest.mark.sphinx('html', testroot='basic', confoverrides={'extensions': ['sphinxcontrib.jsmath', 'sphinx.ext.imgmath']}) -@@ -1567,6 +1568,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): +@@ -1564,6 +1565,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): assert app.builder.math_renderer_name == 'imgmath' # The another one is chosen @@ -179,7 +191,7 @@ index a89a6fcafaf..8bd44111853 100644 @pytest.mark.sphinx('html', testroot='basic', confoverrides={'extensions': ['sphinxcontrib.jsmath', 'sphinx.ext.imgmath'], -@@ -1575,6 +1577,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): +@@ -1572,6 +1574,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): assert app.builder.math_renderer_name == 'imgmath' @@ -187,3 +199,6 @@ index a89a6fcafaf..8bd44111853 100644 @pytest.mark.sphinx('html', testroot='basic', confoverrides={'extensions': ['sphinxcontrib.jsmath', 'sphinx.ext.mathjax'], +-- +2.43.0 + diff --git a/python-sphinx.spec b/python-sphinx.spec index 3f1edcc..aa94ee4 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: Python documentation generator @@ -52,8 +52,9 @@ Patch: sphinx-test_theming.diff # By removing the dependencies, we minimize the stuff that's pulled into # the buildroots of 700+ of packages. # -# The change is proposed upstream. -Patch: https://github.com/sphinx-doc/sphinx/pull/11747.patch +# This is a downstream-only change - rejected upstream. +# https://github.com/sphinx-doc/sphinx/pull/11747 +Patch: Make-the-first-party-extensions-optional.patch # Fix the expected test docstring to match output in Python 3.11.7, 3.12.1 and later # Proposed upstream. @@ -402,6 +403,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Jan 24 2024 Karolina Surma - 1:7.2.6-6 +- Suppress traceback when importing the weakened sphinxcontrib* dependencies + * Mon Jan 22 2024 Fedora Release Engineering - 1:7.2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 33d7e3b55b0028b7cbb391cd2fd5f5b67e49b5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jan 2024 15:40:09 +0100 Subject: [PATCH 209/234] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 608 ++++++++++++++++++++++++++++++++++++++++++++ python-sphinx.spec | 611 +-------------------------------------------- 2 files changed, 610 insertions(+), 609 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..bdb1639 --- /dev/null +++ b/changelog @@ -0,0 +1,608 @@ +* Wed Jan 24 2024 Karolina Surma - 1:7.2.6-6 +- Suppress traceback when importing the weakened sphinxcontrib* dependencies + +* Mon Jan 22 2024 Fedora Release Engineering - 1:7.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Dec 12 2023 Karolina Surma - 1:7.2.6-4 +- Fix the tests run when building with Python 3.11.7, 3.12.1 and later + +* Thu Nov 16 2023 Miro Hrončok - 1:7.2.6-3 +- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation + +* Wed Nov 08 2023 Miro Hrončok - 1:7.2.6-2 +- Weaken the runtime dependency on: + - python3-sphinxcontrib-applehelp + - python3-sphinxcontrib-devhelp + - python3-sphinxcontrib-jsmath + - python3-sphinxcontrib-htmlhelp + - python3-sphinxcontrib-serializinghtml + - python3-sphinxcontrib-qthelp +- Packages that want to use them during build need to BuildRequire them explicitly + +* Thu Oct 26 2023 Karolina Surma - 1:7.2.6-1 +- Update to 7.2.6 +- Fixes rhbz#2232469 + +* Thu Sep 21 2023 Karolina Surma - 1:7.1.2-2 +- Fix FTBFS with Pygments 2.16+ + +* Mon Aug 14 2023 Karolina Surma - 1:7.1.2-1 +- Update to 7.1.2 +- Fixes rhbz#2225274 + +* Mon Aug 07 2023 Karolina Surma - 1:7.0.1-1 +- Update to 7.0.1 + +* Thu Jul 27 2023 Miro Hrončok - 1:6.2.1-4 +- Don't use filelock to test this package on RHEL + +* Fri Jul 21 2023 Fedora Release Engineering - 1:6.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 Karolina Surma - 1:6.2.1-2 +- Don't use websupport to build documentation on RHEL + +* Mon Jun 26 2023 Karolina Surma - 1:6.2.1-1 +- Update to 6.2.1 +- Fixes rhbz#2188968 + +* Fri Jun 16 2023 Python Maint - 1:6.1.3-4 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 1:6.1.3-3 +- Bootstrap for Python 3.12 + +* Wed May 31 2023 Yaakov Selkowitz - 1:6.1.3-2 +- Avoid html5lib test dependency in RHEL builds + +* Fri Mar 10 2023 Karolina Surma - 1:6.1.3-1 +- Update to 6.1.3 +- Fixes rhbz#2135122 + +* Thu Mar 09 2023 Karolina Surma - 1:5.3.0-4 +- Fix tests related to missing setuptools and Babel 2.12 +- Fixes rhbz#2176685 + +* Tue Jan 31 2023 Karolina Surma - 1:5.3.0-3 +- Fix tests with python-pygments 2.14+ + +* Fri Jan 20 2023 Fedora Release Engineering - 1:5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 08 2022 Karolina Surma - 1:5.3.0-1 +- Update to 5.3.0 +- Fixes rhbz#2129546 + +* Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 +- Update to 5.1.1 +- Fixes rhbz#2110473 +- Remove reST documentation from the -doc package, ship only HTML + +* Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Karolina Surma - 1:5.0.2-1 +- Update to 5.0.2 + +* Mon Jun 13 2022 Python Maint - 1:4.5.0-3 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 1:4.5.0-2 +- Bootstrap for Python 3.11 + +* Fri Apr 01 2022 Karolina Surma - 1:4.5.0-1 +- Update to 4.5.0 +- Fixes rhbz#2068924 + +* Tue Feb 01 2022 Karolina Surma - 1:4.4.0-1 +- Update to 4.4.0 +- Fixes rhbz#2033955 + +* Fri Jan 21 2022 Fedora Release Engineering - 1:4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 29 2021 Karolina Surma - 1:4.3.1-1 +- Update to 4.3.1 +- Fixes rhbz#2027059 + +* Fri Nov 19 2021 Karolina Surma - 1:4.3.0-1 +- Update to 4.3.0 +- Fixes rhbz#2022111 + +* Fri Sep 17 2021 Karolina Surma - 1:4.2.0-1 +- Update to 4.2.0 +- Fixes rhbz#2003427 + +* Thu Sep 16 2021 Karolina Surma - 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 - 1:4.1.2-2 +- Patch python-sphinx to work with python-pygments >=2.10 + +* Mon Aug 02 2021 Karolina Surma - 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 - 1:4.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Karolina Surma - 1:4.0.2-1 +- Update to 4.0.2 +- Fixes rhbz#1948279 + +* Thu Jun 03 2021 Python Maint - 1:3.5.4-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 1:3.5.4-2 +- Bootstrap for Python 3.10 + +* Mon May 10 2021 Karolina Surma - 1:3.5.4-1 +- Update to 3.5.4 +- Fixes rhbz#1949477 + +* Thu Apr 01 2021 Karolina Surma - 1:3.5.3-1 +- Update to 3.5.3 +- Fixes rhbz#1941161 + +* Wed Mar 10 2021 Charalampos Stratakis - 1:3.5.2-1 +- Update 3.5.2 +- Fixes rhbz#1928459 + +* Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Charalampos Stratakis - 1:3.4.3-1 +- Update to 3.4.3 +- Fixes rhbz#1909494 + +* Sat Dec 05 2020 Mattia Verga - 1:3.3.1-2 +- Unset -s from python shebang +- Fixes: rhbz#1903763 + +* Mon Nov 23 2020 Miro Hrončok - 1:3.3.1-1 +- Update to 3.3.1 +- Fixes: rhbz#1893752 + +* Wed Oct 14 2020 Tomas Hrnciar - 1:3.2.1-2 +- Backport commit to fix python-sphinx with python-pygments v2.7.1 + +* Tue Aug 18 2020 Miro Hrončok - 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 - 1:3.1.2-1 +- Update to 3.1.2 +- Fixes rhbz#1853901 + +* Wed Jul 29 2020 Fedora Release Engineering - 1:3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 +- Update to 3.1.1 (#1783776) + +* Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 1:2.2.2-3 +- Bootstrap for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1:2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 10 2019 Miro Hrončok - 1:2.2.2-1 +- Update to 2.2.2 (rhbz#1743018) + +* Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 16 2019 Miro Hrončok - 1:2.1.2-5 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 1:2.1.2-4 +- Bootstrap for Python 3.8 + +* Thu Aug 15 2019 Richard Shaw - 1:2.1.2-3 +- Rebuild for Python 3.8. + +* Fri Jul 26 2019 Fedora Release Engineering - 1:2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 23 2019 Miro Hrončok - 1:2.1.2-1 +- Update to 2.1.2 (#1716158) + +* Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 +- Update to 2.0.1 (#1697544) +- Own the sphinxcontrib directory (#1669790) + +* Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 +- Update to 2.0.0b2 + +* Wed Feb 27 2019 Miro Hrončok - 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 - 1:1.8.4-1 +- Update to 1.8.4. + +* Sat Feb 02 2019 Fedora Release Engineering - 1:1.7.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.6-1 +- Update to 1.7.6 + +* Fri Jul 13 2018 Miro Hrončok - 1:1.7.5-6 +- Remove unused dependencies on xapian and simplejson + +* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.5-4 +- Enable tests + +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-3 +- Enable websupport + +* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-2 +- Rebuilt for Python 3.7 + +* 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 + +* Fri Jun 15 2018 Miro Hrončok - 1:1.7.2-4 +- Bootstrap for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 1:1.7.2-3 +- Bootstrap for Python 3.7 + +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-2 +- Conditionalize the ImageMagick build dependency & tests + +* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-1 +- Update to 1.7.2 (bz#1558968) + +* Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 +- Update to 1.7.1 (bz#1534802) + +* Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Charalampos Stratakis - 1:1.6.6-1 +- Update to 1.6.6 (bz#1532435) + +* Mon Dec 11 2017 Iryna Shcherbina - 1:1.6.5-2 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Mon Nov 06 2017 Charalampos Stratakis - 1:1.6.5-1 +- Update to 1.6.5 (bz#1508237) + +* Mon Oct 09 2017 Troy Dawson - 1:1.6.4-2 +- Cleanup spec file conditionals + +* Tue Sep 26 2017 Charalampos Stratakis - 1:1.6.4-1 +- Update to 1.6.4 (bz#1426928) + +* Wed Sep 20 2017 Charalampos Stratakis - 1:1.6.3-3 +- Provide the epoch tag in order to keep the upgrade path clean. + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 20 2017 Charalampos Stratakis - - 1.6.3-1 +- Update to 1.6.3 (bz#1426928) + +* Sat Feb 18 2017 Toshio Kuratomi - - 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 - - 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 - 1.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Toshio Kuratomi - - 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 - - 1.5.1-4 +- Add recipe for setting the system default to the README.fedora + +* Wed Jan 18 2017 Toshio Kuratomi - - 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 - - 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 - 1.5.1-1 +- Update to 1.5.1 + +* Fri Dec 30 2016 Toshio Kuratomi - 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 - 1.4.9-1 +- Update to 1.4.9 +- Enable python3 tests + +* Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 +- Rebuild for Python 3.6 +- Disable python3 tests for now + +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 +- Added tex(luatex85.sty) dependency to support TexLive 2016 + +* Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 +- Update to 1.4.8 +- Alternatives fails for scripts sometimes (bz#1382405) + +* Sun Sep 4 2016 Avram Lubkin - 1.4.6-2 +- Alternatives fails for man pages due to existing files + +* Fri Sep 2 2016 Avram Lubkin - 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 - 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 - 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 - 1.4.4-1 +- Updated to 1.4.4 +- Added python-sphinx-locale for common locale files + +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 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 - 1.3.1-3 +- Restore using python2 scripts by default (#1285535) + +* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 +- Fix requirements of python2- subpackage +- Provide sphinx-*-{3.5,3} symlinks for each script + +* Tue Nov 24 2015 Julien Enselme - 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 - 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 - 1.2.3-4 +- Fix line encoding of bundled jquery.js + +* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-3 +- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies + +* Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Feb 5 2015 Michel Alexandre Salim - 1.2.3-1 +- Update to 1.2.3 +- Mark license file with %%license instead of %%doc + +* Thu Feb 5 2015 Michel Alexandre Salim - 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 - 1.2.2-9 +- python3-sphinx package also Provides: python3-sphinx-latex + +* Tue Feb 3 2015 Michel Alexandre Salim - 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 - 1.2.2-7 +- Disable separate LaTeX builder for now (bz#1185574) + +* Thu Jan 22 2015 Michel Alexandre Salim - 1.2.2-6 +- Split off LaTeX builder into its own subpackages, to remove TeXLive + dependencies from the main package. + Thanks to Robert Kuska 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 - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 27 2014 Bohuslav Kabrda - 1.2.2-4 +- Don't own the -3 scripts by python 2 package + +* Thu May 22 2014 Bohuslav Kabrda - 1.2.2-3 +- Add sphinx-*-3 links to scripts +Resolves: #1098109 + +* Fri May 9 2014 Orion Poplawski - 1.2.2-2 +- Rebuild for Python 3.4 + +* Fri May 9 2014 Orion Poplawski - 1.2.2-1 +- Update to 1.2.2 + +* Thu Feb 13 2014 Michel Salim - 1.2.1-1 +- Update to 1.2.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Mar 9 2013 Michel Salim - 1.1.3-7 +- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Aug 21 2012 Toshio Kuratomi - 1.1.3-5 +- Fix for use of sphinx's manpage writer with docutils-0.10 + +* Mon Aug 6 2012 Michel Salim - 1.1.3-4 +- Rebuild for Python 3.3 + +* Fri Aug 3 2012 David Malcolm - 1.1.3-3 +- remove rhel logic from with_python3 conditional + +* Sat Jul 21 2012 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Apr 5 2012 Michel Salim - 1.1.3-1 +- Update to 1.1.3 + +* Sun Feb 5 2012 Michel Salim - 1.1.2-5 +- Move python3 runtime dependencies to the right subpackage +- Properly exclude python3 binaries + +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Dec 17 2011 Michel Salim - 1.1.2-3 +- BR on texlive-latex for LaTeX tests + +* Thu Dec 8 2011 Michel Salim - 1.1.2-2 +- Enable python3 subpackage + +* Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 +- Update to upstream 1.1.2 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 +- Update to upstream 1.0.7 + +* Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 +- Update to upstream 1.0.6 + +* Mon Nov 1 2010 Michel Salim - 1.0.4-3 +- Fix -doc Makefile to allow regeneration of .rst files + +* Mon Nov 1 2010 Michel Salim - 1.0.4-2 +- Actually include *.js locale files +- Generate manpages + +* Fri Sep 17 2010 Michel Salim - 1.0.4-1 +- Update to 1.0.4 +- Remove BuildRoot and %%clean declarations + +* Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon May 31 2010 Toshio Kuratomi - 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 - 1.0-0.1.b1 +- Update to 1.0 beta 1 + +* Tue May 25 2010 Michel Salim - 0.6.6-1 +- Update to 0.6.6 + +* Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 +- Few minor tweaks to Gareth's spec file update + +* Mon May 10 2010 Gareth Armstrong - 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 - 0.6.4-1 +- Update to 0.6.4 +- Fixes a problem using autodoc with pylons projects. + +* Fri Sep 4 2009 Michel Salim - 0.6.3-1 +- Update to 0.6.3 + +* Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 +- Update to 0.6.2 -- upstream bugfix requested inside bz#512438 + +* Sun Jul 26 2009 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 05 2009 Luke Macken - 0.6.1-2 +- Add a patch to use our own setuptools package + +* Fri Apr 17 2009 Michel Salim - 0.6.1-1 +- Update to 0.6.1 + +* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 2 2009 Michel Salim - 0.5.1-1 +- Update to 0.5.1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.5-2 +- Rebuild for Python 2.6 + +* Mon Nov 24 2008 Michel Salim - 0.5-1 +- Update to 0.5 + +* Fri Oct 10 2008 Michel Salim - 0.4.3-1 +- Update to 0.4.3 + +* Wed Aug 27 2008 Toshio Kuratomi - 0.4.2-1.1 +- Fix for EL-5 build. + +* Mon Aug 25 2008 Michel Salim - 0.4.2-1 +- Update to 0.4.2 + +* Mon May 26 2008 Michel Salim - 0.3-1 +- Update to 0.3 + +* Fri May 2 2008 Michel Salim - 0.1.61950-3 +- Split documentation into subpackage +- Exclude C files (not built by default anyway) + +* Wed Apr 16 2008 José Matos - 0.1.61950-2 +- Build html documentation, include it and include the rst + documentation. + +* Thu Mar 27 2008 Michel Salim 0.1.61950-1 +- Initial package diff --git a/python-sphinx.spec b/python-sphinx.spec index aa94ee4..fd0c7e6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -25,7 +25,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 6%{?dist} +Release: %autorelease Epoch: 1 Summary: Python documentation generator @@ -403,611 +403,4 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog -* Wed Jan 24 2024 Karolina Surma - 1:7.2.6-6 -- Suppress traceback when importing the weakened sphinxcontrib* dependencies - -* Mon Jan 22 2024 Fedora Release Engineering - 1:7.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 12 2023 Karolina Surma - 1:7.2.6-4 -- Fix the tests run when building with Python 3.11.7, 3.12.1 and later - -* Thu Nov 16 2023 Miro Hrončok - 1:7.2.6-3 -- On Fedora, BuildRequire the sphinxcontrib packages to build the documentation - -* Wed Nov 08 2023 Miro Hrončok - 1:7.2.6-2 -- Weaken the runtime dependency on: - - python3-sphinxcontrib-applehelp - - python3-sphinxcontrib-devhelp - - python3-sphinxcontrib-jsmath - - python3-sphinxcontrib-htmlhelp - - python3-sphinxcontrib-serializinghtml - - python3-sphinxcontrib-qthelp -- Packages that want to use them during build need to BuildRequire them explicitly - -* Thu Oct 26 2023 Karolina Surma - 1:7.2.6-1 -- Update to 7.2.6 -- Fixes rhbz#2232469 - -* Thu Sep 21 2023 Karolina Surma - 1:7.1.2-2 -- Fix FTBFS with Pygments 2.16+ - -* Mon Aug 14 2023 Karolina Surma - 1:7.1.2-1 -- Update to 7.1.2 -- Fixes rhbz#2225274 - -* Mon Aug 07 2023 Karolina Surma - 1:7.0.1-1 -- Update to 7.0.1 - -* Thu Jul 27 2023 Miro Hrončok - 1:6.2.1-4 -- Don't use filelock to test this package on RHEL - -* Fri Jul 21 2023 Fedora Release Engineering - 1:6.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 13 2023 Karolina Surma - 1:6.2.1-2 -- Don't use websupport to build documentation on RHEL - -* Mon Jun 26 2023 Karolina Surma - 1:6.2.1-1 -- Update to 6.2.1 -- Fixes rhbz#2188968 - -* Fri Jun 16 2023 Python Maint - 1:6.1.3-4 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 1:6.1.3-3 -- Bootstrap for Python 3.12 - -* Wed May 31 2023 Yaakov Selkowitz - 1:6.1.3-2 -- Avoid html5lib test dependency in RHEL builds - -* Fri Mar 10 2023 Karolina Surma - 1:6.1.3-1 -- Update to 6.1.3 -- Fixes rhbz#2135122 - -* Thu Mar 09 2023 Karolina Surma - 1:5.3.0-4 -- Fix tests related to missing setuptools and Babel 2.12 -- Fixes rhbz#2176685 - -* Tue Jan 31 2023 Karolina Surma - 1:5.3.0-3 -- Fix tests with python-pygments 2.14+ - -* Fri Jan 20 2023 Fedora Release Engineering - 1:5.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 08 2022 Karolina Surma - 1:5.3.0-1 -- Update to 5.3.0 -- Fixes rhbz#2129546 - -* Mon Aug 15 2022 Karolina Surma - 1:5.1.1-1 -- Update to 5.1.1 -- Fixes rhbz#2110473 -- Remove reST documentation from the -doc package, ship only HTML - -* Fri Jul 22 2022 Fedora Release Engineering - 1:5.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 21 2022 Karolina Surma - 1:5.0.2-1 -- Update to 5.0.2 - -* Mon Jun 13 2022 Python Maint - 1:4.5.0-3 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 1:4.5.0-2 -- Bootstrap for Python 3.11 - -* Fri Apr 01 2022 Karolina Surma - 1:4.5.0-1 -- Update to 4.5.0 -- Fixes rhbz#2068924 - -* Tue Feb 01 2022 Karolina Surma - 1:4.4.0-1 -- Update to 4.4.0 -- Fixes rhbz#2033955 - -* Fri Jan 21 2022 Fedora Release Engineering - 1:4.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 29 2021 Karolina Surma - 1:4.3.1-1 -- Update to 4.3.1 -- Fixes rhbz#2027059 - -* Fri Nov 19 2021 Karolina Surma - 1:4.3.0-1 -- Update to 4.3.0 -- Fixes rhbz#2022111 - -* Fri Sep 17 2021 Karolina Surma - 1:4.2.0-1 -- Update to 4.2.0 -- Fixes rhbz#2003427 - -* Thu Sep 16 2021 Karolina Surma - 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 - 1:4.1.2-2 -- Patch python-sphinx to work with python-pygments >=2.10 - -* Mon Aug 02 2021 Karolina Surma - 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 - 1:4.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 11 2021 Karolina Surma - 1:4.0.2-1 -- Update to 4.0.2 -- Fixes rhbz#1948279 - -* Thu Jun 03 2021 Python Maint - 1:3.5.4-3 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 1:3.5.4-2 -- Bootstrap for Python 3.10 - -* Mon May 10 2021 Karolina Surma - 1:3.5.4-1 -- Update to 3.5.4 -- Fixes rhbz#1949477 - -* Thu Apr 01 2021 Karolina Surma - 1:3.5.3-1 -- Update to 3.5.3 -- Fixes rhbz#1941161 - -* Wed Mar 10 2021 Charalampos Stratakis - 1:3.5.2-1 -- Update 3.5.2 -- Fixes rhbz#1928459 - -* Wed Jan 27 2021 Fedora Release Engineering - 1:3.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Charalampos Stratakis - 1:3.4.3-1 -- Update to 3.4.3 -- Fixes rhbz#1909494 - -* Sat Dec 05 2020 Mattia Verga - 1:3.3.1-2 -- Unset -s from python shebang -- Fixes: rhbz#1903763 - -* Mon Nov 23 2020 Miro Hrončok - 1:3.3.1-1 -- Update to 3.3.1 -- Fixes: rhbz#1893752 - -* Wed Oct 14 2020 Tomas Hrnciar - 1:3.2.1-2 -- Backport commit to fix python-sphinx with python-pygments v2.7.1 - -* Tue Aug 18 2020 Miro Hrončok - 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 - 1:3.1.2-1 -- Update to 3.1.2 -- Fixes rhbz#1853901 - -* Wed Jul 29 2020 Fedora Release Engineering - 1:3.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 30 2020 Charalampos Stratakis - 1:3.1.1-1 -- Update to 3.1.1 (#1783776) - -* Sat May 23 2020 Miro Hrončok - 1:2.2.2-4 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 1:2.2.2-3 -- Bootstrap for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1:2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Dec 10 2019 Miro Hrončok - 1:2.2.2-1 -- Update to 2.2.2 (rhbz#1743018) - -* Thu Oct 03 2019 Miro Hrončok - 1:2.1.2-6 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Fri Aug 16 2019 Miro Hrončok - 1:2.1.2-5 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Miro Hrončok - 1:2.1.2-4 -- Bootstrap for Python 3.8 - -* Thu Aug 15 2019 Richard Shaw - 1:2.1.2-3 -- Rebuild for Python 3.8. - -* Fri Jul 26 2019 Fedora Release Engineering - 1:2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jun 23 2019 Miro Hrončok - 1:2.1.2-1 -- Update to 2.1.2 (#1716158) - -* Wed Apr 10 2019 Miro Hrončok - 1:2.0.1-1 -- Update to 2.0.1 (#1697544) -- Own the sphinxcontrib directory (#1669790) - -* Wed Mar 27 2019 Charalampos Stratakis - 1:2.0.0~b2-1 -- Update to 2.0.0b2 - -* Wed Feb 27 2019 Miro Hrončok - 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 - 1:1.8.4-1 -- Update to 1.8.4. - -* Sat Feb 02 2019 Fedora Release Engineering - 1:1.7.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.6-1 -- Update to 1.7.6 - -* Fri Jul 13 2018 Miro Hrončok - 1:1.7.5-6 -- Remove unused dependencies on xapian and simplejson - -* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek - 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 - 1:1.7.5-4 -- Enable tests - -* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-3 -- Enable websupport - -* Mon Jul 02 2018 Miro Hrončok - 1:1.7.5-2 -- Rebuilt for Python 3.7 - -* 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 - -* Fri Jun 15 2018 Miro Hrončok - 1:1.7.2-4 -- Bootstrap for Python 3.7 - -* Thu Jun 14 2018 Miro Hrončok - 1:1.7.2-3 -- Bootstrap for Python 3.7 - -* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-2 -- Conditionalize the ImageMagick build dependency & tests - -* Wed Apr 11 2018 Petr Viktorin - 1:1.7.2-1 -- Update to 1.7.2 (bz#1558968) - -* Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 -- Update to 1.7.1 (bz#1534802) - -* Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 09 2018 Charalampos Stratakis - 1:1.6.6-1 -- Update to 1.6.6 (bz#1532435) - -* Mon Dec 11 2017 Iryna Shcherbina - 1:1.6.5-2 -- Fix ambiguous Python 2 dependency declarations - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Mon Nov 06 2017 Charalampos Stratakis - 1:1.6.5-1 -- Update to 1.6.5 (bz#1508237) - -* Mon Oct 09 2017 Troy Dawson - 1:1.6.4-2 -- Cleanup spec file conditionals - -* Tue Sep 26 2017 Charalampos Stratakis - 1:1.6.4-1 -- Update to 1.6.4 (bz#1426928) - -* Wed Sep 20 2017 Charalampos Stratakis - 1:1.6.3-3 -- Provide the epoch tag in order to keep the upgrade path clean. - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 20 2017 Charalampos Stratakis - - 1.6.3-1 -- Update to 1.6.3 (bz#1426928) - -* Sat Feb 18 2017 Toshio Kuratomi - - 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 - - 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 - 1.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 31 2017 Toshio Kuratomi - - 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 - - 1.5.1-4 -- Add recipe for setting the system default to the README.fedora - -* Wed Jan 18 2017 Toshio Kuratomi - - 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 - - 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 - 1.5.1-1 -- Update to 1.5.1 - -* Fri Dec 30 2016 Toshio Kuratomi - 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 - 1.4.9-1 -- Update to 1.4.9 -- Enable python3 tests - -* Mon Dec 12 2016 Charalampos Stratakis - 1.4.8-3 -- Rebuild for Python 3.6 -- Disable python3 tests for now - -* Thu Oct 6 2016 Avram Lubkin - 1.4.8-2 -- Added tex(luatex85.sty) dependency to support TexLive 2016 - -* Thu Oct 6 2016 Avram Lubkin - 1.4.8-1 -- Update to 1.4.8 -- Alternatives fails for scripts sometimes (bz#1382405) - -* Sun Sep 4 2016 Avram Lubkin - 1.4.6-2 -- Alternatives fails for man pages due to existing files - -* Fri Sep 2 2016 Avram Lubkin - 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 - 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 - 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 - 1.4.4-1 -- Updated to 1.4.4 -- Added python-sphinx-locale for common locale files - -* Thu Feb 04 2016 Fedora Release Engineering - 1.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek - 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 - 1.3.1-3 -- Restore using python2 scripts by default (#1285535) - -* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek - 1.3.1-2 -- Fix requirements of python2- subpackage -- Provide sphinx-*-{3.5,3} symlinks for each script - -* Tue Nov 24 2015 Julien Enselme - 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 - 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 - 1.2.3-4 -- Fix line encoding of bundled jquery.js - -* Mon Jul 20 2015 Michel Alexandre Salim - 1.2.3-3 -- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies - -* Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Feb 5 2015 Michel Alexandre Salim - 1.2.3-1 -- Update to 1.2.3 -- Mark license file with %%license instead of %%doc - -* Thu Feb 5 2015 Michel Alexandre Salim - 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 - 1.2.2-9 -- python3-sphinx package also Provides: python3-sphinx-latex - -* Tue Feb 3 2015 Michel Alexandre Salim - 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 - 1.2.2-7 -- Disable separate LaTeX builder for now (bz#1185574) - -* Thu Jan 22 2015 Michel Alexandre Salim - 1.2.2-6 -- Split off LaTeX builder into its own subpackages, to remove TeXLive - dependencies from the main package. - Thanks to Robert Kuska 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 - 1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 27 2014 Bohuslav Kabrda - 1.2.2-4 -- Don't own the -3 scripts by python 2 package - -* Thu May 22 2014 Bohuslav Kabrda - 1.2.2-3 -- Add sphinx-*-3 links to scripts -Resolves: #1098109 - -* Fri May 9 2014 Orion Poplawski - 1.2.2-2 -- Rebuild for Python 3.4 - -* Fri May 9 2014 Orion Poplawski - 1.2.2-1 -- Update to 1.2.2 - -* Thu Feb 13 2014 Michel Salim - 1.2.1-1 -- Update to 1.2.1 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Mar 9 2013 Michel Salim - 1.1.3-7 -- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Aug 21 2012 Toshio Kuratomi - 1.1.3-5 -- Fix for use of sphinx's manpage writer with docutils-0.10 - -* Mon Aug 6 2012 Michel Salim - 1.1.3-4 -- Rebuild for Python 3.3 - -* Fri Aug 3 2012 David Malcolm - 1.1.3-3 -- remove rhel logic from with_python3 conditional - -* Sat Jul 21 2012 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Apr 5 2012 Michel Salim - 1.1.3-1 -- Update to 1.1.3 - -* Sun Feb 5 2012 Michel Salim - 1.1.2-5 -- Move python3 runtime dependencies to the right subpackage -- Properly exclude python3 binaries - -* Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Dec 17 2011 Michel Salim - 1.1.2-3 -- BR on texlive-latex for LaTeX tests - -* Thu Dec 8 2011 Michel Salim - 1.1.2-2 -- Enable python3 subpackage - -* Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 -- Update to upstream 1.1.2 - -* Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 -- Update to upstream 1.0.7 - -* Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 -- Update to upstream 1.0.6 - -* Mon Nov 1 2010 Michel Salim - 1.0.4-3 -- Fix -doc Makefile to allow regeneration of .rst files - -* Mon Nov 1 2010 Michel Salim - 1.0.4-2 -- Actually include *.js locale files -- Generate manpages - -* Fri Sep 17 2010 Michel Salim - 1.0.4-1 -- Update to 1.0.4 -- Remove BuildRoot and %%clean declarations - -* Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon May 31 2010 Toshio Kuratomi - 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 - 1.0-0.1.b1 -- Update to 1.0 beta 1 - -* Tue May 25 2010 Michel Salim - 0.6.6-1 -- Update to 0.6.6 - -* Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 -- Few minor tweaks to Gareth's spec file update - -* Mon May 10 2010 Gareth Armstrong - 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 - 0.6.4-1 -- Update to 0.6.4 -- Fixes a problem using autodoc with pylons projects. - -* Fri Sep 4 2009 Michel Salim - 0.6.3-1 -- Update to 0.6.3 - -* Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 -- Update to 0.6.2 -- upstream bugfix requested inside bz#512438 - -* Sun Jul 26 2009 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jun 05 2009 Luke Macken - 0.6.1-2 -- Add a patch to use our own setuptools package - -* Fri Apr 17 2009 Michel Salim - 0.6.1-1 -- Update to 0.6.1 - -* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 2 2009 Michel Salim - 0.5.1-1 -- Update to 0.5.1 - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.5-2 -- Rebuild for Python 2.6 - -* Mon Nov 24 2008 Michel Salim - 0.5-1 -- Update to 0.5 - -* Fri Oct 10 2008 Michel Salim - 0.4.3-1 -- Update to 0.4.3 - -* Wed Aug 27 2008 Toshio Kuratomi - 0.4.2-1.1 -- Fix for EL-5 build. - -* Mon Aug 25 2008 Michel Salim - 0.4.2-1 -- Update to 0.4.2 - -* Mon May 26 2008 Michel Salim - 0.3-1 -- Update to 0.3 - -* Fri May 2 2008 Michel Salim - 0.1.61950-3 -- Split documentation into subpackage -- Exclude C files (not built by default anyway) - -* Wed Apr 16 2008 José Matos - 0.1.61950-2 -- Build html documentation, include it and include the rst - documentation. - -* Thu Mar 27 2008 Michel Salim 0.1.61950-1 -- Initial package +%autochangelog From 8f5d120071e73be80449448d1625f85a17ec0209 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 13:47:26 +0200 Subject: [PATCH 210/234] Bootstrap for Python 3.13 --- python-sphinx.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-sphinx.spec b/python-sphinx.spec index fd0c7e6..a3bf722 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,3 +1,5 @@ +%global _without_sphinxcontrib 1 +%global _without_tests 1 # When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-* # Without the packages, we have warnings in docs, but it's not a hard dependency # We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies From cc540171662858573bab59fcd6d396e95b0e5521 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 16:49:43 +0200 Subject: [PATCH 211/234] Rebuilt for Python 3.13 --- python-sphinx.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index a3bf722..fd0c7e6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,5 +1,3 @@ -%global _without_sphinxcontrib 1 -%global _without_tests 1 # When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-* # Without the packages, we have warnings in docs, but it's not a hard dependency # We don't want to support sphinxcontrib-* in RHEL, hence disabling the dependencies From fa05224c3931da7a4cbd5630ae336c5161720a3b Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 26 Apr 2024 10:19:02 +0200 Subject: [PATCH 212/234] Update to 7.3.7 Upstream dropped the dependency on filelock and html5lib, so the relevant conditionals in the specfile were removed. sphinx-test_theming.patch needed to be rebased, so it is now a proper git patch. The pytest --import-mode=importlib problem was fixed upstream. --- .gitignore | 1 + 11774.patch | 69 --------- 12362.patch | 37 +++++ 12373.patch | 145 ++++++++++++++++++ ...-the-first-party-extensions-optional.patch | 121 +++++++-------- python-sphinx.spec | 58 +++---- sources | 2 +- sphinx-test_theming.diff | 12 -- sphinx-test_theming.patch | 25 +++ 9 files changed, 288 insertions(+), 182 deletions(-) delete mode 100644 11774.patch create mode 100644 12362.patch create mode 100644 12373.patch delete mode 100644 sphinx-test_theming.diff create mode 100644 sphinx-test_theming.patch diff --git a/.gitignore b/.gitignore index fd204f3..816d1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /Sphinx-7.0.1.tar.gz /sphinx-7.1.2.tar.gz /sphinx-7.2.6.tar.gz +/sphinx-7.3.7.tar.gz diff --git a/11774.patch b/11774.patch deleted file mode 100644 index 47370b2..0000000 --- a/11774.patch +++ /dev/null @@ -1,69 +0,0 @@ -From bc8939b34037f81b8610f3b26caec128ee20a2f4 Mon Sep 17 00:00:00 2001 -From: Karolina Surma -Date: Tue, 28 Nov 2023 14:43:58 +0100 -Subject: [PATCH] Adjust the expected string to match Python 3.11+ changed - output - ---- - tests/test_ext_autodoc_configs.py | 21 +++++++++++++++++---- - 1 file changed, 17 insertions(+), 4 deletions(-) - -diff --git a/tests/test_ext_autodoc_configs.py b/tests/test_ext_autodoc_configs.py -index 45bc729b73e..0994c08e899 100644 ---- a/tests/test_ext_autodoc_configs.py -+++ b/tests/test_ext_autodoc_configs.py -@@ -11,6 +11,7 @@ - from .test_ext_autodoc import do_autodoc - - IS_PYPY = platform.python_implementation() == 'PyPy' -+IS_PY311_AND_LATER = sys.version_info >= (3, 11) - - - @contextmanager -@@ -1627,7 +1628,10 @@ def test_autodoc_default_options(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' in actual -- assert ' list of weak references to the object (if defined)' in actual -+ if IS_PY311_AND_LATER: -+ assert ' list of weak references to the object' in actual -+ else: -+ assert ' list of weak references to the object (if defined)' in actual - - # :exclude-members: None - has no effect. Unlike :members:, - # :special-members:, etc. where None == "include all", here None means -@@ -1651,7 +1655,10 @@ def test_autodoc_default_options(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' in actual -- assert ' list of weak references to the object (if defined)' in actual -+ if IS_PY311_AND_LATER: -+ assert ' list of weak references to the object' in actual -+ else: -+ assert ' list of weak references to the object (if defined)' in actual - assert ' .. py:method:: CustomIter.snafucate()' in actual - assert ' Makes this snafucated.' in actual - -@@ -1698,7 +1705,10 @@ def test_autodoc_default_options_with_values(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' not in actual -- assert ' list of weak references to the object (if defined)' not in actual -+ if IS_PY311_AND_LATER: -+ assert ' list of weak references to the object' not in actual -+ else: -+ assert ' list of weak references to the object (if defined)' not in actual - - # with :exclude-members: - app.config.autodoc_default_options = { -@@ -1722,6 +1732,9 @@ def test_autodoc_default_options_with_values(app): - assert ' Iterate squares of each value.' in actual - if not IS_PYPY: - assert ' .. py:attribute:: CustomIter.__weakref__' not in actual -- assert ' list of weak references to the object (if defined)' not in actual -+ if IS_PY311_AND_LATER: -+ assert ' list of weak references to the object' not in actual -+ else: -+ assert ' list of weak references to the object (if defined)' not in actual - assert ' .. py:method:: CustomIter.snafucate()' not in actual - assert ' Makes this snafucated.' not in actual diff --git a/12362.patch b/12362.patch new file mode 100644 index 0000000..d3ca3f7 --- /dev/null +++ b/12362.patch @@ -0,0 +1,37 @@ +From 12f63b3a0425841f2bdcda3f08e656453ea59297 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 8 May 2024 14:38:35 +0200 +Subject: [PATCH] Move `defusedxml` import into the function using it + +Import `defusedxml` inside the `etree_parse()` function rather than +in global scope of `sphinx.testing.util`. This makes it possible +for reverse dependencies (such as `breathe`) to use this module without +adding an unnecessary transitive dependency on `defusedxml` when it's +not actually used. + +See also issue #12339. +--- + sphinx/testing/util.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py +index d1de8ea2b74..b2df709eea8 100644 +--- a/sphinx/testing/util.py ++++ b/sphinx/testing/util.py +@@ -11,7 +11,6 @@ + from types import MappingProxyType + from typing import TYPE_CHECKING + +-from defusedxml.ElementTree import parse as xml_parse + from docutils import nodes + from docutils.parsers.rst import directives, roles + +@@ -73,6 +72,8 @@ def assert_node(node: Node, cls: Any = None, xpath: str = "", **kwargs: Any) -> + # keep this to restrict the API usage and to have a correct return type + def etree_parse(path: str | os.PathLike[str]) -> ElementTree: + """Parse a file into a (safe) XML element tree.""" ++ from defusedxml.ElementTree import parse as xml_parse ++ + return xml_parse(path) + + diff --git a/12373.patch b/12373.patch new file mode 100644 index 0000000..2cb3c12 --- /dev/null +++ b/12373.patch @@ -0,0 +1,145 @@ +From 14da0bb6073a1ec60432340035d17948b3adb22a Mon Sep 17 00:00:00 2001 +From: Chris Sewell +Date: Wed, 15 May 2024 06:20:54 +0200 +Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20Fix=20python=203.13=20tests?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + tests/test_extensions/test_ext_autodoc.py | 2 +- + .../test_ext_autodoc_configs.py | 31 +++++++++++++------ + 2 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/tests/test_extensions/test_ext_autodoc.py b/tests/test_extensions/test_ext_autodoc.py +index a88d111bdb3..5a2e91cb5e9 100644 +--- a/tests/test_extensions/test_ext_autodoc.py ++++ b/tests/test_extensions/test_ext_autodoc.py +@@ -838,7 +838,7 @@ def test_autodoc_special_members(app): + "special-members": None, + } + if sys.version_info >= (3, 13, 0, 'alpha', 5): +- options["exclude-members"] = "__static_attributes__" ++ options["exclude-members"] = "__static_attributes__,__firstlineno__" + actual = do_autodoc(app, 'class', 'target.Class', options) + assert list(filter(lambda l: '::' in l, actual)) == [ + '.. py:class:: Class(arg)', +diff --git a/tests/test_extensions/test_ext_autodoc_configs.py b/tests/test_extensions/test_ext_autodoc_configs.py +index 6c2af5a0652..1262b15162b 100644 +--- a/tests/test_extensions/test_ext_autodoc_configs.py ++++ b/tests/test_extensions/test_ext_autodoc_configs.py +@@ -679,6 +679,10 @@ def test_autodoc_typehints_signature(app): + type_o = "~typing.Any | None" + else: + type_o = "~typing.Any" ++ if sys.version_info[:2] >= (3, 13): ++ type_ppp = "pathlib._local.PurePosixPath" ++ else: ++ type_ppp = "pathlib.PurePosixPath" + + options = {"members": None, + "undoc-members": None} +@@ -703,7 +707,7 @@ def test_autodoc_typehints_signature(app): + '', + '.. py:data:: CONST3', + ' :module: target.typehints', +- ' :type: ~pathlib.PurePosixPath', ++ f' :type: ~{type_ppp}', + " :value: PurePosixPath('/a/b/c')", + '', + ' docstring', +@@ -726,7 +730,7 @@ def test_autodoc_typehints_signature(app): + '', + ' .. py:attribute:: Math.CONST3', + ' :module: target.typehints', +- ' :type: ~pathlib.PurePosixPath', ++ f' :type: ~{type_ppp}', + " :value: PurePosixPath('/a/b/c')", + '', + '', +@@ -748,7 +752,7 @@ def test_autodoc_typehints_signature(app): + '', + ' .. py:property:: Math.path', + ' :module: target.typehints', +- ' :type: ~pathlib.PurePosixPath', ++ f' :type: ~{type_ppp}', + '', + '', + ' .. py:property:: Math.prop', +@@ -773,7 +777,7 @@ def test_autodoc_typehints_signature(app): + '', + ' docstring', + '', +- " alias of TypeVar('T', bound=\\ :py:class:`~pathlib.PurePosixPath`)", ++ f" alias of TypeVar('T', bound=\\ :py:class:`~{type_ppp}`)", + '', + '', + '.. py:function:: complex_func(arg1: str, arg2: List[int], arg3: Tuple[int, ' +@@ -802,6 +806,10 @@ def test_autodoc_typehints_signature(app): + @pytest.mark.sphinx('html', testroot='ext-autodoc', + confoverrides={'autodoc_typehints': "none"}) + def test_autodoc_typehints_none(app): ++ if sys.version_info[:2] >= (3, 13): ++ type_ppp = "pathlib._local.PurePosixPath" ++ else: ++ type_ppp = "pathlib.PurePosixPath" + options = {"members": None, + "undoc-members": None} + actual = do_autodoc(app, 'module', 'target.typehints', options) +@@ -887,7 +895,7 @@ def test_autodoc_typehints_none(app): + '', + ' docstring', + '', +- " alias of TypeVar('T', bound=\\ :py:class:`~pathlib.PurePosixPath`)", ++ f" alias of TypeVar('T', bound=\\ :py:class:`~{type_ppp}`)", + '', + '', + '.. py:function:: complex_func(arg1, arg2, arg3=None, *args, **kwargs)', +@@ -1417,7 +1425,10 @@ def test_autodoc_typehints_format_fully_qualified(app): + type_o = "typing.Any | None" + else: + type_o = "typing.Any" +- ++ if sys.version_info[:2] >= (3, 13): ++ type_ppp = "pathlib._local.PurePosixPath" ++ else: ++ type_ppp = "pathlib.PurePosixPath" + options = {"members": None, + "undoc-members": None} + actual = do_autodoc(app, 'module', 'target.typehints', options) +@@ -1441,7 +1452,7 @@ def test_autodoc_typehints_format_fully_qualified(app): + '', + '.. py:data:: CONST3', + ' :module: target.typehints', +- ' :type: pathlib.PurePosixPath', ++ f' :type: {type_ppp}', + " :value: PurePosixPath('/a/b/c')", + '', + ' docstring', +@@ -1464,7 +1475,7 @@ def test_autodoc_typehints_format_fully_qualified(app): + '', + ' .. py:attribute:: Math.CONST3', + ' :module: target.typehints', +- ' :type: pathlib.PurePosixPath', ++ f' :type: {type_ppp}', + " :value: PurePosixPath('/a/b/c')", + '', + '', +@@ -1486,7 +1497,7 @@ def test_autodoc_typehints_format_fully_qualified(app): + '', + ' .. py:property:: Math.path', + ' :module: target.typehints', +- ' :type: pathlib.PurePosixPath', ++ f' :type: {type_ppp}', + '', + '', + ' .. py:property:: Math.prop', +@@ -1511,7 +1522,7 @@ def test_autodoc_typehints_format_fully_qualified(app): + '', + ' docstring', + '', +- " alias of TypeVar('T', bound=\\ :py:class:`pathlib.PurePosixPath`)", ++ f" alias of TypeVar('T', bound=\\ :py:class:`{type_ppp}`)", + '', + '', + '.. py:function:: complex_func(arg1: str, arg2: List[int], arg3: Tuple[int, ' diff --git a/Make-the-first-party-extensions-optional.patch b/Make-the-first-party-extensions-optional.patch index ad3985a..8cb1801 100644 --- a/Make-the-first-party-extensions-optional.patch +++ b/Make-the-first-party-extensions-optional.patch @@ -1,25 +1,25 @@ -From 9699465414515f0eba76d05069e755b5bcf34eef Mon Sep 17 00:00:00 2001 +From b74128966fe4edf77a0c3a7936f6a6216833c9ed Mon Sep 17 00:00:00 2001 From: Karolina Surma -Date: Mon, 15 Jan 2024 16:19:32 +0100 +Date: Thu, 25 Apr 2024 15:58:03 +0200 Subject: [PATCH] Make the first party extensions optional, add [extensions] extra Co-authored-by: Miro Hrončok --- - pyproject.toml | 33 +++++++++++++++++++++++++++------ - sphinx/application.py | 6 +++--- - sphinx/registry.py | 9 ++++++--- - sphinx/testing/fixtures.py | 6 ++++++ - tests/test_api_translator.py | 2 ++ - tests/test_build_html.py | 3 +++ - 6 files changed, 47 insertions(+), 12 deletions(-) + pyproject.toml | 33 ++++++++++++++++---- + sphinx/application.py | 6 ++-- + sphinx/registry.py | 9 ++++-- + sphinx/testing/fixtures.py | 7 +++++ + tests/test_builders/test_build_html_maths.py | 3 ++ + tests/test_writers/test_api_translator.py | 2 ++ + 6 files changed, 48 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 8f93701..41c28c5 100644 +index 8aa49aa..10fa20e 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -55,12 +55,6 @@ classifiers = [ +@@ -56,12 +56,6 @@ classifiers = [ "Topic :: Utilities", ] dependencies = [ @@ -31,8 +31,8 @@ index 8f93701..41c28c5 100644 - "sphinxcontrib-qthelp", "Jinja2>=3.0", "Pygments>=2.14", - "docutils>=0.18.1,<0.21", -@@ -76,8 +70,35 @@ dependencies = [ + "docutils>=0.18.1,<0.22", +@@ -78,8 +72,35 @@ dependencies = [ dynamic = ["version"] [project.optional-dependencies] @@ -69,10 +69,10 @@ index 8f93701..41c28c5 100644 lint = [ "flake8>=3.5.0", diff --git a/sphinx/application.py b/sphinx/application.py -index d5fbaa9..b030dab 100644 +index 7d16d9a..2a71074 100644 --- a/sphinx/application.py +++ b/sphinx/application.py -@@ -226,7 +226,7 @@ class Sphinx: +@@ -222,7 +222,7 @@ class Sphinx: # load all built-in extension modules, first-party extension modules, # and first-party themes for extension in builtin_extensions: @@ -81,7 +81,7 @@ index d5fbaa9..b030dab 100644 # load all user-given extension modules for extension in self.config.extensions: -@@ -395,7 +395,7 @@ class Sphinx: +@@ -391,7 +391,7 @@ class Sphinx: # ---- general extensibility interface ------------------------------------- @@ -90,7 +90,7 @@ index d5fbaa9..b030dab 100644 """Import and setup a Sphinx extension module. Load the extension given by the module *name*. Use this if your -@@ -403,7 +403,7 @@ class Sphinx: +@@ -399,7 +399,7 @@ class Sphinx: called twice. """ logger.debug('[app] setting up extension: %r', extname) @@ -100,10 +100,10 @@ index d5fbaa9..b030dab 100644 @staticmethod def require_sphinx(version: tuple[int, int] | str) -> None: diff --git a/sphinx/registry.py b/sphinx/registry.py -index 501661d..96d4554 100644 +index 7887858..ca95960 100644 --- a/sphinx/registry.py +++ b/sphinx/registry.py -@@ -430,7 +430,7 @@ class SphinxComponentRegistry: +@@ -436,7 +436,7 @@ class SphinxComponentRegistry: def add_html_theme(self, name: str, theme_path: str) -> None: self.html_themes[name] = theme_path @@ -112,7 +112,7 @@ index 501661d..96d4554 100644 """Load a Sphinx extension.""" if extname in app.extensions: # already loaded return -@@ -446,9 +446,12 @@ class SphinxComponentRegistry: +@@ -452,9 +452,12 @@ class SphinxComponentRegistry: try: mod = import_module(extname) except ImportError as err: @@ -125,24 +125,25 @@ index 501661d..96d4554 100644 - err) from err + raise ExtensionError(msg % extname, err) from err - setup = getattr(mod, 'setup', None) + setup: _ExtensionSetupFunc | None = getattr(mod, 'setup', None) if setup is None: diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py -index 0cc4882..f57f709 100644 +index 6e1a122..f3fe743 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py -@@ -22,6 +22,7 @@ DEFAULT_ENABLED_MARKERS = [ - 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,' - ' docutilsconf=None, parallel=0): arguments to initialize the sphinx test application.' +@@ -31,6 +31,7 @@ DEFAULT_ENABLED_MARKERS = [ + 'keep_going=False, builddir=None, docutils_conf=None' + '): arguments to initialize the sphinx test application.' ), + 'sphinxcontrib(...): required sphinxcontrib.* extensions', 'test_params(shared_result=...): test parameters.', ] -@@ -67,6 +68,11 @@ def app_params(request: Any, test_params: dict, shared_result: SharedResult, +@@ -80,6 +81,12 @@ def app_params( + Parameters that are specified by 'pytest.mark.sphinx' for sphinx.application.Sphinx initialization """ - ++ + # ##### process pytest.mark.sphinxcontrib + for info in reversed(list(request.node.iter_markers("sphinxcontrib"))): + for arg in info.args: @@ -150,11 +151,39 @@ index 0cc4882..f57f709 100644 + # ##### process pytest.mark.sphinx - pargs = {} -diff --git a/tests/test_api_translator.py b/tests/test_api_translator.py + pargs: dict[int, Any] = {} +diff --git a/tests/test_builders/test_build_html_maths.py b/tests/test_builders/test_build_html_maths.py +index 900846b..664c86e 100644 +--- a/tests/test_builders/test_build_html_maths.py ++++ b/tests/test_builders/test_build_html_maths.py +@@ -20,6 +20,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('serializinghtml', 'jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath']}) +@@ -40,6 +41,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' # The another one is chosen + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.imgmath'], +@@ -48,6 +50,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): + assert app.builder.math_renderer_name == 'imgmath' + + ++@pytest.mark.sphinxcontrib('jsmath') + @pytest.mark.sphinx('html', testroot='basic', + confoverrides={'extensions': ['sphinxcontrib.jsmath', + 'sphinx.ext.mathjax'], +diff --git a/tests/test_writers/test_api_translator.py b/tests/test_writers/test_api_translator.py index 9f2bd44..81575b7 100644 ---- a/tests/test_api_translator.py -+++ b/tests/test_api_translator.py +--- a/tests/test_writers/test_api_translator.py ++++ b/tests/test_writers/test_api_translator.py @@ -36,6 +36,7 @@ def test_singlehtml_set_translator_for_singlehtml(app, status, warning): assert translator_class.__name__ == 'ConfSingleHTMLTranslator' @@ -171,34 +200,6 @@ index 9f2bd44..81575b7 100644 @pytest.mark.sphinx('json', testroot='api-set-translator') def test_json_set_translator_for_json(app, status, warning): translator_class = app.builder.get_translator_class() -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index 07f101d..c512a33 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -1544,6 +1544,7 @@ def test_html_math_renderer_is_imgmath(app, status, warning): - assert app.builder.math_renderer_name == 'imgmath' - - -+@pytest.mark.sphinxcontrib('serializinghtml', 'jsmath') - @pytest.mark.sphinx('html', testroot='basic', - confoverrides={'extensions': ['sphinxcontrib.jsmath', - 'sphinx.ext.imgmath']}) -@@ -1564,6 +1565,7 @@ def test_html_math_renderer_is_duplicated2(app, status, warning): - assert app.builder.math_renderer_name == 'imgmath' # The another one is chosen - - -+@pytest.mark.sphinxcontrib('jsmath') - @pytest.mark.sphinx('html', testroot='basic', - confoverrides={'extensions': ['sphinxcontrib.jsmath', - 'sphinx.ext.imgmath'], -@@ -1572,6 +1574,7 @@ def test_html_math_renderer_is_chosen(app, status, warning): - assert app.builder.math_renderer_name == 'imgmath' - - -+@pytest.mark.sphinxcontrib('jsmath') - @pytest.mark.sphinx('html', testroot='basic', - confoverrides={'extensions': ['sphinxcontrib.jsmath', - 'sphinx.ext.mathjax'], -- -2.43.0 +2.44.0 diff --git a/python-sphinx.spec b/python-sphinx.spec index fd0c7e6..c47b340 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,14 +14,12 @@ # Build without BuildRequires ImageMagick, to skip imgconverter tests %bcond imagemagick_tests %{undefined rhel} -# Same for filelock -- we don't want it in RHEL just to run a handful of tests here -%bcond filelock_tests %{undefined rhel} # During texlive updates, sometimes the latex environment is unstable %bcond latex_tests 1 Name: python-sphinx -%global general_version 7.2.6 +%global general_version 7.3.7 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} @@ -38,7 +36,7 @@ Source: %{pypi_source sphinx %{upstream_version}} # Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster # which causes that test to fail. -Patch: sphinx-test_theming.diff +Patch: sphinx-test_theming.patch # Make the first party extensions optional # This removes the runtime dependencies on: @@ -56,9 +54,11 @@ Patch: sphinx-test_theming.diff # https://github.com/sphinx-doc/sphinx/pull/11747 Patch: Make-the-first-party-extensions-optional.patch -# Fix the expected test docstring to match output in Python 3.11.7, 3.12.1 and later -# Proposed upstream. -Patch: https://github.com/sphinx-doc/sphinx/pull/11774.patch +# Fix tests with Python 3.13+ +Patch: https://github.com/sphinx-doc/sphinx/pull/12373.patch + +# Lazily import defusedxml only when necessary +Patch: https://github.com/sphinx-doc/sphinx/pull/12362.patch BuildArch: noarch @@ -265,26 +265,9 @@ This package contains documentation in the HTML format. %autosetup -n sphinx-%{upstream_version} -p1 %if %{without imagemagick_tests} -rm tests/test_ext_imgconverter.py +rm tests/test_extensions/test_ext_imgconverter.py %endif -%if %{without filelock_tests} -sed -i '/filelock/d' pyproject.toml -rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py -%endif - -%if %{defined rhel} -# unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182 -sed -i '/html5lib/d' pyproject.toml -%endif - -# Sphinx' tests import from each other, this feature is not supported by -# the 'importlib' import mode in pytest. Upstream mitigates this by invoking -# `python -m pytest` rather than `pytest` directly, but in the context of the -# RPM build we explicitly want to test the installed library rather than the -# one from PWD. -# https://github.com/sphinx-doc/sphinx/issues/11740 -sed -i '/"--import-mode=importlib",/d' pyproject.toml %generate_buildrequires %pyproject_buildrequires -r %{?with_tests:-x test} @@ -364,25 +347,20 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib # Currently, all linkcheck tests and test_latex_images need internet # test_build_latex_doc needs internet to download pictures, # but fails also with it enabled, we decided to skip it entirely -# In RHEL builds, skip tests which use html5lib (excluded above) -%pytest \ -%if %{defined rhel} - --ignore tests/test_build_html.py \ - --ignore tests/test_build_latex.py \ - --ignore tests/test_build_texinfo.py \ - --ignore tests/test_domain_std.py \ - --ignore tests/test_smartquotes.py \ -%endif +# test_autodoc_type_aliases fails with Python 3.12.4, 3.13.0b3 +# skip temporarily until resolved: +# https://github.com/sphinx-doc/sphinx/issues/12430 +k="not test_autodoc_type_aliases" %if %{without internet} - -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \ -%endif -; +k="${k} and not linkcheck and not test_latex_images and not test_build_latex_doc" %endif +%pytest -k "${k}" +%endif %files -n python%{python3_pkgversion}-sphinx -f sphinx.lang -%license LICENSE -%doc AUTHORS CHANGES EXAMPLES README.rst +%license LICENSE.rst +%doc README.rst %{_bindir}/sphinx-* %{python3_sitelib}/sphinx/ %dir %{python3_sitelib}/sphinxcontrib/ @@ -398,7 +376,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %files doc -%license LICENSE +%license LICENSE.rst %doc html diff --git a/sources b/sources index aaab39a..861235a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sphinx-7.2.6.tar.gz) = 9a42e38c3c54429cc008b58892297ade4ccdd67561ee671e42a1fae976955895bb5383d58cb66a4f9f7edd1cc50dc2d1f083efeef036eac9fffc205979d3ccbc +SHA512 (sphinx-7.3.7.tar.gz) = f450eaaa26a0989e9065174e23488a7f647221750238516c5d06d403540eb4277fd480f03857d24acb6b7335458ae4535ad1ad533eff6d3bbba5521d9a6deb14 diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff deleted file mode 100644 index 30994a1..0000000 --- a/sphinx-test_theming.diff +++ /dev/null @@ -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 -@@ -25,7 +25,7 @@ - themes.append('alabaster') - - # test Theme class API -- assert set(app.registry.html_themes.keys()) == set(themes) -+ assert set(app.registry.html_themes.keys()) >= set(themes) - assert app.registry.html_themes['test-theme'] == str(app.srcdir / 'test_theme' / 'test-theme') - assert app.registry.html_themes['ziptheme'] == str(app.srcdir / 'ziptheme.zip') - assert app.registry.html_themes['staticfiles'] == str(app.srcdir / 'test_theme' / 'staticfiles') diff --git a/sphinx-test_theming.patch b/sphinx-test_theming.patch new file mode 100644 index 0000000..c6515f7 --- /dev/null +++ b/sphinx-test_theming.patch @@ -0,0 +1,25 @@ +From 57433d8036ab1e88ad7d6c4c1a45e438f722e276 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 25 Apr 2024 16:07:56 +0200 +Subject: [PATCH] Patch test_theming to accomodate for Fedora-added theme + +--- + tests/test_theming/test_theming.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_theming/test_theming.py b/tests/test_theming/test_theming.py +index 867f8a0..281bb45 100644 +--- a/tests/test_theming/test_theming.py ++++ b/tests/test_theming/test_theming.py +@@ -50,7 +50,7 @@ def test_theme_api(app, status, warning): + ] + + # test Theme class API +- assert set(app.registry.html_themes.keys()) == set(themes) ++ assert set(app.registry.html_themes.keys()) >= set(themes) + assert app.registry.html_themes['test-theme'] == str( + app.srcdir / 'test_theme' / 'test-theme' + ) +-- +2.44.0 + From 379ab359f3708b91c973ef4c6cf327be48dea881 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 15:58:53 +0000 Subject: [PATCH 213/234] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f1121b8bac0728fb98978c1ee298e9ef859faaaa Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 22 Aug 2024 11:20:13 +0200 Subject: [PATCH 214/234] Add a smoke test --- .fmf/version | 1 + plan.fmf | 5 +++++ tests/smoke/main.fmf | 9 +++++++++ tests/smoke/source/conf.py | 5 +++++ tests/smoke/source/index.rst | 15 +++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 .fmf/version create mode 100644 plan.fmf create mode 100644 tests/smoke/main.fmf create mode 100644 tests/smoke/source/conf.py create mode 100644 tests/smoke/source/index.rst diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..94cb32d --- /dev/null +++ b/plan.fmf @@ -0,0 +1,5 @@ +discover: + how: fmf +execute: + how: tmt + diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..80e8276 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,9 @@ +summary: run the basic documentation build +test: | + sphinx-build -M html source/ build/ && + grep '
' build/html/index.html && + grep '

Test docfile' build/html/index.html && + rm -rf build/ +require: + - python3-sphinx + - python3-sphinx-theme-alabaster diff --git a/tests/smoke/source/conf.py b/tests/smoke/source/conf.py new file mode 100644 index 0000000..3c43798 --- /dev/null +++ b/tests/smoke/source/conf.py @@ -0,0 +1,5 @@ +project = 'Test' +copyright = '2024, Test' +author = 'Test' +release = '0.3.0' +html_theme = 'alabaster' diff --git a/tests/smoke/source/index.rst b/tests/smoke/source/index.rst new file mode 100644 index 0000000..4d6fdff --- /dev/null +++ b/tests/smoke/source/index.rst @@ -0,0 +1,15 @@ +Test docfile +============ + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` From 383e230ab05de6c779bbae50f70fc5c2fcc4e69e Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 20 Sep 2024 16:10:35 +0200 Subject: [PATCH 215/234] Tests sphinx extensions with the package Tested extensions: - python-sphinx-theme-alabaster - python-sphinx_rtd_theme - python-sphinxcontrib-jquery The tested extensions are the one that we pull to CentOS Stream/RHEL. --- tests/include-sphinxcontrib-jquery/main.fmf | 11 +++++++++++ tests/include-sphinxcontrib-jquery/source/conf.py | 7 +++++++ .../source/index.rst | 0 tests/{smoke => smoke-alabaster}/main.fmf | 1 + tests/{smoke => smoke-alabaster}/source/conf.py | 0 tests/smoke-alabaster/source/index.rst | 15 +++++++++++++++ tests/smoke-rtd-theme/main.fmf | 11 +++++++++++ tests/smoke-rtd-theme/source/conf.py | 8 ++++++++ tests/smoke-rtd-theme/source/index.rst | 15 +++++++++++++++ 9 files changed, 68 insertions(+) create mode 100644 tests/include-sphinxcontrib-jquery/main.fmf create mode 100644 tests/include-sphinxcontrib-jquery/source/conf.py rename tests/{smoke => include-sphinxcontrib-jquery}/source/index.rst (100%) rename tests/{smoke => smoke-alabaster}/main.fmf (83%) rename tests/{smoke => smoke-alabaster}/source/conf.py (100%) create mode 100644 tests/smoke-alabaster/source/index.rst create mode 100644 tests/smoke-rtd-theme/main.fmf create mode 100644 tests/smoke-rtd-theme/source/conf.py create mode 100644 tests/smoke-rtd-theme/source/index.rst diff --git a/tests/include-sphinxcontrib-jquery/main.fmf b/tests/include-sphinxcontrib-jquery/main.fmf new file mode 100644 index 0000000..e447827 --- /dev/null +++ b/tests/include-sphinxcontrib-jquery/main.fmf @@ -0,0 +1,11 @@ +summary: run the basic documentation build +test: | + sphinx-build -M html source/ build/ && + grep '