From aae8f548c48e5a9f515636bb932333965c02c89b9e62ed567409290105234113 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 21 Dec 2023 06:29:20 +0000 Subject: [PATCH] - Update to 3.4.4: * Added + Testing for Python 3.11 and 3.12 * Removed + Dependency on unsupported sphinx_testing package * Fixed + tests for sphinx 7.2 + slice assignment in update_context(), which was removing JS scripts from other sphinx extensions/themes on pages where tabs were not used - Drop patches sphinx71.patch and sphinx72.patch, included upstream. - Switch to pyproject macros. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinx-tabs?expand=0&rev=13 --- python-sphinx-tabs.changes | 15 +++ python-sphinx-tabs.spec | 15 +-- sphinx71.patch | 188 --------------------------- sphinx72.patch | 253 ------------------------------------- v3.4.1.tar.gz | 3 - v3.4.4.tar.gz | 3 + 6 files changed, 24 insertions(+), 453 deletions(-) delete mode 100644 sphinx71.patch delete mode 100644 sphinx72.patch delete mode 100644 v3.4.1.tar.gz create mode 100644 v3.4.4.tar.gz diff --git a/python-sphinx-tabs.changes b/python-sphinx-tabs.changes index fcedc34..72c9ad3 100644 --- a/python-sphinx-tabs.changes +++ b/python-sphinx-tabs.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Dec 21 06:24:22 UTC 2023 - Steve Kowalik + +- Update to 3.4.4: + * Added + + Testing for Python 3.11 and 3.12 + * Removed + + Dependency on unsupported sphinx_testing package + * Fixed + + tests for sphinx 7.2 + + slice assignment in update_context(), which was removing JS scripts + from other sphinx extensions/themes on pages where tabs were not used +- Drop patches sphinx71.patch and sphinx72.patch, included upstream. +- Switch to pyproject macros. + ------------------------------------------------------------------- Mon Oct 9 14:41:57 UTC 2023 - ecsos diff --git a/python-sphinx-tabs.spec b/python-sphinx-tabs.spec index 4029245..b7e4e0c 100644 --- a/python-sphinx-tabs.spec +++ b/python-sphinx-tabs.spec @@ -31,21 +31,18 @@ %{?sle15_python_module_pythons} Name: python-sphinx-tabs -Version: 3.4.1 +Version: 3.4.4 Release: 0 Summary: Tabbed views for Sphinx License: MIT -Group: Development/Languages/Python URL: https://github.com/executablebooks/sphinx-tabs # Use the github tag instead of the pythonhosted.org to get the tests folder Source: https://github.com/executablebooks/sphinx-tabs/archive/refs/tags/v%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/executablebooks/sphinx-tabs/commit/f60a10e13b3a6a8d1d27f285d9942b57ab07d0a8 Make the tests pass with Sphinx 7.1 -Patch1: sphinx71.patch -# PATCH-FIX-UPSTREAM https://github.com/executablebooks/sphinx-tabs/pull/179 Fix tests for Sphinx 7.2 -Patch2: sphinx72.patch BuildRequires: %{python_module Pygments} BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module docutils} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Pygments @@ -67,11 +64,11 @@ Create tabbed content in Sphinx documentation when building HTML. %autosetup -p1 -n sphinx-tabs-%{version} %build -%python_build +%pyproject_wheel %install %if !%{with test} -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif @@ -84,7 +81,7 @@ Create tabbed content in Sphinx documentation when building HTML. %if !%{with test} %files %{python_files} %{python_sitelib}/sphinx_tabs -%{python_sitelib}/sphinx_tabs-%{version}*-info +%{python_sitelib}/sphinx_tabs-%{version}.dist-info %endif %changelog diff --git a/sphinx71.patch b/sphinx71.patch deleted file mode 100644 index 9b8972e..0000000 --- a/sphinx71.patch +++ /dev/null @@ -1,188 +0,0 @@ -From f60a10e13b3a6a8d1d27f285d9942b57ab07d0a8 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Sun, 6 Aug 2023 15:24:52 +0300 -Subject: [PATCH] Make the tests pass with Sphinx 7.1 - -Update the expected XML files to match Sphinx 7.1 output, and patch -Sphinx < 7.1 output to match our new expectations. ---- - tests/conftest.py | 6 ++++++ - tests/test_build/test_basic.xml | 2 +- - .../test_conditional_assets_html_assets_policy_index_.xml | 2 +- - ...test_conditional_assets_html_assets_policy_no_tabs1_.xml | 2 +- - ...test_conditional_assets_html_assets_policy_no_tabs2_.xml | 2 +- - tests/test_build/test_conditional_assets_index_.xml | 2 +- - tests/test_build/test_conditional_assets_no_tabs1_.xml | 2 +- - tests/test_build/test_conditional_assets_no_tabs2_.xml | 2 +- - tests/test_build/test_custom_lexer.xml | 2 +- - tests/test_build/test_disable_closing.xml | 2 +- - tests/test_build/test_disable_css_loading.xml | 2 +- - tests/test_build/test_nested_markup.xml | 2 +- - tests/test_build/test_no_tabs.xml | 2 +- - tests/test_build/test_other_with_assets.xml | 2 +- - tests/test_build/test_rinohtype_pdf.xml | 2 +- - 15 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index b1f0728..f776f49 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -2,6 +2,7 @@ - import pytest - from pathlib import Path - from bs4 import BeautifulSoup -+import sphinx - from sphinx.testing.path import path - - from sphinx_tabs.tabs import FILES -@@ -123,6 +124,11 @@ def read(app, docname="index", resolve=False, regress=False, replace=None): - text = doctree.pformat() # type: str - for find, rep in (replace or {}).items(): - text = text.replace(find, rep) -+ if sphinx.version_info < (7, 1): -+ text = text.replace( -+ '', -+ "", -+ ) - file_regression.check(text, extension=extension) - - return doctree -diff --git a/tests/test_build/test_basic.xml b/tests/test_build/test_basic.xml -index f1f6d71..1ef24d7 100644 ---- a/tests/test_build/test_basic.xml -+++ b/tests/test_build/test_basic.xml -@@ -1,4 +1,4 @@ -- -+ - -
-