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