- From 083d573b7cf42d98f6c946715f52becba11d674b Mon Sep 17 00:00:00 2001

- From: Adam Turner <9087854+aa-turner@users.noreply.github.com>

- Date: Mon, 7 Aug 2023 21:02:25 +0100

- Subject: [PATCH] Fix ``test_dark_style`` for Pygments 2.16

- 

- ---

-  tests/test_theming.py | 20 +++++++++++++++++---

-  1 file changed, 17 insertions(+), 3 deletions(-)

- 

- diff --git a/tests/test_theming.py b/tests/test_theming.py

- index 7473cb371c5..e3bd2a0f016 100644

- --- a/tests/test_theming.py

- +++ b/tests/test_theming.py

- @@ -5,6 +5,7 @@

-  import alabaster

-  import pytest

-  

- +import sphinx.builders.html

-  from sphinx.theming import ThemeError

-  

-  

- @@ -91,18 +92,31 @@ def test_staticfiles(app, status, warning):

-  

-  @pytest.mark.sphinx(testroot='theming',

-                      confoverrides={'html_theme': 'test-theme'})

- -def test_dark_style(app, status, warning):

- +def test_dark_style(app, monkeypatch):

- +    monkeypatch.setattr(sphinx.builders.html, '_file_checksum', lambda o, f: '')

- +

-      style = app.builder.dark_highlighter.formatter_args.get('style')

-      assert style.__name__ == 'MonokaiStyle'

-  

-      app.build()

-      assert (app.outdir / '_static' / 'pygments_dark.css').exists()

-  

- +    css_file, properties = app.registry.css_files[0]

- +    assert css_file == 'pygments_dark.css'

- +    assert "media" in properties

- +    assert properties["media"] == '(prefers-color-scheme: dark)'

- +

- +    assert sorted(app.builder.css_files) == [

- +        '_static/classic.css',

- +        '_static/pygments.css',

- +        '_static/pygments_dark.css',

- +    ]

- +

-      result = (app.outdir / 'index.html').read_text(encoding='utf8')

- -    assert '<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b76e3c8a" />' in result

- +    assert '<link rel="stylesheet" type="text/css" href="_static/pygments.css" />' in result

-      assert ('<link id="pygments_dark_css" media="(prefers-color-scheme: dark)" '

-              'rel="stylesheet" type="text/css" '

- -            'href="_static/pygments_dark.css?v=e15ddae3" />') in result

- +            'href="_static/pygments_dark.css" />') in result

-  

-  

-  @pytest.mark.sphinx(testroot='theming')

- 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',

- %global     general_version 7.1.2

- Release:    2%{?dist}

- # Fix test_assets_order for Sphinx 7.1.2

- Patch:      https://github.com/sphinx-doc/sphinx/commit/85ffb3b0.patch

- 

- # Fix test_dark_style with Pygments 2.16+

- Patch:      https://github.com/sphinx-doc/sphinx/commit/083d573b.patch

- 

- SHA512 (sphinx-7.1.2.tar.gz) = d6bccdaa476c700bef444736bb439a4097b9cd40d9c2fce1c3bb889f3677b6d17fe2833b0d3cf4cd3e43927f5fe6f59825f290dabeb2736e77f7f1f26c84d2ec

-      assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'

-      assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'

-      assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'