forked from pool/python-sphinx-jsonschema
Accepting request 1321482 from devel:languages:python
- Update to 1.19.2: * allow building with Sphinx 9.0. - Drop patch support-docutils-0.22.patch, included upstream. OBS-URL: https://build.opensuse.org/request/show/1321482 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sphinx-jsonschema?expand=0&rev=7
This commit is contained in:
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 8 04:07:47 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Update to 1.19.2:
|
||||
* allow building with Sphinx 9.0.
|
||||
- Drop patch support-docutils-0.22.patch, included upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 19 02:35:43 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
|
||||
@@ -16,17 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%define info_version 1.19.0
|
||||
Name: python-sphinx-jsonschema
|
||||
Version: 1.19.1
|
||||
Version: 1.19.2
|
||||
Release: 0
|
||||
Summary: Sphinx extension to display JSON Schema
|
||||
License: GPL-3.0-only
|
||||
URL: https://github.com/lnoor/sphinx-jsonschema
|
||||
# Tarballs from pypi.org are missing license files
|
||||
Source: https://github.com/lnoor/sphinx-jsonschema/archive/refs/tags/v.%{version}.tar.gz#/sphinx-jsonschema-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM gh#lnoor/sphinx-jsonschema#90
|
||||
Patch0: support-docutils-0.22.patch
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module wheel}
|
||||
@@ -68,6 +65,6 @@ Sphinx extension to display JSON Schema.
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python_sitelib}/sphinx[-_]jsonschema
|
||||
%{python_sitelib}/sphinx[-_]jsonschema-%{info_version}.dist-info
|
||||
%{python_sitelib}/sphinx[-_]jsonschema-%{version}.dist-info
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7224606c301a7e5088e2c5c01b2559e9bb6338935ce2cb840b024641b535b77a
|
||||
size 40684
|
||||
3
sphinx-jsonschema-1.19.2.tar.gz
Normal file
3
sphinx-jsonschema-1.19.2.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6501304887e7cece3139c2cffec9bcb41085a2d60bf02aba61a8fcaa98dcb3f1
|
||||
size 40982
|
||||
@@ -1,41 +0,0 @@
|
||||
From d4acc575f2d2e5cb0055820758ad109548e1dd36 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Kowalik <steven@wedontsleep.org>
|
||||
Date: Fri, 19 Sep 2025 12:33:13 +1000
|
||||
Subject: [PATCH] Remove use of SafeString
|
||||
|
||||
docutils 0.22.1 removed the SafeString class, since it isn't required
|
||||
with Python 3 any more. Replace both uses of it with plain str.
|
||||
---
|
||||
sphinx-jsonschema/__init__.py | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sphinx-jsonschema/__init__.py b/sphinx-jsonschema/__init__.py
|
||||
index b6875ea..ae46daa 100644
|
||||
--- a/sphinx-jsonschema/__init__.py
|
||||
+++ b/sphinx-jsonschema/__init__.py
|
||||
@@ -27,7 +27,6 @@
|
||||
from docutils.parsers.rst import Directive, DirectiveError
|
||||
from docutils.parsers.rst import directives
|
||||
from docutils.utils import SystemMessagePropagation
|
||||
-from docutils.utils.error_reporting import SafeString
|
||||
from .wide_format import WideFormat, NOESC
|
||||
|
||||
|
||||
@@ -243,7 +242,7 @@ def get_json_data(self):
|
||||
except Exception as error:
|
||||
error = self.state_machine.reporter.error(
|
||||
'"%s" directive encountered a the following error while parsing the data.\n %s'
|
||||
- % (self.name, SafeString("".join(format_exception_only(type(error), error)))),
|
||||
+ % (self.name, str("".join(format_exception_only(type(error), error)))),
|
||||
nodes.literal_block(schema, schema), line=self.lineno)
|
||||
raise SystemMessagePropagation(error)
|
||||
|
||||
@@ -253,7 +252,7 @@ def get_json_data(self):
|
||||
except KeyError:
|
||||
error = self.state_machine.reporter.error(
|
||||
'"%s" directive encountered a KeyError when trying to resolve the pointer'
|
||||
- ' in schema: %s' % (self.name, SafeString(pointer)),
|
||||
+ ' in schema: %s' % (self.name, str(pointer)),
|
||||
nodes.literal_block(schema, schema), line=self.lineno)
|
||||
raise SystemMessagePropagation(error)
|
||||
|
||||
Reference in New Issue
Block a user