Accepting request 689141 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/689141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Sphinx?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2019-03-29 19:38:15 +00:00 committed by Git OBS Bridge
commit 954a489999
8 changed files with 207 additions and 1261 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:217ad9ece2156ed9f8af12b5d2c82a499ddf2c70a33c5f81864a08d8c67b9efc
size 4724123

3
Sphinx-1.8.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08
size 5756582

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>test</package>
</multibuild>

View File

@ -1,12 +0,0 @@
Index: python-Sphinx/Sphinx-1.6.2/tests/test_build_latex.py
===================================================================
--- Sphinx-1.6.2/tests/test_build_latex.py
+++ Sphinx-1.6.2/tests/test_build_latex.py
@@ -1011,6 +1011,7 @@ def test_latex_raw_directive(app, status
@pytest.mark.sphinx('latex', testroot='images')
+@pytest.mark.skip(reason="no remote access in OBS")
def test_latex_remote_images(app, status, warning):
app.builder.build_all()

File diff suppressed because it is too large Load Diff

View File

@ -1,163 +0,0 @@
#
# spec file for package python-Sphinx-doc
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%if 0%{?suse_version} != 1315
%bcond_without latex
%else
%bcond_with latex
%endif
Name: python-Sphinx-doc
Version: 1.7.6
Release: 0
Summary: Documentation for python-Sphinx
License: BSD-2-Clause
Group: Documentation/Other
URL: http://sphinx-doc.org
Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
Patch1: disable-test.patch
BuildRequires: %{python_module Sphinx = %version}
BuildRequires: %{python_module html5lib}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest}
BuildRequires: ImageMagick
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-mypy
BuildRequires: python3-typed-ast
Recommends: %{name}-html = %{version}
BuildArch: noarch
%if %{with latex}
BuildRequires: python3-Sphinx-latex
%endif
%python_subpackages
%description
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources). It was originally created for the Python documentation, and
supports Python project documentation well, but C/C++ is likewise
supported.
Sphinx uses reStructuredText as its markup language. Sphinx draws from
the parsing and translating suite, the Docutils.
This package contains the documentation for Sphinx.
%package man
Summary: Man files for python-Sphinx
Group: Documentation/Man
Requires: %{name}-man-common = %{version}
Requires: python-Sphinx = %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
%description man
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the manual pages for the Sphinx executables.
%package -n %{name}-html
Summary: HTML Documentation for python-Sphinx
Group: Documentation/HTML
Provides: %{python_module Sphinx-doc-html = %{version}}
%description -n %{name}-html
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the HTML documentation for Sphinx.
%package -n %{name}-man-common
Summary: Man files for python-Sphinx - python-independent versions
Group: Documentation/Man
Provides: %{python_module Sphinx-doc-man-common = %{version}}
%description -n %{name}-man-common
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the Python version-independent manual pages for the
Sphinx executables.
%prep
%setup -q -n Sphinx-%{version}
%patch1 -p1
%build
# build documentation
%{_python_use_flavor python3}
mkdir build.doc
python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
python3 setup.py build_sphinx -b man
mv build/sphinx/{html,man} build.doc/
%install
install -d %{buildroot}%{_docdir}/python-Sphinx/
install -d %{buildroot}%{_mandir}/man1/
mv build.doc/html %{buildroot}%{_docdir}/python-Sphinx/
mv build.doc/man/sphinx-all.1 %{buildroot}%{_mandir}/man1/sphinx-all.1
mv build.doc/man/sphinx-apidoc.1 %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
mv build.doc/man/sphinx-build.1 %{buildroot}%{_mandir}/man1/sphinx-build.1
mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-all.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-build.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
%check
export LANG="en_US.UTF-8"
%python_exec -m pytest tests -k "not linkcheck" -v
%files %{python_files}
%license LICENSE
%doc AUTHORS EXAMPLES
%files %{python_files man}
%license LICENSE
%doc AUTHORS
%{_mandir}/man1/sphinx-all-%{python_bin_suffix}.1%{?ext_man}
%{_mandir}/man1/sphinx-apidoc-%{python_bin_suffix}.1%{?ext_man}
%{_mandir}/man1/sphinx-build-%{python_bin_suffix}.1%{?ext_man}
%{_mandir}/man1/sphinx-quickstart-%{python_bin_suffix}.1%{?ext_man}
%files -n %{name}-html
%license LICENSE
%doc AUTHORS
%dir %{_docdir}/python-Sphinx/
%{_docdir}/python-Sphinx/html/
%files -n %{name}-man-common
%license LICENSE
%doc AUTHORS
%{_mandir}/man1/sphinx-all.1%{?ext_man}
%{_mandir}/man1/sphinx-apidoc.1%{?ext_man}
%{_mandir}/man1/sphinx-build.1%{?ext_man}
%{_mandir}/man1/sphinx-quickstart.1%{?ext_man}
%changelog

View File

@ -1,3 +1,66 @@
-------------------------------------------------------------------
Wed Mar 27 16:39:15 UTC 2019 - Matej Cepl <mcepl@suse.com>
- Remove last remainder of python-Sphinx-doc-man-common subpackage
-------------------------------------------------------------------
Thu Mar 14 16:25:50 CET 2019 - Matej Cepl <mcepl@suse.com>
- Switch off test_latex_images test, because it tries to download
image from the www.python.org.
-------------------------------------------------------------------
Tue Mar 12 15:35:49 UTC 2019 - Matej Cepl <mcepl@suse.com>
- Remove lang packages
-------------------------------------------------------------------
Mon Mar 11 15:32:54 CET 2019 - Matej Cepl <mcepl@suse.com>
- Revert to multiple lang files using standard macros.
-------------------------------------------------------------------
Mon Mar 11 10:25:50 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Drop patch disable-test.patch no longer applicable
-------------------------------------------------------------------
Mon Mar 11 09:40:44 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 1.8.5:
* LaTeX: Remove extraneous space after author names on PDF title page (refs: #6004)
* #6026: LaTeX: A cross reference to definition list does not work
* #6046: LaTeX: TypeError is raised when invalid latex_elements given
* #6067: LaTeX: images having a target are concatenated to next line
* #6067: LaTeX: images having a target are not aligned even if specified
* #6019: imgconverter: Including multipage PDF fails
* #6047: autodoc: autofunction emits a warning for method objects
* #6028: graphviz: Ensure the graphviz filenames are reproducible
* #6068: doctest: skipif option may remove the code block from documentation
* #6136: :name: option for math directive causes a crash
* #6139: intersphinx: ValueError on failure reporting
* #6135: changes: Fix UnboundLocalError when any module found
-------------------------------------------------------------------
Wed Mar 6 16:28:12 CET 2019 - Matej Cepl <mcepl@suse.com>
- Rewrite the package to multibuild. Remove python-Sphinx-doc*.
- Fix %check to make tests passing.
-------------------------------------------------------------------
Tue Mar 5 10:17:45 UTC 2019 - Thomas Bechtold <tbechtold@suse.com>
- update to 1.8.4:
There are many changes so have a look at the following changes files:
* https://www.sphinx-doc.org/en/master/changes.html#release-1-8-4-released-feb-03-2019
* https://www.sphinx-doc.org/en/master/changes.html#release-1-8-3-released-dec-26-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-8-2-released-nov-11-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-8-1-released-sep-22-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-8-0-released-sep-13-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-7-9-released-sep-05-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-7-8-released-aug-29-2018
* https://www.sphinx-doc.org/en/master/changes.html#release-1-7-7-released-aug-19-2018
-------------------------------------------------------------------
Fri Dec 7 21:20:58 CET 2018 - mcepl@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-Sphinx
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,15 +23,22 @@
%else
%bcond_with latex
%endif
Name: python-Sphinx
Version: 1.7.6
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
%else
%define psuffix %{nil}
%bcond_with test
%endif
Name: python-Sphinx%{psuffix}
Version: 1.8.5
Release: 0
Summary: Python documentation generator
License: BSD-2-Clause
Group: Development/Languages/Python
URL: http://sphinx-doc.org
Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
Patch1: disable-test.patch
BuildRequires: %{python_module base}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@ -40,7 +47,7 @@ BuildRequires: python-rpm-macros
#!BuildIgnore: texinfo
Requires: python-Babel >= 1.3
Requires: python-Jinja2 >= 2.3
Requires: python-Pygments >= 2.0
Requires: python-Pygments >= 2.1
Requires: python-alabaster >= 0.7
Requires: python-docutils >= 0.11
Requires: python-imagesize
@ -52,8 +59,18 @@ Requires: python-sphinxcontrib-websupport
Requires(post): update-alternatives
Requires(postun): update-alternatives
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module Sphinx = %{version}}
BuildRequires: %{python_module html5lib}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module sphinxcontrib-websupport}
BuildRequires: ImageMagick
BuildRequires: python3-mypy
BuildRequires: python3-typed-ast
%endif
%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
Recommends: %{name}-doc-man
Recommends: python-Sphinx-doc-man
Recommends: python-SQLAlchemy >= 0.9
Recommends: python-Whoosh >= 2.0
%endif
@ -66,9 +83,6 @@ Requires: python-typing
Requires: python-typing
%endif
%endif
%if 0%{?suse_version}
Recommends: python-rst2pdf
%endif
%ifpython2
Obsoletes: %{oldpython}-sphinx < %{version}
Provides: %{oldpython}-sphinx = %{version}
@ -88,7 +102,8 @@ the parsing and translating suite, the Docutils.
%package latex
Summary: Sphinx packages for LaTeX
Group: Productivity/Publishing/TeX/Base
Requires: %{name} = %{version}
Requires: python-Sphinx = %{version}
Requires: texlive-gnu-freefont
Requires: texlive-latex
Requires: texlive-metafont
Requires: texlive-pdftex
@ -161,18 +176,71 @@ Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the LaTeX components for %{name}.
This package contains the LaTeX components for python-Sphinx.
%package -n python-Sphinx-doc
Summary: Man files for python-Sphinx
Group: Documentation/Other
Requires: python-Sphinx = %{version}
%description -n python-Sphinx-doc
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources). It was originally created for the Python documentation, and
supports Python project documentation well, but C/C++ is likewise
supported.
Sphinx uses reStructuredText as its markup language. Sphinx draws from
the parsing and translating suite, the Docutils.
This package contains the documentation for Sphinx.
%package -n python-Sphinx-doc-man
Summary: Man files for python-Sphinx
Group: Documentation/Man
Requires: python-Sphinx = %{version}
Requires(post): update-alternatives
Requires(postun): update-alternatives
Obsoletes: %{python_module Sphinx-doc-man-common <= %{version}}
%description -n python-Sphinx-doc-man
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the manual pages for the Sphinx executables.
%package -n python-Sphinx-doc-html
Summary: HTML Documentation for python-Sphinx
Group: Documentation/HTML
Provides: %{python_module Sphinx-doc-html = %{version}}
%description -n python-Sphinx-doc-html
Sphinx is a tool that facilitates creating documentation for Python
projects (or other documents consisting of multiple reStructuredText
sources).
This package contains the HTML documentation for Sphinx.
%prep
%setup -q -n Sphinx-%{version}
%patch1 -p1
sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line encoding
%build
%python_build
%if %{with test}
mkdir build.doc
python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
python3 setup.py build_sphinx -b man
mv build/sphinx/{html,man} build.doc/
%endif
%install
%if ! %{with test}
%python_install
%python_clone -a %{buildroot}%{_bindir}/sphinx-apidoc
@ -183,15 +251,51 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en
%python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib
%python_expand %fdupes %{buildroot}%{$python_sitelib}
# # Prepare lang lists
# %%find_lang sphinx
# %%python_expand grep -F "%%{$python_sitelib}" sphinx.lang > sphinx_%%{$python_bin_suffix}.lang
%else
mkdir -p %{buildroot}%{_docdir}/python-Sphinx/
mv build.doc/html %{buildroot}%{_docdir}/python-Sphinx/
mkdir -p %{buildroot}%{_mandir}/man1
mv build.doc/man/sphinx-all.1 %{buildroot}%{_mandir}/man1/sphinx-all.1
mv build.doc/man/sphinx-apidoc.1 %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
mv build.doc/man/sphinx-build.1 %{buildroot}%{_mandir}/man1/sphinx-build.1
mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-all.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-build.1
%python_clone %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
%endif
# Always deduplicate
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%if ! %{with test}
%post
%{python_install_alternative sphinx-apidoc sphinx-autogen sphinx-build sphinx-quickstart}
%postun
%python_uninstall_alternative sphinx-apidoc
%endif
%check
%if %{with test}
export LC_ALL="C.utf8"
%{python_expand export PYTHONPATH=$PYTHONPATH:%{buildroot}%{$python_sitelib}
py.test-%{$python_bin_suffix} --ignore=_build.python3 --ignore=_build.python2 -k 'not (linkcheck or test_latex_images)' -v tests
# $python -mpytest --ignore=_build.python3 --ignore=_build.python2 -k 'not linkcheck' -v tests
}
%endif
%files %{python_files}
%license LICENSE
%doc AUTHORS CHANGES README.rst
%if ! %{with test}
%python_alternative %{_bindir}/sphinx-apidoc
%python_alternative %{_bindir}/sphinx-autogen
%python_alternative %{_bindir}/sphinx-build
@ -209,6 +313,28 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en
%license LICENSE
%doc AUTHORS
%{python_sitelib}/sphinx/texinputs/
%endif
%endif
%if %{with test}
%files -n python-Sphinx-doc-man
%license LICENSE
%doc AUTHORS
%{_mandir}/man1/sphinx-all-*.1%{?ext_man}
%{_mandir}/man1/sphinx-apidoc-*.1%{?ext_man}
%{_mandir}/man1/sphinx-build-*.1%{?ext_man}
%{_mandir}/man1/sphinx-quickstart-*.1%{?ext_man}
%{_mandir}/man1/sphinx-all.1%{?ext_man}
%{_mandir}/man1/sphinx-apidoc.1%{?ext_man}
%{_mandir}/man1/sphinx-build.1%{?ext_man}
%{_mandir}/man1/sphinx-quickstart.1%{?ext_man}
%files -n python-Sphinx-doc-html
%license LICENSE
%doc AUTHORS
%dir %{_docdir}/python-Sphinx/
%{_docdir}/python-Sphinx/html/
%endif
%changelog