forked from pool/python-sphinxcontrib-jquery
Accepting request 1108857 from devel:languages:python
- Add tests-with-sphinx-72.patch to fix tests with sphinx 7.2. gh#sphinx-contrib/jquery#27 OBS-URL: https://build.opensuse.org/request/show/1108857 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sphinxcontrib-jquery?expand=0&rev=2
This commit is contained in:
@@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 4 12:04:08 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
|
||||||
|
|
||||||
|
- remove tests-with-sphinx-71.patch.
|
||||||
|
- Add tests-with-sphinx-72.patch to fix tests with sphinx 7.2.
|
||||||
|
gh#sphinx-contrib/jquery#27
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 4 10:52:33 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- add tests-with-sphinx-71.patch to fix tests with sphinx 7.1+
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 8 11:07:48 UTC 2023 - Torsten Gruner <simmphonie@opensuse.org>
|
Mon May 8 11:07:48 UTC 2023 - Torsten Gruner <simmphonie@opensuse.org>
|
||||||
|
|
||||||
|
@@ -33,6 +33,8 @@ Summary: Extension to include jQuery on newer Sphinx releases
|
|||||||
License: 0BSD
|
License: 0BSD
|
||||||
URL: https://github.com/sphinx-contrib/jquery/
|
URL: https://github.com/sphinx-contrib/jquery/
|
||||||
Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jquery/sphinxcontrib-jquery-4.1.tar.gz
|
||||||
|
# PATCH-FIX-UPSTREAM tests-with-sphinx-72.patch gh#sphinx-contrib/jquery#27
|
||||||
|
Patch1: tests-with-sphinx-72.patch
|
||||||
BuildRequires: %{python_module flit-core}
|
BuildRequires: %{python_module flit-core}
|
||||||
BuildRequires: %{python_module pip}
|
BuildRequires: %{python_module pip}
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
|
73
tests-with-sphinx-72.patch
Normal file
73
tests-with-sphinx-72.patch
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
Index: sphinxcontrib-jquery-4.1/tests/test_jquery_installed.py
|
||||||
|
===================================================================
|
||||||
|
--- sphinxcontrib-jquery-4.1.orig/tests/test_jquery_installed.py
|
||||||
|
+++ sphinxcontrib-jquery-4.1/tests/test_jquery_installed.py
|
||||||
|
@@ -1,10 +1,9 @@
|
||||||
|
import base64
|
||||||
|
import hashlib
|
||||||
|
-from pathlib import Path
|
||||||
|
+from pathlib import Path, PosixPath
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
import sphinx
|
||||||
|
-from sphinx.testing.path import path
|
||||||
|
from sphinx.testing.util import SphinxTestApp
|
||||||
|
|
||||||
|
from sphinxcontrib.jquery import _FILES, _ROOT_DIR # NoQA
|
||||||
|
@@ -23,12 +22,22 @@ def run_blank_app(srcdir, **kwargs):
|
||||||
|
return Path(srcdir, "_build", "html")
|
||||||
|
|
||||||
|
|
||||||
|
+class FakePath(PosixPath):
|
||||||
|
+ @classmethod
|
||||||
|
+ def _from_parts(cls, args, **kwargs):
|
||||||
|
+ cls._path = args[0]
|
||||||
|
+ return PosixPath._from_parts(args, **kwargs)
|
||||||
|
+
|
||||||
|
+ def resolve(self, *args, **kwargs):
|
||||||
|
+ return self._path
|
||||||
|
+
|
||||||
|
+
|
||||||
|
@pytest.fixture(scope="function")
|
||||||
|
def blank_app(tmpdir, monkeypatch):
|
||||||
|
def inner(**kwargs):
|
||||||
|
- return run_blank_app(path(tmpdir), **kwargs)
|
||||||
|
+ return run_blank_app(Path(tmpdir), **kwargs)
|
||||||
|
|
||||||
|
- monkeypatch.setattr("sphinx.application.abspath", lambda x: x)
|
||||||
|
+ monkeypatch.setattr("sphinx.application._StrPath", FakePath)
|
||||||
|
yield inner
|
||||||
|
|
||||||
|
|
||||||
|
@@ -38,12 +47,14 @@ def test_jquery_installed_sphinx_ge_60_u
|
||||||
|
out_dir = blank_app(confoverrides={"extensions": ["sphinxcontrib.jquery"], "jquery_use_sri": True})
|
||||||
|
|
||||||
|
text = out_dir.joinpath("index.html").read_text(encoding="utf-8")
|
||||||
|
+ checksum = '?v=5d32c60e' if sphinx.version_info[:2] >= (7, 1) else ''
|
||||||
|
assert ('<script '
|
||||||
|
'integrity="sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK" '
|
||||||
|
- 'src="_static/jquery.js"></script>') in text
|
||||||
|
+ f'src="_static/jquery.js{checksum}"></script>') in text
|
||||||
|
+ checksum = '?v=2cd50e6c' if sphinx.version_info[:2] >= (7, 1) else ''
|
||||||
|
assert ('<script '
|
||||||
|
'integrity="sha384-lSZeSIVKp9myfKbDQ3GkN/KHjUc+mzg17VKDN4Y2kUeBSJioB9QSM639vM9fuY//" '
|
||||||
|
- 'src="_static/_sphinx_javascript_frameworks_compat.js"></script>') in text
|
||||||
|
+ f'src="_static/_sphinx_javascript_frameworks_compat.js{checksum}"></script>') in text
|
||||||
|
|
||||||
|
static_dir = out_dir / '_static'
|
||||||
|
assert static_dir.joinpath('jquery.js').is_file()
|
||||||
|
@@ -56,10 +67,12 @@ def test_jquery_installed_sphinx_ge_60(b
|
||||||
|
out_dir = blank_app(confoverrides={"extensions": ["sphinxcontrib.jquery"]})
|
||||||
|
|
||||||
|
text = out_dir.joinpath("index.html").read_text(encoding="utf-8")
|
||||||
|
+ checksum = '?v=5d32c60e' if sphinx.version_info[:2] >= (7, 1) else ''
|
||||||
|
assert ('<script '
|
||||||
|
- 'src="_static/jquery.js"></script>') in text
|
||||||
|
+ f'src="_static/jquery.js{checksum}"></script>') in text
|
||||||
|
+ checksum = '?v=2cd50e6c' if sphinx.version_info[:2] >= (7, 1) else ''
|
||||||
|
assert ('<script '
|
||||||
|
- 'src="_static/_sphinx_javascript_frameworks_compat.js"></script>') in text
|
||||||
|
+ f'src="_static/_sphinx_javascript_frameworks_compat.js{checksum}"></script>') in text
|
||||||
|
|
||||||
|
static_dir = out_dir / '_static'
|
||||||
|
assert static_dir.joinpath('jquery.js').is_file()
|
Reference in New Issue
Block a user