From f1e9536ac4f383490d051a52599aeb01e31c7b8af640ec7a96a95b4c53023d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 6 Mar 2019 14:21:16 +0000 Subject: [PATCH 1/2] - 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 --- breathe-4.7.2.tar.gz | 3 -- python-breathe.changes | 9 ++++++ python-breathe.spec | 41 ++++++++++++++------------ sphinx18.patch | 67 ++++++++++++++++++++++++++++++++++++++++++ v4.11.1.tar.gz | 3 ++ 5 files changed, 101 insertions(+), 22 deletions(-) delete mode 100644 breathe-4.7.2.tar.gz create mode 100644 sphinx18.patch create mode 100644 v4.11.1.tar.gz diff --git a/breathe-4.7.2.tar.gz b/breathe-4.7.2.tar.gz deleted file mode 100644 index a40f9b5..0000000 --- a/breathe-4.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32 -size 66285 diff --git a/python-breathe.changes b/python-breathe.changes index 9400f8b..5d34f62 100644 --- a/python-breathe.changes +++ b/python-breathe.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 6 14:17:25 UTC 2019 - Tomáš Chvátal + +- 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 diff --git a/python-breathe.spec b/python-breathe.spec index ebe419f..37e0507 100644 --- a/python-breathe.spec +++ b/python-breathe.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -20,34 +20,33 @@ %define oldpython python %bcond_without test Name: python-breathe -Version: 4.7.2 +Version: 4.11.1 Release: 0 Summary: Sphinx Doxygen renderer License: BSD-3-Clause Group: Development/Languages/Python -Url: https://github.com/michaeljones/breathe -Source: https://files.pythonhosted.org/packages/source/b/breathe/breathe-%{version}.tar.gz +URL: https://github.com/michaeljones/breathe +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 six >= 1.9} BuildRequires: fdupes BuildRequires: python-rpm-macros -%if %{with test} -BuildRequires: %{python_module Sphinx >= 1.4} -BuildRequires: %{python_module docutils >= 0.5} -BuildRequires: %{python_module six >= 1.4} -%endif -Requires: python-Sphinx >= 1.4 -Requires: python-docutils >= 0.5 -Requires: python-six >= 1.4 +Requires: python-Sphinx >= 1.8 +Requires: python-docutils >= 0.12 +Requires: python-setuptools +Requires: python-six >= 1.9 +Provides: python-sphinxcontrib-breathe = %{version} +Obsoletes: python-sphinxcontrib-breathe < %{version} +BuildArch: noarch %ifpython2 Obsoletes: %{oldpython}-sphinxcontrib-breathe < %{version} Provides: %{oldpython}-sphinxcontrib-breathe = %{version} %endif -%ifpython3 -Provides: python3-sphinxcontrib-breathe = %{version} -Obsoletes: python3-sphinxcontrib-breathe <= %{version} -%endif -BuildArch: noarch - %python_subpackages %description @@ -56,6 +55,7 @@ able to read and render Doxygen xml output. %prep %setup -q -n breathe-%{version} +%patch0 -p1 %build %python_build @@ -65,6 +65,9 @@ able to read and render Doxygen xml output. %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/breathe-apidoc +%check +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} nosetests-%{$python_bin_suffix} -v tests/ + %post %{python_install_alternative breathe-apidoc} @@ -72,8 +75,8 @@ able to read and render Doxygen xml output. %{python_uninstall_alternative breathe-apidoc} %files %{python_files} -%defattr(-,root,root,-) %doc README.rst +%license LICENSE %python_alternative %{_bindir}/breathe-apidoc %{python_sitelib}/breathe %{python_sitelib}/breathe-%{version}-py*.egg-info diff --git a/sphinx18.patch b/sphinx18.patch new file mode 100644 index 0000000..9c06ad5 --- /dev/null +++ b/sphinx18.patch @@ -0,0 +1,67 @@ +From 7c0a1ed9a14d9bb777df2657c99b82250e9851cf Mon Sep 17 00:00:00 2001 +From: Jakob Lykke Andersen +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: diff --git a/v4.11.1.tar.gz b/v4.11.1.tar.gz new file mode 100644 index 0000000..32748e8 --- /dev/null +++ b/v4.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84723eefc7cc05da6895e2dd6e7c72926c5fd88a67de57edce42d99c058c7e06 +size 170064 From 0e4a9ccadfc12ba4f725995c2efa26c1ff0736a5275797d352cd8f3b7dcbe5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 19 Mar 2019 14:59:36 +0000 Subject: [PATCH 2/2] - Update to 4.12.0: * More sphinx fixes - Remove merged patch sphinx18.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-breathe?expand=0&rev=7 --- python-breathe.changes | 7 +++++ python-breathe.spec | 5 +--- sphinx18.patch | 67 ------------------------------------------ v4.11.1.tar.gz | 3 -- v4.12.0.tar.gz | 3 ++ 5 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 sphinx18.patch delete mode 100644 v4.11.1.tar.gz create mode 100644 v4.12.0.tar.gz diff --git a/python-breathe.changes b/python-breathe.changes index 5d34f62..788b630 100644 --- a/python-breathe.changes +++ b/python-breathe.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 19 14:57:47 UTC 2019 - Tomáš Chvátal + +- Update to 4.12.0: + * More sphinx fixes +- Remove merged patch sphinx18.patch + ------------------------------------------------------------------- Wed Mar 6 14:17:25 UTC 2019 - Tomáš Chvátal diff --git a/python-breathe.spec b/python-breathe.spec index 37e0507..fe8ee33 100644 --- a/python-breathe.spec +++ b/python-breathe.spec @@ -18,16 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python -%bcond_without test Name: python-breathe -Version: 4.11.1 +Version: 4.12.0 Release: 0 Summary: Sphinx Doxygen renderer License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/michaeljones/breathe 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} @@ -55,7 +53,6 @@ able to read and render Doxygen xml output. %prep %setup -q -n breathe-%{version} -%patch0 -p1 %build %python_build diff --git a/sphinx18.patch b/sphinx18.patch deleted file mode 100644 index 9c06ad5..0000000 --- a/sphinx18.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 7c0a1ed9a14d9bb777df2657c99b82250e9851cf Mon Sep 17 00:00:00 2001 -From: Jakob Lykke Andersen -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: diff --git a/v4.11.1.tar.gz b/v4.11.1.tar.gz deleted file mode 100644 index 32748e8..0000000 --- a/v4.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84723eefc7cc05da6895e2dd6e7c72926c5fd88a67de57edce42d99c058c7e06 -size 170064 diff --git a/v4.12.0.tar.gz b/v4.12.0.tar.gz new file mode 100644 index 0000000..897c155 --- /dev/null +++ b/v4.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e0e6518274e579ca387d0d9e5b6601a56754ee01b4139bd3d719b71d99b6d09 +size 170669