Update to 7.1.2

.gitignore

@@ -44,3 +44,4 @@
 /Sphinx-6.1.3.tar.gz
 /Sphinx-6.2.1.tar.gz
 /Sphinx-7.0.1.tar.gz
+/sphinx-7.1.2.tar.gz

85ffb3b0.patch

@@ -0,0 +1,100 @@
+From 85ffb3b0fdcfefd5484e3fa895a46e3d11d7284f Mon Sep 17 00:00:00 2001
+From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
+Date: Mon, 7 Aug 2023 21:51:05 +0100
+Subject: [PATCH] Fix ``test_assets_order`` for Pygments 2.16
+
+---
+ tests/roots/test-html_file_checksum/conf.py         |  1 +
+ tests/roots/test-html_file_checksum/index.rst       |  0
+ tests/roots/test-html_file_checksum/static/empty.js |  0
+ .../roots/test-html_file_checksum/static/script.js  |  1 +
+ .../test-html_file_checksum/static/stylesheet-a.css |  1 +
+ .../test-html_file_checksum/static/stylesheet-b.css |  1 +
+ tests/test_build_html.py                            | 13 ++++++++-----
+ 7 files changed, 12 insertions(+), 5 deletions(-)
+ create mode 100644 tests/roots/test-html_file_checksum/conf.py
+ create mode 100644 tests/roots/test-html_file_checksum/index.rst
+ create mode 100644 tests/roots/test-html_file_checksum/static/empty.js
+ create mode 100644 tests/roots/test-html_file_checksum/static/script.js
+ create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-a.css
+ create mode 100644 tests/roots/test-html_file_checksum/static/stylesheet-b.css
+
+diff --git a/tests/roots/test-html_file_checksum/conf.py b/tests/roots/test-html_file_checksum/conf.py
+new file mode 100644
+index 00000000000..f9188142153
+--- /dev/null
++++ b/tests/roots/test-html_file_checksum/conf.py
+@@ -0,0 +1 @@
++html_static_path = ['static']
+diff --git a/tests/roots/test-html_file_checksum/index.rst b/tests/roots/test-html_file_checksum/index.rst
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/tests/roots/test-html_file_checksum/static/empty.js b/tests/roots/test-html_file_checksum/static/empty.js
+new file mode 100644
+index 00000000000..e69de29bb2d
+diff --git a/tests/roots/test-html_file_checksum/static/script.js b/tests/roots/test-html_file_checksum/static/script.js
+new file mode 100644
+index 00000000000..9a21456003e
+--- /dev/null
++++ b/tests/roots/test-html_file_checksum/static/script.js
+@@ -0,0 +1 @@
++/* Script */
+diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-a.css b/tests/roots/test-html_file_checksum/static/stylesheet-a.css
+new file mode 100644
+index 00000000000..3a5d802510d
+--- /dev/null
++++ b/tests/roots/test-html_file_checksum/static/stylesheet-a.css
+@@ -0,0 +1 @@
++/* Stylesheet A */
+diff --git a/tests/roots/test-html_file_checksum/static/stylesheet-b.css b/tests/roots/test-html_file_checksum/static/stylesheet-b.css
+new file mode 100644
+index 00000000000..ad5ff28f692
+--- /dev/null
++++ b/tests/roots/test-html_file_checksum/static/stylesheet-b.css
+@@ -0,0 +1 @@
++/* Stylesheet B */
+diff --git a/tests/test_build_html.py b/tests/test_build_html.py
+index 9a6326c69f5..5a10c964ae0 100644
+--- a/tests/test_build_html.py
++++ b/tests/test_build_html.py
+@@ -10,6 +10,7 @@
+ import pytest
+ from html5lib import HTMLParser
+ 
++import sphinx.builders.html
+ from sphinx.builders.html import validate_html_extra_path, validate_html_static_path
+ from sphinx.errors import ConfigError
+ from sphinx.testing.util import strip_escseq
+@@ -1172,7 +1173,9 @@ def test_html_assets(app):
+ 
+ 
+ @pytest.mark.sphinx('html', testroot='html_assets')
+-def test_assets_order(app):
++def test_assets_order(app, monkeypatch):
++    monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '')
++
+     app.add_css_file('normal.css')
+     app.add_css_file('early.css', priority=100)
+     app.add_css_file('late.css', priority=750)
+@@ -1188,8 +1191,8 @@ def test_assets_order(app):
+     # css_files
+     expected = [
+         '_static/early.css',
+-        '_static/pygments.css?v=b3523f8e',
+-        '_static/alabaster.css?v=039e1c02',
++        '_static/pygments.css',
++        '_static/alabaster.css',
+         'https://example.com/custom.css',
+         '_static/normal.css',
+         '_static/late.css',
+@@ -1202,8 +1205,8 @@ def test_assets_order(app):
+     # js_files
+     expected = [
+         '_static/early.js',
+-        '_static/doctools.js?v=888ff710',
+-        '_static/sphinx_highlight.js?v=4825356b',
++        '_static/doctools.js',
++        '_static/sphinx_highlight.js',
+         'https://example.com/script.js',
+         '_static/normal.js',
+         '_static/late.js',

python-sphinx.spec

@@ -20,10 +20,10 @@
 # During texlive updates, sometimes the latex environment is unstable
 %bcond latex_tests 1
 
-%global upstream_name Sphinx
+%global upstream_name sphinx
 
 Name:       python-sphinx
-%global     general_version 7.0.1
+%global     general_version 7.1.2
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
@@ -42,6 +42,8 @@ Source:     %{pypi_source %{upstream_name} %{upstream_version}}
 # which causes that test to fail.
 Patch:      sphinx-test_theming.diff
 
+# Fix test_assets_order for Sphinx 7.1.2
+Patch:      https://github.com/sphinx-doc/sphinx/commit/85ffb3b0.patch
 
 BuildArch:     noarch
 
@@ -364,6 +366,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Mon Aug 14 2023 Karolina Surma <ksurma@redhat.com> - 1:7.1.2-1
+- Update to 7.1.2
+- Fixes rhbz#2225274
+
 * Mon Aug 07 2023 Karolina Surma <ksurma@redhat.com> - 1:7.0.1-1
 - Update to 7.0.1
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-7.0.1.tar.gz) = 3edbb0460dd5679a26ec8f13f25e4802e6a211735986b42f2ee8d5a15ace6eca044654da3bdca2be235130d9e81dbca1d80a070f8aa762df383b3415a2c1fba3
+SHA512 (sphinx-7.1.2.tar.gz) = d6bccdaa476c700bef444736bb439a4097b9cd40d9c2fce1c3bb889f3677b6d17fe2833b0d3cf4cd3e43927f5fe6f59825f290dabeb2736e77f7f1f26c84d2ec