- Update to 4.11.1:
* Fixes for newer sphinx releases - Switch to github tarball for tests and license - Add patch to fix build with sphinx 1.8: * sphinx18.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-breathe?expand=0&rev=6
This commit is contained in:
parent
0bd08016bc
commit
f1e9536ac4
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32
|
|
||||||
size 66285
|
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 6 14:17:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Update to 4.11.1:
|
||||||
|
* Fixes for newer sphinx releases
|
||||||
|
- Switch to github tarball for tests and license
|
||||||
|
- Add patch to fix build with sphinx 1.8:
|
||||||
|
* sphinx18.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 4 12:46:19 UTC 2018 - Matej Cepl <mcepl@suse.com>
|
Tue Dec 4 12:46:19 UTC 2018 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-breathe
|
# spec file for package python-breathe
|
||||||
#
|
#
|
||||||
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -20,34 +20,33 @@
|
|||||||
%define oldpython python
|
%define oldpython python
|
||||||
%bcond_without test
|
%bcond_without test
|
||||||
Name: python-breathe
|
Name: python-breathe
|
||||||
Version: 4.7.2
|
Version: 4.11.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Sphinx Doxygen renderer
|
Summary: Sphinx Doxygen renderer
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
Url: https://github.com/michaeljones/breathe
|
URL: https://github.com/michaeljones/breathe
|
||||||
Source: https://files.pythonhosted.org/packages/source/b/breathe/breathe-%{version}.tar.gz
|
Source: https://github.com/michaeljones/breathe/archive/v%{version}.tar.gz
|
||||||
|
Patch0: sphinx18.patch
|
||||||
|
BuildRequires: %{python_module Sphinx >= 1.8}
|
||||||
|
BuildRequires: %{python_module docutils >= 0.12}
|
||||||
|
BuildRequires: %{python_module mock}
|
||||||
|
BuildRequires: %{python_module nose}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
|
BuildRequires: %{python_module six >= 1.9}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
%if %{with test}
|
Requires: python-Sphinx >= 1.8
|
||||||
BuildRequires: %{python_module Sphinx >= 1.4}
|
Requires: python-docutils >= 0.12
|
||||||
BuildRequires: %{python_module docutils >= 0.5}
|
Requires: python-setuptools
|
||||||
BuildRequires: %{python_module six >= 1.4}
|
Requires: python-six >= 1.9
|
||||||
%endif
|
Provides: python-sphinxcontrib-breathe = %{version}
|
||||||
Requires: python-Sphinx >= 1.4
|
Obsoletes: python-sphinxcontrib-breathe < %{version}
|
||||||
Requires: python-docutils >= 0.5
|
BuildArch: noarch
|
||||||
Requires: python-six >= 1.4
|
|
||||||
%ifpython2
|
%ifpython2
|
||||||
Obsoletes: %{oldpython}-sphinxcontrib-breathe < %{version}
|
Obsoletes: %{oldpython}-sphinxcontrib-breathe < %{version}
|
||||||
Provides: %{oldpython}-sphinxcontrib-breathe = %{version}
|
Provides: %{oldpython}-sphinxcontrib-breathe = %{version}
|
||||||
%endif
|
%endif
|
||||||
%ifpython3
|
|
||||||
Provides: python3-sphinxcontrib-breathe = %{version}
|
|
||||||
Obsoletes: python3-sphinxcontrib-breathe <= %{version}
|
|
||||||
%endif
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%python_subpackages
|
%python_subpackages
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -56,6 +55,7 @@ able to read and render Doxygen xml output.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n breathe-%{version}
|
%setup -q -n breathe-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%python_build
|
||||||
@ -65,6 +65,9 @@ able to read and render Doxygen xml output.
|
|||||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||||
%python_clone -a %{buildroot}%{_bindir}/breathe-apidoc
|
%python_clone -a %{buildroot}%{_bindir}/breathe-apidoc
|
||||||
|
|
||||||
|
%check
|
||||||
|
%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} nosetests-%{$python_bin_suffix} -v tests/
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{python_install_alternative breathe-apidoc}
|
%{python_install_alternative breathe-apidoc}
|
||||||
|
|
||||||
@ -72,8 +75,8 @@ able to read and render Doxygen xml output.
|
|||||||
%{python_uninstall_alternative breathe-apidoc}
|
%{python_uninstall_alternative breathe-apidoc}
|
||||||
|
|
||||||
%files %{python_files}
|
%files %{python_files}
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
|
%license LICENSE
|
||||||
%python_alternative %{_bindir}/breathe-apidoc
|
%python_alternative %{_bindir}/breathe-apidoc
|
||||||
%{python_sitelib}/breathe
|
%{python_sitelib}/breathe
|
||||||
%{python_sitelib}/breathe-%{version}-py*.egg-info
|
%{python_sitelib}/breathe-%{version}-py*.egg-info
|
||||||
|
67
sphinx18.patch
Normal file
67
sphinx18.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
From 7c0a1ed9a14d9bb777df2657c99b82250e9851cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jakob Lykke Andersen <Jakob@caput.dk>
|
||||||
|
Date: Sun, 20 Jan 2019 14:03:02 +0100
|
||||||
|
Subject: [PATCH] Fix tests for 1.8
|
||||||
|
|
||||||
|
---
|
||||||
|
.travis.yml | 2 +-
|
||||||
|
tests/test_renderer.py | 20 +++++++++++++++-----
|
||||||
|
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/.travis.yml b/.travis.yml
|
||||||
|
index 7442ebc6..566c67ac 100644
|
||||||
|
--- a/.travis.yml
|
||||||
|
+++ b/.travis.yml
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
language: python
|
||||||
|
|
||||||
|
env:
|
||||||
|
- - SPHINX_VERSION=1.7.5 TRAVIS_CI=True
|
||||||
|
+ - SPHINX_VERSION=1.8.3 TRAVIS_CI=True
|
||||||
|
|
||||||
|
python:
|
||||||
|
- "2.7"
|
||||||
|
diff --git a/tests/test_renderer.py b/tests/test_renderer.py
|
||||||
|
index d1e88638..4298b957 100644
|
||||||
|
--- a/tests/test_renderer.py
|
||||||
|
+++ b/tests/test_renderer.py
|
||||||
|
@@ -6,6 +6,7 @@
|
||||||
|
from breathe.renderer.sphinxrenderer import SphinxRenderer
|
||||||
|
from breathe.renderer.filter import OpenFilter
|
||||||
|
from docutils import frontend, nodes, parsers, utils
|
||||||
|
+from sphinx.config import Config
|
||||||
|
from sphinx.domains.cpp import CPPDomain
|
||||||
|
from sphinx.domains.c import CDomain
|
||||||
|
|
||||||
|
@@ -53,17 +54,26 @@ class TestParam(paramTypeSub, TestDoxygenNode):
|
||||||
|
def __init__(self, **kwargs):
|
||||||
|
TestDoxygenNode.__init__(self, paramTypeSub, **kwargs)
|
||||||
|
|
||||||
|
-class MockConfig(object):
|
||||||
|
- cpp_id_attributes = []
|
||||||
|
- cpp_paren_attributes = []
|
||||||
|
- cpp_index_common_prefix = []
|
||||||
|
+
|
||||||
|
+class MockRegistry(object):
|
||||||
|
+ def get_envversion(self, app):
|
||||||
|
+ return None
|
||||||
|
+
|
||||||
|
+ def create_domains(self, env):
|
||||||
|
+ return []
|
||||||
|
|
||||||
|
|
||||||
|
class MockApp(object):
|
||||||
|
def __init__(self):
|
||||||
|
self.doctreedir = None
|
||||||
|
self.srcdir = None
|
||||||
|
- self.config = MockConfig()
|
||||||
|
+ self.config = Config()
|
||||||
|
+ self.config.pre_init_values()
|
||||||
|
+ self.config.init_values()
|
||||||
|
+ self.config.add('cpp_id_attributes', [], 'env', ())
|
||||||
|
+ self.config.add('cpp_paren_attributes', [], 'env', ())
|
||||||
|
+ self.config.add('cpp_index_common_prefix', [], 'env', ())
|
||||||
|
+ self.registry = MockRegistry()
|
||||||
|
|
||||||
|
|
||||||
|
class MockState:
|
3
v4.11.1.tar.gz
Normal file
3
v4.11.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:84723eefc7cc05da6895e2dd6e7c72926c5fd88a67de57edce42d99c058c7e06
|
||||||
|
size 170064
|
Loading…
Reference in New Issue
Block a user