From 115e072b1601e2173512188229f97761f6b69a02 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 7 Jul 2022 10:43:45 +0200 Subject: [PATCH] Fix compatibility with Sphinx 5 --- 10.patch | 41 ++++++++++++++++++++++++++++++++ python-sphinxcontrib-jsmath.spec | 10 ++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 10.patch diff --git a/10.patch b/10.patch new file mode 100644 index 0000000..c06f210 --- /dev/null +++ b/10.patch @@ -0,0 +1,41 @@ +From cae629ac3751e495d8286b15d503ef8bad69bd94 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 7 Jul 2022 10:37:21 +0200 +Subject: [PATCH] Fix compatibility with Sphinx 5 + +--- + tests/test_jsmath.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/test_jsmath.py b/tests/test_jsmath.py +index 573d262..eea8a95 100644 +--- a/tests/test_jsmath.py ++++ b/tests/test_jsmath.py +@@ -14,7 +14,7 @@ import pytest + @pytest.mark.sphinx('html', testroot='basic') + def test_basic(app, status, warning): + app.builder.build_all() +- content = (app.outdir / 'math.html').text() ++ content = (app.outdir / 'math.html').read_text() + print(content) + assert '
\nE = mc^2
' in content + assert ('(1)\nE = mc^2' in content + assert ('(1.1)ΒΆ' +@@ -52,5 +52,5 @@ def test_numfig_enabled(app, status, warning): + def test_disabled_when_equations_not_found(app, status, warning): + app.builder.build_all() + +- content = (app.outdir / 'index.html').text() ++ content = (app.outdir / 'index.html').read_text() + assert 'jsmath.js' not in content +-- +2.35.3 + diff --git a/python-sphinxcontrib-jsmath.spec b/python-sphinxcontrib-jsmath.spec index b4dbece..f431cf5 100644 --- a/python-sphinxcontrib-jsmath.spec +++ b/python-sphinxcontrib-jsmath.spec @@ -5,13 +5,16 @@ Name: python-%{pypi_name} Version: 1.0.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Sphinx extension for math in HTML via JavaScript License: BSD URL: http://sphinx-doc.org/ Source0: %{pypi_source} BuildArch: noarch +# In Sphinx 5 path.read_text() replaces path.text() - compatibility fix +Patch: https://github.com/sphinx-doc/sphinxcontrib-jsmath/pull/10.patch + BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools @@ -35,7 +38,7 @@ via JavaScript. %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} %build @@ -61,6 +64,9 @@ via JavaScript. %changelog +* Thu Jul 07 2022 Karolina Surma - 1.0.1-17 +- Fix compatibility with Sphinx 5 + * Mon Jun 13 2022 Python Maint - 1.0.1-16 - Rebuilt for Python 3.11