From 30fc5d7dd8ed02a6101b6a5503f860646e82996f Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 19 Aug 2022 13:42:08 +0100 Subject: [PATCH 01/69] Update tests for newer docutils versions. --- tests/test_directive_/test_output_310_index_html_.html | 8 +++++--- tests/test_directive_/test_output_36_index_html_.html | 8 +++++--- .../test_directive_/test_output_36_pypy_index_html_.html | 8 +++++--- tests/test_directive_/test_output_37_index_html_.html | 8 +++++--- .../test_directive_/test_output_37_pypy_index_html_.html | 8 +++++--- tests/test_directive_/test_output_38_index_html_.html | 8 +++++--- tox.ini | 1 + 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 0ab82d0..c132d4a 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -3,7 +3,9 @@ - + {% if docutils_version >= (0, 18) %}<meta content="Docutils 0.18.1: http://docutils.sourceforge.net/" name="generator"/> + {% elif docutils_version >= (0, 17) %}<meta content="Docutils 0.17.1: http://docutils.sourceforge.net/" name="generator"/> + {% endif %}<title> sphinx-autofixture Demo — Python documentation + {% if sphinx_version >= (5, 0) %} + {% endif %} @@ -26,24 +37,21 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">

sphinx-autofixture Demo - + ¶

- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} + ¶ @@ -92,19 +100,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} +

@@ -143,19 +148,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - class - {% else %} - class{% endif %} + + + {{ span_pre("class", " ", (3, 5)) }} - - tests.myproject. - - - A - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("A", " ") }} + ¶ @@ -165,11 +167,11 @@
My Dataclass

-
- - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

-
- - __dataclass_params__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_params__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -207,19 +209,16 @@

-
- - __eq__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__eq__", " ") }} + ( - {% if sphinx_version >= (3, 5) %} - - other - {% else %} - other{% endif %} + + {{ span_pre("other", " ", (3, 5)) }} @@ -236,11 +235,11 @@

-
- - __hash__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__hash__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -257,16 +256,26 @@

-
- - __init__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__init__", " ") }} + ( ) - {% if sphinx_version >= (3, 5) %} + {% if sphinx_version >= (4, 1) %} + + + → + + + + None + + + {% elif sphinx_version >= (3, 5) %} → None @@ -276,18 +285,18 @@
¶
-
+
{% if sphinx_version < (4, 1) %}
Initialize self. See help(type(self)) for accurate signature. -
+
{% endif %}

-
- - __match_args__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__match_args__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -304,11 +313,11 @@

-
- - __module__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__module__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -325,10 +334,10 @@

-
- - __repr__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__repr__", " ") }} + ( @@ -346,10 +355,10 @@

-
- - __weakref__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__weakref__", " ") }} + ¶ @@ -363,13 +372,13 @@

-
- - tests.myproject. - - - baz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -387,13 +396,13 @@

-
- - tests.myproject. - - - fizbuzz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("fizbuzz", " ") }} + ( diff --git a/tests/test_directive_/test_output_36_index_html_.html b/tests/test_directive_/test_output_36_index_html_.html index 8ad895e..e172fd1 100644 --- a/tests/test_directive_/test_output_36_index_html_.html +++ b/tests/test_directive_/test_output_36_index_html_.html @@ -1,5 +1,14 @@ +{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% if sphinx_version >= min_version %} +{{ indent }} {{ text }} +{{ indent }}{% else %}{{ text }}{% endif %} +{%- endmacro -%} +{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} +{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} +{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} +{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - += (5, 0) %} lang="en"{% endif %}> @@ -13,7 +22,9 @@ + {% if sphinx_version >= (5, 0) %} + {% endif %} @@ -26,24 +37,21 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">
sphinx-autofixture Demo - + ¶

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} + ¶ @@ -92,19 +100,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} +

@@ -143,13 +148,13 @@

-
- - tests.myproject. - - - baz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -167,13 +172,13 @@

-
- - tests.myproject. - - - fizbuzz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("fizbuzz", " ") }} + ( diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html index 8ad895e..b6853cf 100644 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ b/tests/test_directive_/test_output_36_pypy_index_html_.html @@ -1,5 +1,14 @@ +{% macro span_pre(text, indent='') -%} +{% if sphinx_version >= (3, 5) %} +{{ indent }} {{ text }} +{{ indent }}{% else %}{{ text }}{% endif %} +{%- endmacro -%} +{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} +{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} +{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} +{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - += (5, 0) %} lang="en"{% endif %}> @@ -13,7 +22,9 @@ + {% if sphinx_version >= (5, 0) %} + {% endif %} @@ -26,24 +37,21 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">
sphinx-autofixture Demo - + ¶

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ") }} - + <{{ sig_prename_tag }} class="sig-prename descclassname"> coincidence.fixtures. - - + + <{{ sig_prename_tag }} class="sig-name descname"> tmp_pathplus - + ¶ @@ -92,19 +100,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ") }} - + <{{ sig_prename_tag }} class="sig-prename descclassname"> coincidence.fixtures. - - + + <{{ sig_prename_tag }} class="sig-name descname"> tmp_pathplus - +

@@ -143,13 +148,13 @@

-
- + + <{{ sig_prename_tag }} class="sig-prename descclassname"> tests.myproject. - - + + <{{ sig_prename_tag }} class="sig-name descname"> baz - + ( @@ -167,13 +172,13 @@

-
- + + <{{ sig_prename_tag }} class="sig-prename descclassname"> tests.myproject. - - + + <{{ sig_prename_tag }} class="sig-name descname"> fizbuzz - + ( diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 80751a9..97ee6e3 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -1,5 +1,14 @@ +{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% if sphinx_version >= min_version %} +{{ indent }} {{ text }} +{{ indent }}{% else %}{{ text }}{% endif %} +{%- endmacro -%} +{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} +{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} +{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} +{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - += (5, 0) %} lang="en"{% endif %}> @@ -13,7 +22,9 @@ + {% if sphinx_version >= (5, 0) %} + {% endif %} @@ -26,24 +37,21 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">
sphinx-autofixture Demo - + ¶

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} + ¶ @@ -92,19 +100,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} +

@@ -143,19 +148,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - class - {% else %} - class{% endif %} + + + {{ span_pre("class", " ", (3, 5)) }} - - tests.myproject. - - - A - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("A", " ") }} + ¶ @@ -165,11 +167,11 @@
My Dataclass

-
- - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

-
- - __dataclass_params__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_params__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -207,19 +209,16 @@

-
- - __eq__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__eq__", " ") }} + ( - {% if sphinx_version >= (3, 5) %} - - other - {% else %} - other{% endif %} + + {{ span_pre("other", " ", (3, 5)) }} @@ -236,11 +235,11 @@

-
- - __hash__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__hash__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -257,16 +256,26 @@

-
- - __init__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__init__", " ") }} + ( ) - {% if sphinx_version >= (3, 5) %} + {% if sphinx_version >= (4, 1) %} + + + → + + + + None + + + {% elif sphinx_version >= (3, 5) %} → None @@ -276,18 +285,18 @@
¶
-
+
{% if sphinx_version < (4, 1) %}
Initialize self. See help(type(self)) for accurate signature. -
+
{% endif %}

-
- - __module__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__module__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -304,10 +313,10 @@

-
- - __repr__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__repr__", " ") }} + ( @@ -325,10 +334,10 @@

-
- - __weakref__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__weakref__", " ") }} + ¶ @@ -342,13 +351,13 @@

-
- - tests.myproject. - - - baz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -366,13 +375,13 @@

-
- - tests.myproject. - - - fizbuzz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("fizbuzz", " ") }} + ( diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index 2961770..d38484b 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -1,5 +1,14 @@ +{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% if sphinx_version >= min_version %} +{{ indent }} {{ text }} +{{ indent }}{% else %}{{ text }}{% endif %} +{%- endmacro -%} +{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} +{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} +{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} +{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - += (5, 0) %} lang="en"{% endif %}> @@ -13,7 +22,9 @@ + {% if sphinx_version >= (5, 0) %} + {% endif %} @@ -26,24 +37,21 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">
sphinx-autofixture Demo - + ¶

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} + ¶ @@ -92,19 +100,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} + + + {{ span_pre("fixture", " ", (3, 5)) }} - - coincidence.fixtures. - - - tmp_pathplus - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("coincidence.fixtures.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("tmp_pathplus", " ") }} +

@@ -143,19 +148,16 @@

-
- {% if sphinx_version >= (3, 5) %} - - class - {% else %} - class{% endif %} + + + {{ span_pre("class", " ", (3, 5)) }} - - tests.myproject. - - - A - + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("A", " ") }} + ¶ @@ -165,11 +167,11 @@
My Dataclass

-
- - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

-
- - __dataclass_params__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_params__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -207,19 +209,16 @@

-
- - __eq__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__eq__", " ") }} + ( - {% if sphinx_version >= (3, 5) %} - - other - {% else %} - other{% endif %} + + {{ span_pre("other", " ", (3, 5)) }} @@ -233,11 +232,11 @@

-
- - __hash__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__hash__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -254,16 +253,26 @@

-
- - __init__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__init__", " ") }} + ( ) - {% if sphinx_version >= (3, 5) %} + {% if sphinx_version >= (4, 1) %} + + + → + + + + None + + + {% elif sphinx_version >= (3, 5) %} → None @@ -277,11 +286,11 @@

-
- - __module__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__module__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -298,10 +307,10 @@

-
- - __repr__ - + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__repr__", " ") }} + ( @@ -316,11 +325,11 @@

-
- - __weakref__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__weakref__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -339,13 +348,13 @@

-
- - tests.myproject. - - - baz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -363,13 +372,13 @@

-
- - tests.myproject. - - - fizbuzz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("fizbuzz", " ") }} + ( diff --git a/tests/test_directive_/test_output_38_index_html_.html b/tests/test_directive_/test_output_38_index_html_.html deleted file mode 100644 index 80751a9..0000000 --- a/tests/test_directive_/test_output_38_index_html_.html +++ /dev/null @@ -1,400 +0,0 @@ - - - - - - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} - {% endif %} - sphinx-autofixture Demo — Python documentation - - - - - - - - -
-
-
-
- <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo"> -
- sphinx-autofixture Demo - - ¶ - -
-
-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} - - - coincidence.fixtures. - - - tmp_pathplus - - - ¶ - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
-
- - - - coincidence.fixtures.tmp_pathplus - - - -
-
-
- {% if sphinx_version >= (3, 5) %} - - fixture - {% else %} - fixture{% endif %} - - - coincidence.fixtures. - - - tmp_pathplus - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
- - -
-
- {% if sphinx_version >= (3, 5) %} - - class - {% else %} - class{% endif %} - - - tests.myproject. - - - A - - - ¶ - -
-
-
- My Dataclass -
-
-
- - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} - - = - - - {} - {% else %} - = {}{% endif %} - - - ¶ - -
-
-
-
-
-
- - __dataclass_params__ - - {% if sphinx_version >= (3, 5) %} - - = - - - _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False) - {% else %} - = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} - - - ¶ - -
-
-
-
-
-
- - __eq__ - - - ( - - - {% if sphinx_version >= (3, 5) %} - - other - {% else %} - other{% endif %} - - - - ) - - - ¶ - -
-
-
- Return self==value. -
-
-
-
-
- - __hash__ - - {% if sphinx_version >= (3, 5) %} - - = - - - None - {% else %} - = None{% endif %} - - - ¶ - -
-
-
-
-
-
- - __init__ - - - ( - - - ) - {% if sphinx_version >= (3, 5) %} - → - - None - {% else %} - → None{% endif %} - - ¶ - -
-
-
- Initialize self. See help(type(self)) for accurate signature. -
-
-
-
-
- - __module__ - - {% if sphinx_version >= (3, 5) %} - - = - - - 'tests.myproject' - {% else %} - = 'tests.myproject'{% endif %} - - - ¶ - -
-
-
-
-
-
- - __repr__ - - - ( - - - ) - - - ¶ - -
-
-
- Return repr(self). -
-
-
-
-
- - __weakref__ - - - ¶ - -
-
-
- list of weak references to the object (if defined) -
-
-
-
-
-
-
- - tests.myproject. - - - baz - - - ( - - - ) - - - ¶ - -
-
-
- A locally defined function. -
-
-
-
-
- - tests.myproject. - - - fizbuzz - - - ( - - - ) - - - ¶ - -
-
-
- A locally defined function. -
-
-
- = (0, 17) %}section{% else %}div{% endif %}> -
-
-
-
-
-
- - diff --git a/tox.ini b/tox.ini index b222cb9..6832930 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,6 @@ # You may add new sections, but any changes made to the following sections will be lost: # * tox # * envlists -# * testenv # * testenv:docs # * testenv:build # * testenv:lint @@ -18,13 +17,16 @@ [tox] envlist = - py36-sphinx{3.2,3.3,3.4,3.5} - py37-sphinx{3.2,3.3,3.4,3.5} - py38-sphinx{3.2,3.3,3.4,3.5} - py39-sphinx{3.2,3.3,3.4,3.5} - py310-dev-sphinx{3.2,3.3,3.4,3.5} + py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} pypy36-sphinx{3.2,3.3,3.4,3.5} - pypy37-sphinx{3.2,3.3,3.4,3.5} + pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} mypy build skip_missing_interpreters = True @@ -36,31 +38,19 @@ requires = [envlists] test = - py36-sphinx{3.2,3.3,3.4,3.5} - py37-sphinx{3.2,3.3,3.4,3.5} - py38-sphinx{3.2,3.3,3.4,3.5} - py39-sphinx{3.2,3.3,3.4,3.5} - py310-dev-sphinx{3.2,3.3,3.4,3.5} + py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} pypy36-sphinx{3.2,3.3,3.4,3.5} - pypy37-sphinx{3.2,3.3,3.4,3.5} + pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} qa = mypy, lint cov = py36-sphinx3.2, coverage -[testenv] -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - SETUPTOOLS_USE_DISTUTILS=stdlib -deps = - -r{toxinidir}/tests/requirements.txt - sphinx3.2: sphinx~=3.2.0 - sphinx3.3: sphinx~=3.3.0 - sphinx3.4: sphinx~=3.4.0 - sphinx3.5: sphinx~=3.5.0 -commands = - python --version - python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} - [testenv:docs] setenv = SHOW_TODOS = 1 passenv = SPHINX_BUILDER @@ -203,3 +193,41 @@ package = sphinx_autofixture [pytest] addopts = --color yes --durations 25 timeout = 300 +filterwarnings = + error + ignore:can't resolve package from __spec__ or __package__, falling back on __name__ and __path__:ImportWarning + ignore:'contextfunction' is renamed to 'pass_context', the old name will be removed in Jinja 3.1.:DeprecationWarning + ignore:'environmentfilter' is renamed to 'pass_environment', the old name will be removed in Jinja 3.1.:DeprecationWarning + always:distutils Version classes are deprecated. Use packaging.version instead.:DeprecationWarning + ignore:The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives:DeprecationWarning + ignore::DeprecationWarning:certifi + always:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning + always:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning + always:The `docutils.parsers.rst.directive.html` module will be removed in Docutils 1.2.:DeprecationWarning +markers = sphinx + +[testenv] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + SETUPTOOLS_USE_DISTUTILS=stdlib +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt + sphinx3.2: sphinx==3.2.1 + sphinx3.3: sphinx==3.3.1 + sphinx3.4: sphinx==3.4.3 + sphinx3.5: sphinx==3.5.4 + sphinx3.{2,3,4,5}: docutils==0.16 + sphinx4.0: sphinx==4.0.3 + sphinx4.1: sphinx==4.1.2 + sphinx4.2: sphinx==4.2.0 + sphinx4.3: sphinx==4.3.2 + sphinx4.4: sphinx==4.4.0 + sphinx4.5: sphinx==4.5.0 + sphinx4.{0,1,2,3,4,5}: docutils<=0.17.1 + sphinx5.0: sphinx==5.0.2 + sphinx5.1: sphinx==5.1.1 +commands = + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} From 9d099cd07c97303c14af8a2b6ea458f5d687f766 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 08:31:27 +0000 Subject: [PATCH 06/69] Updated files with 'repo_helper'. (#46) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 57bd78c..0c76468 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,7 +33,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 1cbf13f..6a0a163 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 27e09bc..e9c761b 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,7 +33,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.1", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da84f7d..24bbc98 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,6 +3,9 @@ exclude: ^$ +ci: + autoupdate_schedule: quarterly + repos: - repo: https://github.com/repo-helper/pyproject-parser rev: v0.7.0 From e36267b2166169c800e6059dab68854323414c7f Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 20 Sep 2022 09:48:32 +0100 Subject: [PATCH 07/69] Bump version v0.3.0 -> v0.4.0 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- sphinx_autofixture/__init__.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 58a142c..dba9723 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.0 +current_version = 0.4.0 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 4b057f6..ed41ec3 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -55,7 +55,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld sphinx-autofixture=0.3.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld sphinx-autofixture=0.4.0=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 9f5d2a5..0bca5e8 100644 --- a/README.rst +++ b/README.rst @@ -106,7 +106,7 @@ and `the documentation for coincidence`_ for an example with the ReadTheDocs the .. |language| image:: https://img.shields.io/github/languages/top/sphinx-toolbox/sphinx-autofixture :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/sphinx-autofixture/v0.3.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/sphinx-autofixture/v0.4.0 :target: https://github.com/sphinx-toolbox/sphinx-autofixture/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index c960b2a..69e3e6b 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -107,7 +107,7 @@ sphinx-autofixture :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v0.3.0 + :commits-since: v0.4.0 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/pyproject.toml b/pyproject.toml index b560ec3..b78d72b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "whey" [project] name = "sphinx-autofixture" -version = "0.3.0" +version = "0.4.0" description = "Sphinx autodocumenter for pytest fixtures." readme = "README.rst" keywords = [ "documentation", "pytest", "sphinx", "sphinx-extension",] diff --git a/repo_helper.yml b/repo_helper.yml index 7dbe48f..310069f 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -7,7 +7,7 @@ email: 'dominic@davis-foster.co.uk' username: "sphinx-toolbox" assignee: "domdfcoding" primary_conda_channel: 'domdfcoding' -version: '0.3.0' +version: '0.4.0' license: 'MIT' short_desc: 'Sphinx autodocumenter for pytest fixtures.' diff --git a/sphinx_autofixture/__init__.py b/sphinx_autofixture/__init__.py index e470b53..d0350e7 100644 --- a/sphinx_autofixture/__init__.py +++ b/sphinx_autofixture/__init__.py @@ -45,7 +45,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2020 Dominic Davis-Foster" __license__: str = "MIT License" -__version__: str = "0.3.0" +__version__: str = "0.4.0" __email__: str = "dominic@davis-foster.co.uk" __all__ = ["FixtureDecoratorFinder", "FixtureDocumenter", "is_fixture", "setup"] From d0563f75ad51fbe25c8e8773f6f53f1b3e6c4175 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 09:39:51 +0100 Subject: [PATCH 08/69] Updated files with 'repo_helper'. (#48) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- pyproject.toml | 2 +- tox.ini | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 4b47d24..7633ccd 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -35,7 +35,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v2" with: - python-version: "3.6" + python-version: "3.8" - name: Install dependencies 🔧 if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index db8ab06..7137126 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -40,7 +40,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v2" with: - python-version: "3.6" + python-version: "3.8" - name: Install dependencies 🔧 run: | diff --git a/pyproject.toml b/pyproject.toml index b78d72b..fc1c27b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -127,7 +127,7 @@ autodoc_exclude_members = [ ] [tool.mypy] -python_version = "3.6" +python_version = "3.8" namespace_packages = true check_untyped_defs = true warn_unused_ignores = true diff --git a/tox.ini b/tox.ini index 6832930..aa0c3ed 100644 --- a/tox.ini +++ b/tox.ini @@ -49,7 +49,7 @@ test = pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} qa = mypy, lint -cov = py36-sphinx3.2, coverage +cov = py38-sphinx3.2, coverage [testenv:docs] setenv = SHOW_TODOS = 1 @@ -72,7 +72,7 @@ commands = check-wheel-contents dist/ [testenv:lint] -basepython = python3.6 +basepython = python3.8 changedir = {toxinidir} ignore_errors = True skip_install = True @@ -102,7 +102,7 @@ deps = commands = python3 -m flake8_rst_docstrings_sphinx sphinx_autofixture tests --allow-toolbox {posargs} [testenv:perflint] -basepython = python3.6 +basepython = python3.8 changedir = {toxinidir} ignore_errors = True skip_install = True @@ -110,17 +110,17 @@ deps = perflint commands = python3 -m perflint sphinx_autofixture {posargs} [testenv:mypy] -basepython = python3.6 +basepython = python3.8 ignore_errors = True changedir = {toxinidir} deps = - mypy==0.942 + mypy==0.971 -r{toxinidir}/tests/requirements.txt -r{toxinidir}/stubs.txt commands = mypy sphinx_autofixture tests {posargs} [testenv:pyup] -basepython = python3.6 +basepython = python3.8 skip_install = True ignore_errors = True changedir = {toxinidir} @@ -128,7 +128,7 @@ deps = pyupgrade-directories commands = pyup_dirs sphinx_autofixture tests --py36-plus --recursive [testenv:coverage] -basepython = python3.6 +basepython = python3.8 skip_install = True ignore_errors = True whitelist_externals = /bin/bash From 2913126729efc5530c37c233e2b71812ffa8072a Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:17:56 +0000 Subject: [PATCH 09/69] Updated files with 'repo_helper'. (#50) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 4 ++-- .github/workflows/docs_test_action.yml | 2 +- .github/workflows/flake8.yml | 4 ++-- .github/workflows/mypy.yml | 4 ++-- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 20 ++++++++++---------- .github/workflows/python_ci_macos.yml | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index ed41ec3..ed19285 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Setup Python 🐍 - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "3.8" diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index d258e8d..917a145 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files uses: dorny/paths-filter@v2 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 7633ccd..2761d45 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -33,7 +33,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "3.8" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 7137126..6caf60d 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -38,7 +38,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "3.8" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 0c76468..0523bbe 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,7 +33,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} @@ -41,7 +41,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -56,7 +56,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 6a0a163..dd62ef2 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,7 +34,7 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -57,7 +57,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "${{ matrix.config.python-version }}" @@ -87,10 +87,10 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Setup Python 🐍 - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: 3.8 @@ -136,11 +136,11 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" if: startsWith(github.ref, 'refs/tags/') - name: Setup Python 🐍 - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" if: startsWith(github.ref, 'refs/tags/') with: python-version: 3.8 @@ -181,10 +181,10 @@ jobs: if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Setup Python 🐍 - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: 3.8 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index e9c761b..41cc0b8 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-rc.2,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -33,14 +33,14 @@ jobs: - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11.0-rc.2", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True} steps: - name: Checkout 🛎️ - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -55,7 +55,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v2" + uses: "actions/setup-python@v4" with: python-version: "${{ matrix.config.python-version }}" From 9e13f39fd5d5ed661d9f08385121dcc365f33a3d Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 18:26:47 +0000 Subject: [PATCH 10/69] [repo-helper] Configuration Update (#51) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 10 +++++----- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 2761d45..8221173 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -43,7 +43,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install tox + python -m pip install tox~=3.0 - name: "Run Flake8" if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 6caf60d..9b28b5f 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -47,7 +47,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv!=20.16.0 + python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0 - name: "Run mypy" if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 0523bbe..862d7f3 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -66,14 +66,14 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv!=20.16.0 + python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0 - name: "Run Tests for Python ${{ matrix.config.python-version }}" if: steps.setup-python.outcome == 'success' run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index dd62ef2..9fbe307 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -67,7 +67,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv!=20.16.0 + python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0 python -m pip install --upgrade coverage_pyver_pragma - name: "Run Tests for Python ${{ matrix.config.python-version }}" @@ -75,7 +75,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" @@ -100,7 +100,7 @@ jobs: python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma - name: "Download Coverage 🪂" - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: path: coverage @@ -118,7 +118,7 @@ jobs: - name: "Upload Combined Coverage Artefact 🚀" if: ${{ steps.show.outcome != 'failure' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: "combined-coverage" path: .coverage @@ -149,7 +149,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') run: | python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox + python -m pip install --upgrade tox~=3.0 - name: Build distributions 📦 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 41cc0b8..74a6139 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -65,14 +65,14 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade tox virtualenv!=20.16.0 + python -m pip install --upgrade tox~=3.0 virtualenv!=20.16.0 - name: "Run Tests for Python ${{ matrix.config.python-version }}" if: steps.setup-python.outcome == 'success' run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/tox.ini b/tox.ini index aa0c3ed..26b9501 100644 --- a/tox.ini +++ b/tox.ini @@ -34,6 +34,7 @@ isolated_build = True requires = pip>=21,!=22.2 tox-envlist>=0.2.1 + tox~=3.0 virtualenv!=20.16.0 [envlists] From e35b5652e57c4d30c9a552f88658662d5fc9a48b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 18 Apr 2023 09:03:24 +0100 Subject: [PATCH 11/69] Don't error on pkg-resources deprecation warnings --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 26b9501..9db23b2 100644 --- a/tox.ini +++ b/tox.ini @@ -205,6 +205,8 @@ filterwarnings = always:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning always:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning always:The `docutils.parsers.rst.directive.html` module will be removed in Docutils 1.2.:DeprecationWarning + always:pkg_resources is deprecated as an API:DeprecationWarning + always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning markers = sphinx [testenv] From 3b0531ecddce67a4591ed9aeb601e64718ad4381 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 18 Apr 2023 19:21:30 +0100 Subject: [PATCH 12/69] Update reference file --- tests/test_directive_/test_output_36_index_html_.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_directive_/test_output_36_index_html_.html b/tests/test_directive_/test_output_36_index_html_.html index e172fd1..8db9374 100644 --- a/tests/test_directive_/test_output_36_index_html_.html +++ b/tests/test_directive_/test_output_36_index_html_.html @@ -1,4 +1,4 @@ -{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% macro span_pre(text, indent='', min_version=(3, 5)) -%} {% if sphinx_version >= min_version %} {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} From 1d36cc07ee6a5419416611a9bd918c587cf65b85 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 18 Apr 2023 22:54:26 +0100 Subject: [PATCH 13/69] Update reference files --- tests/test_directive_/test_output_310_index_html_.html | 2 +- tests/test_directive_/test_output_36_pypy_index_html_.html | 2 +- tests/test_directive_/test_output_37_index_html_.html | 2 +- tests/test_directive_/test_output_37_pypy_index_html_.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index cae1257..08d77f6 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -1,4 +1,4 @@ -{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% macro span_pre(text, indent='', min_version=(3, 5)) -%} {% if sphinx_version >= min_version %} {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html index b6853cf..fb6a16e 100644 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ b/tests/test_directive_/test_output_36_pypy_index_html_.html @@ -1,4 +1,4 @@ -{% macro span_pre(text, indent='') -%} +{% macro span_pre(text, indent='', min_version=(3, 5)) -%} {% if sphinx_version >= (3, 5) %} {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 97ee6e3..55ffaa8 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -1,4 +1,4 @@ -{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% macro span_pre(text, indent='', min_version=(3, 5)) -%} {% if sphinx_version >= min_version %} {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index d38484b..31d0153 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -1,4 +1,4 @@ -{% macro span_pre(text, indent='', min_version=(4, 0)) -%} +{% macro span_pre(text, indent='', min_version=(3, 5)) -%} {% if sphinx_version >= min_version %} {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} From 66c288f9162de01333edf7ed7fdf766041f415b6 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 13:05:20 +0000 Subject: [PATCH 14/69] Updated files with 'repo_helper'. (#53) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .bumpversion.cfg | 2 ++ .github/workflows/conda_ci.yml | 6 ++++-- .github/workflows/python_ci_linux.yml | 6 ++++-- .pre-commit-config.yaml | 6 +++--- README.rst | 2 +- doc-source/index.rst | 2 +- tox.ini | 10 ++++++++++ 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dba9723..2e87e36 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -18,3 +18,5 @@ search = version = "{current_version}" replace = version = "{new_version}" [bumpversion:file:.github/workflows/conda_ci.yml] +search = ={current_version}=py_1 +replace = ={new_version}=py_1 diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index ed19285..6e13a91 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -12,7 +12,7 @@ permissions: jobs: tests: name: "Conda" - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 defaults: run: shell: bash -l {0} @@ -30,7 +30,9 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.21.0 + conda-build-version: 3.23.3 + python-version: "3.8" + miniforge-variant: Mambaforge - name: Install dependencies 🔧 run: | diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 9fbe307..aa5ab23 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -177,7 +177,7 @@ jobs: Conda: needs: deploy - runs-on: "ubuntu-18.04" + runs-on: ubuntu-22.04 if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout 🛎️ @@ -192,7 +192,9 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.21.0 + conda-build-version: 3.23.3 + python-version: "3.8" + miniforge-variant: Mambaforge - name: Install dependencies 🔧 run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 24bbc98..20e78d8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - id: flake2lint - repo: https://github.com/pre-commit/pygrep-hooks - rev: v1.9.0 + rev: v1.10.0 hooks: - id: python-no-eval - id: rst-backticks @@ -70,7 +70,7 @@ repos: - --keep-runtime-typing - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.3.1 + rev: v1.5.1 hooks: - id: remove-crlf - id: forbid-crlf @@ -87,7 +87,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.7.0 + rev: v0.7.1 hooks: - id: dep_checker args: diff --git a/README.rst b/README.rst index 0bca5e8..5ed7cdb 100644 --- a/README.rst +++ b/README.rst @@ -114,7 +114,7 @@ and `the documentation for coincidence`_ for an example with the ReadTheDocs the :target: https://github.com/sphinx-toolbox/sphinx-autofixture/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2022 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2023 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/sphinx-autofixture diff --git a/doc-source/index.rst b/doc-source/index.rst index 69e3e6b..ddad5dc 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -114,7 +114,7 @@ sphinx-autofixture :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2022 + .. |maintained| maintained-shield:: 2023 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/tox.ini b/tox.ini index 9db23b2..f69102c 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,8 @@ # You may add new sections, but any changes made to the following sections will be lost: # * tox # * envlists +# * testenv:.package +# * testenv:py312-dev # * testenv:docs # * testenv:build # * testenv:lint @@ -52,6 +54,11 @@ test = qa = mypy, lint cov = py38-sphinx3.2, coverage +[testenv:.package] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv:docs] setenv = SHOW_TODOS = 1 passenv = SPHINX_BUILDER @@ -61,6 +68,9 @@ deps = -r{toxinidir}/doc-source/requirements.txt commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs} [testenv:build] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = From 4770f6b901e399ca6dd69cc60bc9daa9fd5bd48d Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 20 Apr 2023 14:25:07 +0100 Subject: [PATCH 15/69] Test on Sphinx 6.x and Python 3.12 --- .github/workflows/python_ci.yml | 15 +++---- .github/workflows/python_ci_linux.yml | 15 +++---- .github/workflows/python_ci_macos.yml | 15 +++---- pyproject.toml | 2 +- repo_helper.yml | 17 +++++++- .../test_output_37_index_html_.html | 8 ++-- tox.ini | 41 +++++++++++++------ 7 files changed, 75 insertions(+), 38 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 862d7f3..e590ba1 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -30,14 +30,15 @@ jobs: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index aa5ab23..a465d63 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -31,14 +31,15 @@ jobs: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 74a6139..5fe1e91 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -30,13 +30,14 @@ jobs: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} + - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} steps: - name: Checkout 🛎️ diff --git a/pyproject.toml b/pyproject.toml index fc1c27b..fd36d63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ base-classifiers = [ "Topic :: Software Development :: Documentation", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",] +python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 310069f..c01da68 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -23,11 +23,18 @@ python_versions: sphinx: - 5.0 - 5.1 + - 6.0 + - 6.1 '3.7': + matrix_exclude: + sphinx: + - 6.0 + - 6.1 '3.8': '3.9': '3.10': - 3.11-dev: + 3.11: + 3.12-dev: pypy36: matrix_exclude: sphinx: @@ -39,7 +46,13 @@ python_versions: - 4.5 - 5.0 - 5.1 + - 6.0 + - 6.1 pypy37: + matrix_exclude: + sphinx: + - 6.0 + - 6.1 pypy38: pypy39: @@ -64,6 +77,8 @@ third_party_version_matrix: - 4.5 - 5.0 - 5.1 + - 6.0 + - 6.1 keywords: - sphinx diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 55ffaa8..32fbe79 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -18,15 +18,17 @@ sphinx-autofixture Demo — Python documentation + {% if sphinx_version < (6, 0) %} {% if sphinx_version >= (5, 0) %} {% endif %} + {% endif %}{% endif %} + {% if sphinx_version >= (5, 2) %} + {% endif %} diff --git a/tox.ini b/tox.ini index f69102c..99f8e24 100644 --- a/tox.ini +++ b/tox.ini @@ -21,14 +21,15 @@ envlist = py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} mypy build skip_missing_interpreters = True @@ -43,14 +44,15 @@ requires = test = py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py311-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} qa = mypy, lint cov = py38-sphinx3.2, coverage @@ -59,6 +61,11 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 +[testenv:py312-dev] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv:docs] setenv = SHOW_TODOS = 1 passenv = SPHINX_BUILDER @@ -219,6 +226,16 @@ filterwarnings = always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning markers = sphinx +[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + +[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv] setenv = PYTHONDEVMODE=1 From bc3cd6f6ef19745bbef6eb7b239d61c84a3ea203 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 25 Apr 2023 08:34:08 +0100 Subject: [PATCH 16/69] Update reference files for Sphinx 6.x --- tests/test_directive_/test_output_310_index_html_.html | 8 +++++--- .../test_directive_/test_output_37_pypy_index_html_.html | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 08d77f6..7cd968e 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -18,15 +18,17 @@ sphinx-autofixture Demo — Python documentation + {% if sphinx_version < (6, 0) %} {% if sphinx_version >= (5, 0) %} {% endif %} + {% endif %}{% endif %} + {% if sphinx_version >= (5, 2) %} + {% endif %} diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index 31d0153..861e28c 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -18,15 +18,17 @@ sphinx-autofixture Demo — Python documentation + {% if sphinx_version < (6, 0) %} {% if sphinx_version >= (5, 0) %} {% endif %} + {% endif %}{% endif %} + {% if sphinx_version >= (5, 2) %} + {% endif %} From ab22d7c73658777522b4851f02f941f3686ec3bd Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 26 Apr 2023 21:17:05 +0100 Subject: [PATCH 17/69] Update PyPy reference file --- .../test_output_36_pypy_index_html_.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html index fb6a16e..6905d21 100644 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ b/tests/test_directive_/test_output_36_pypy_index_html_.html @@ -47,10 +47,10 @@
{{ span_pre("fixture", " ") }} <{{ sig_prename_tag }} class="sig-prename descclassname"> - coincidence.fixtures. + {{ span_pre("coincidence.fixtures.", " ") }} <{{ sig_prename_tag }} class="sig-name descname"> - tmp_pathplus + {{ span_pre("tmp_pathplus", " ") }} ¶ @@ -105,10 +105,10 @@
{{ span_pre("fixture", " ") }} <{{ sig_prename_tag }} class="sig-prename descclassname"> - coincidence.fixtures. + {{ span_pre("coincidence.fixtures.", " ") }} <{{ sig_prename_tag }} class="sig-name descname"> - tmp_pathplus + {{ span_pre("tmp_pathplus", " ") }}

@@ -150,10 +150,10 @@

<{{ sig_prename_tag }} class="sig-prename descclassname"> - tests.myproject. + {{ span_pre("tests.myproject.", " ") }} <{{ sig_prename_tag }} class="sig-name descname"> - baz + {{ span_pre("baz", " ") }} ( @@ -174,10 +174,10 @@

<{{ sig_prename_tag }} class="sig-prename descclassname"> - tests.myproject. + {{ span_pre("tests.myproject.", " ") }} <{{ sig_prename_tag }} class="sig-name descname"> - fizbuzz + {{ span_pre("fizbuzz", " ") }} ( From c8927deb99e8ec392de101c404d20ad5700c6a3b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 26 Apr 2023 21:17:26 +0100 Subject: [PATCH 18/69] Update reference file for Python 3,12 --- tests/test_directive_/test_output_310_index_html_.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 7cd968e..066b4c1 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -193,15 +193,15 @@
<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("__dataclass_params__", " ") }} - + {% set DataclassParams_end_args = ',match_args=True,kw_only=False,slots=False,weakref_slot=False' if python_version >= (3, 12) else '' %} {% if (3, 5) <= sphinx_version < (4, 3) %} = - _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False) + _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False{{ DataclassParams_end_args }}) {% else %} - = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} + = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False{{ DataclassParams_end_args }}){% endif %} ¶ From 6b926dad8bd3047f9d132a664e751ca7e2be5f06 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 24 Aug 2023 18:28:05 +0100 Subject: [PATCH 19/69] Test on newer Sphinx versions --- .github/workflows/python_ci.yml | 22 +++++------ .github/workflows/python_ci_linux.yml | 22 +++++------ .github/workflows/python_ci_macos.yml | 20 +++++----- repo_helper.yml | 33 +++++++++++++++- tox.ini | 57 +++++++++++++++------------ 5 files changed, 95 insertions(+), 59 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index e590ba1..2777541 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,23 +22,23 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} + - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5,5.3}", experimental: False} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index a465d63..67dd48e 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,23 +23,23 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} + - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5,5.3},build", experimental: False} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 5fe1e91..da80e5d 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,22 +22,22 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-alpha.7,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: False} - - {python-version: "3.12.0-alpha.7", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1},build", experimental: True} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}", experimental: True} + - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/repo_helper.yml b/repo_helper.yml index c01da68..7a2778e 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -23,17 +23,30 @@ python_versions: sphinx: - 5.0 - 5.1 + - 5.2 + - 5.3 - 6.0 - 6.1 + - 6.2 + - 7.0 + - 7.1 + - 7.2 '3.7': matrix_exclude: sphinx: - 6.0 - 6.1 + - 6.2 + - 7.0 + - 7.1 + - 7.2 '3.8': + matrix_exclude: + sphinx: + - 7.2 '3.9': '3.10': - 3.11: + "3.11": 3.12-dev: pypy36: matrix_exclude: @@ -46,14 +59,26 @@ python_versions: - 4.5 - 5.0 - 5.1 + - 5.2 - 6.0 - 6.1 + - 6.2 + - 7.0 + - 7.1 + - 7.2 pypy37: matrix_exclude: sphinx: - 6.0 - 6.1 + - 6.2 + - 7.0 + - 7.1 + - 7.2 pypy38: + matrix_exclude: + sphinx: + - 7.2 pypy39: conda_channels: @@ -77,8 +102,14 @@ third_party_version_matrix: - 4.5 - 5.0 - 5.1 + - 5.2 + - 5.3 - 6.0 - 6.1 + - 6.2 + - 7.0 + - 7.1 + # - 7.2 keywords: - sphinx diff --git a/tox.ini b/tox.ini index 99f8e24..bc8bd68 100644 --- a/tox.ini +++ b/tox.ini @@ -20,16 +20,16 @@ [tox] envlist = py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} - py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - pypy36-sphinx{3.2,3.3,3.4,3.5} - pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy36-sphinx{3.2,3.3,3.4,3.5,5.3} + pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} mypy build skip_missing_interpreters = True @@ -39,20 +39,21 @@ requires = tox-envlist>=0.2.1 tox~=3.0 virtualenv!=20.16.0 +toxworkdir = {env:TOX_WORK_DIR:.tox} [envlists] test = py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} - py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - pypy36-sphinx{3.2,3.3,3.4,3.5} - pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy36-sphinx{3.2,3.3,3.4,3.5,5.3} + pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} qa = mypy, lint cov = py38-sphinx3.2, coverage @@ -224,14 +225,10 @@ filterwarnings = always:The `docutils.parsers.rst.directive.html` module will be removed in Docutils 1.2.:DeprecationWarning always:pkg_resources is deprecated as an API:DeprecationWarning always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning + always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext markers = sphinx -[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,6.0,6.1}] -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - -[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1}] +[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -258,6 +255,14 @@ deps = sphinx4.{0,1,2,3,4,5}: docutils<=0.17.1 sphinx5.0: sphinx==5.0.2 sphinx5.1: sphinx==5.1.1 + sphinx5.2: sphinx==5.2.1 + sphinx5.3: sphinx==5.3.0 + sphinx6.0: sphinx==6.0.1 + sphinx6.1: sphinx==6.1.2 + sphinx6.2: sphinx==6.2.1 + sphinx7.0: sphinx==7.0.1 + sphinx7.1: sphinx==7.1.2 + sphinx7.2: sphinx==7.2.3 commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} From 14d36b1c99d6c44bdc8d399833921ca9722a3e4e Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Fri, 25 Aug 2023 08:07:28 +0100 Subject: [PATCH 20/69] Update tests for Sphinx 7.1 --- tests/test_directive.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_directive.py b/tests/test_directive.py index 7080ed6..0941ff7 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -96,4 +96,9 @@ def test_output( if isinstance(first_child, element.Tag): code.contents = [first_child.contents[0]] + for div in page.findAll("script"): + if div.get("src"): + div["src"] = div["src"].split("?v=")[0] + print(div["src"]) + html_regression.check(page, jinja2=True) From f45570a51b749711207c170705f03987d2e5a2aa Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Sat, 26 Aug 2023 16:30:26 +0100 Subject: [PATCH 21/69] Skip Sphinx 5.3 on PyPy 3.6 --- .github/workflows/python_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- repo_helper.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 2777541..f849ba5 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5,5.3}", experimental: False} + - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 67dd48e..403b507 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5,5.3},build", experimental: False} + - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/repo_helper.yml b/repo_helper.yml index 7a2778e..200f419 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -60,6 +60,7 @@ python_versions: - 5.0 - 5.1 - 5.2 + - 5.3 - 6.0 - 6.1 - 6.2 From dabb817a4e80ca24dddff837a8191f0f67a7a9a9 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 18:21:09 +0100 Subject: [PATCH 22/69] Updated files with 'repo_helper'. (#55) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 6 +++--- .readthedocs.yml | 10 +++++++--- doc-source/requirements.txt | 18 +++++++++--------- tox.ini | 10 ++++++---- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 20e78d8..64d9ea8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.7.0 + rev: v0.9.0 hooks: - id: reformat-pyproject @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.2.2 + rev: v0.3.0 hooks: - id: ensure-dunder-all files: ^sphinx_autofixture/.*\.py$ @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.4.10 + rev: v0.5.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/.readthedocs.yml b/.readthedocs.yml index 41d2e57..4a2ec5f 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,9 +9,13 @@ formats: - pdf - htmlzip python: - version: 3.8 install: - requirements: requirements.txt - requirements: doc-source/requirements.txt - - method: pip - path: . +build: + os: ubuntu-20.04 + tools: + python: '3.9' + jobs: + post_create_environment: + - pip install . diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index 3c82665..acfcae1 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -1,17 +1,17 @@ -default-values>=0.5.0 +default-values>=0.6.0 domdf-python-tools[testing]>=1.5.0 -extras-require>=0.2.0 -furo>=2020.11.19b18 -html-section>=0.1.0 -seed-intersphinx-mapping>=0.3.1 +extras-require>=0.5.0 +furo==2021.06.18b36 +html-section>=0.3.0 +seed-intersphinx-mapping>=1.2.2 sphinx-copybutton>=0.2.12 -sphinx-debuginfo>=0.1.0 -sphinx-licenseinfo>=0.1.1 +sphinx-debuginfo>=0.2.2 +sphinx-licenseinfo>=0.3.1 sphinx-notfound-page>=0.7.1 sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 sphinx-tabs>=1.1.13 -sphinx-toolbox>=2.13.0 +sphinx-toolbox>=3.5.0 sphinxcontrib-httpdomain>=1.7.0 sphinxemoji>=0.1.6 -toctree-plus>=0.5.0 +toctree-plus>=0.6.1 diff --git a/tox.ini b/tox.ini index bc8bd68..589ccae 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ envlist = py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy36-sphinx{3.2,3.3,3.4,3.5,5.3} + pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -39,7 +39,6 @@ requires = tox-envlist>=0.2.1 tox~=3.0 virtualenv!=20.16.0 -toxworkdir = {env:TOX_WORK_DIR:.tox} [envlists] test = @@ -50,7 +49,7 @@ test = py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy36-sphinx{3.2,3.3,3.4,3.5,5.3} + pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -79,12 +78,14 @@ commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs} setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + PIP_PREFER_BINARY=1 skip_install = True changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 twine>=3.2.0 + cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" twine check dist/*.tar.gz dist/*.whl @@ -167,7 +168,7 @@ commands = [flake8] max-line-length = 120 -select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E303 E304 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 A003 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 ENC001 ENC002 ENC003 ENC004 ENC011 ENC012 ENC021 ENC022 ENC023 ENC024 ENC025 ENC026 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 NQA001 NQA002 NQA003 NQA004 NQA005 NQA102 NQA103 E301 E302 E305 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000 SLOT000 SLOT001 SLOT002 +select = E111 E112 E113 E121 E122 E125 E127 E128 E129 E131 E133 E201 E202 E203 E211 E222 E223 E224 E225 E225 E226 E227 E228 E231 E241 E242 E251 E261 E262 E265 E271 E272 E303 E304 E306 E402 E502 E703 E711 E712 E713 E714 E721 W291 W292 W293 W391 W504 YTT101 YTT102 YTT103 YTT201 YTT202 YTT203 YTT204 YTT301 YTT302 YTT303 STRFTIME001 STRFTIME002 SXL001 PT001 PT002 PT003 PT006 PT007 PT008 PT009 PT010 PT011 PT012 PT013 PT014 PT015 PT016 PT017 PT018 PT019 PT020 PT021 RST201 RST202 RST203 RST204 RST205 RST206 RST207 RST208 RST210 RST211 RST212 RST213 RST214 RST215 RST216 RST217 RST218 RST219 RST299 RST301 RST302 RST303 RST304 RST305 RST306 RST399 RST401 RST499 RST900 RST901 RST902 RST903 Q001 Q002 Q003 A001 A002 TYP001 TYP002 TYP003 TYP004 TYP005 TYP006 ENC001 ENC002 ENC003 ENC004 ENC011 ENC012 ENC021 ENC022 ENC023 ENC024 ENC025 ENC026 Y001,Y002 Y003 Y004 Y005 Y006 Y007 Y008 Y009 Y010 Y011 Y012 Y013 Y014 Y015 Y090 Y091 NQA001 NQA002 NQA003 NQA004 NQA005 NQA102 NQA103 E301 E302 E305 D100 D101 D102 D103 D104 D106 D201 D204 D207 D208 D209 D210 D211 D212 D213 D214 D215 D300 D301 D400 D402 D403 D404 D415 D417 DALL000 SLOT000 SLOT001 SLOT002 extend-exclude = doc-source,old,build,dist,__pkginfo__.py,setup.py,venv rst-directives = TODO @@ -195,6 +196,7 @@ plugins = coverage_pyver_pragma [coverage:report] fail_under = 95 +show_missing = True exclude_lines = raise AssertionError raise NotImplementedError From 4681928e4e562403f083c91940860d3c143ff738 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 20 Nov 2023 14:07:25 +0000 Subject: [PATCH 23/69] Test on newer Python versions --- .github/workflows/python_ci.yml | 9 +++++---- .github/workflows/python_ci_linux.yml | 9 +++++---- .github/workflows/python_ci_macos.yml | 9 +++++---- pyproject.toml | 2 +- repo_helper.yml | 3 ++- tox.ini | 25 ++++++++++++++++++++++--- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f849ba5..9e0ec1a 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,10 +34,11 @@ jobs: - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 403b507..0d8cff8 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,10 +35,11 @@ jobs: - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index da80e5d..2f4764a 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -34,9 +34,10 @@ jobs: - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12.0-rc.1", testenvs: "py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: True} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: diff --git a/pyproject.toml b/pyproject.toml index fd36d63..c1beb0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ base-classifiers = [ "Topic :: Software Development :: Documentation", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11",] +python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 200f419..6c2a1c3 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -47,7 +47,8 @@ python_versions: '3.9': '3.10': "3.11": - 3.12-dev: + "3.12": + 3.13-dev: pypy36: matrix_exclude: sphinx: diff --git a/tox.ini b/tox.ini index 589ccae..7b20edf 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,9 @@ # * tox # * envlists # * testenv:.package +# * testenv:py313-dev # * testenv:py312-dev +# * testenv:py312 # * testenv:docs # * testenv:build # * testenv:lint @@ -25,7 +27,8 @@ envlist = py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -48,7 +51,8 @@ test = py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy36-sphinx{3.2,3.3,3.4,3.5} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -61,7 +65,12 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py312-dev] +[testenv:py313-dev] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + +[testenv:py312] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -230,6 +239,16 @@ filterwarnings = always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext markers = sphinx +[testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + +[testenv:py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + [testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] setenv = PYTHONDEVMODE=1 From 25349e141853ddf571117ad04ade0df15bcc60c6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 20 Nov 2023 21:05:43 +0000 Subject: [PATCH 24/69] Update pytest warningfilter --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 7b20edf..61decbd 100644 --- a/tox.ini +++ b/tox.ini @@ -237,6 +237,8 @@ filterwarnings = always:pkg_resources is deprecated as an API:DeprecationWarning always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext + always:datetime.datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version.:DeprecationWarning:sphinx.builders.gettext + markers = sphinx [testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] From 7983ad30e70bf6cc53b073e2181ed39c8320a894 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 20 Nov 2023 23:10:55 +0000 Subject: [PATCH 25/69] Update pytest warningfilter --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 61decbd..a5c4728 100644 --- a/tox.ini +++ b/tox.ini @@ -238,6 +238,7 @@ filterwarnings = always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext always:datetime.datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version.:DeprecationWarning:sphinx.builders.gettext + always:The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead:DeprecationWarning:sphinxcontrib.applehelp markers = sphinx From 7bb438a79a8cc0af04b50ef02f5fdd6eee535cff Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 21 Nov 2023 08:21:58 +0000 Subject: [PATCH 26/69] Update pytest warningfilter --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index a5c4728..42ef6c7 100644 --- a/tox.ini +++ b/tox.ini @@ -234,6 +234,7 @@ filterwarnings = always:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning always:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning always:The `docutils.parsers.rst.directive.html` module will be removed in Docutils 1.2.:DeprecationWarning + always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.util.display.progress_message' instead. always:pkg_resources is deprecated as an API:DeprecationWarning always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext From 7957790af350d46c037422655d59aff9d9c0a8e6 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 21 Nov 2023 15:31:48 +0000 Subject: [PATCH 27/69] Update warning filter --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 42ef6c7..dee1c9f 100644 --- a/tox.ini +++ b/tox.ini @@ -240,6 +240,7 @@ filterwarnings = always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext always:datetime.datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version.:DeprecationWarning:sphinx.builders.gettext always:The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead:DeprecationWarning:sphinxcontrib.applehelp + always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.http_date.epoch_to_rfc1123' instead.:DeprecationWarning:sphinxcontrib.applehelp markers = sphinx From b06a535228108204af70f577c787710a2493513b Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 21 Nov 2023 16:25:10 +0000 Subject: [PATCH 28/69] Update warning filter --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index dee1c9f..c0f63f8 100644 --- a/tox.ini +++ b/tox.ini @@ -235,6 +235,7 @@ filterwarnings = always:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning always:The `docutils.parsers.rst.directive.html` module will be removed in Docutils 1.2.:DeprecationWarning always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.util.display.progress_message' instead. + always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.http_date.epoch_to_rfc1123' instead. always:pkg_resources is deprecated as an API:DeprecationWarning always:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning always:datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version:DeprecationWarning:sphinx.builders.gettext From f1b46f6aee7fdab77df069208b80c423203f53ce Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 13:17:21 +0000 Subject: [PATCH 29/69] Updated files with 'repo_helper'. (#58) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 9e0ec1a..0ab31b7 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 0d8cff8..7bbf2ab 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 2f4764a..41c7059 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/tox.ini b/tox.ini index c0f63f8..8d9044f 100644 --- a/tox.ini +++ b/tox.ini @@ -93,7 +93,8 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0 + twine>=3.2.0; python_version < "3.13" + twine@git+https://github.com/pypa/twine; python_version >= "3.13" cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" @@ -113,7 +114,7 @@ deps = flake8-dunder-all>=0.1.1 flake8-encodings>=0.1.0 flake8-github-actions>=0.1.0 - flake8-noqa>=1.1.0,<=1.2.2 + flake8-noqa>=1.1.0 flake8-pyi>=20.10.0,<=22.8.0 flake8-pytest-style>=1.3.0 flake8-quotes>=3.3.0 @@ -242,7 +243,6 @@ filterwarnings = always:datetime.datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version.:DeprecationWarning:sphinx.builders.gettext always:The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead:DeprecationWarning:sphinxcontrib.applehelp always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.http_date.epoch_to_rfc1123' instead.:DeprecationWarning:sphinxcontrib.applehelp - markers = sphinx [testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] From 6bbefc06fcf73a87966368ca0fc3a70488bb84dc Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 29 Jan 2024 10:52:14 +0000 Subject: [PATCH 30/69] Cap sphinxcontrib-*help and alabaster versions in tests. They don't correctly specify their minimum sphinx requirement. --- tox.ini | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8d9044f..0b234f7 100644 --- a/tox.ini +++ b/tox.ini @@ -289,7 +289,14 @@ deps = sphinx6.2: sphinx==6.2.1 sphinx7.0: sphinx==7.0.1 sphinx7.1: sphinx==7.1.2 - sphinx7.2: sphinx==7.2.3 + sphinx7.2: sphinx==7.2.5 + sphinxcontrib-applehelp<=1.0.4 + sphinxcontrib-devhelp<=1.0.2 + sphinxcontrib-htmlhelp<=2.0.1 + sphinxcontrib-jsmath<=1.0.1 + sphinxcontrib-qthelp<=1.0.3 + sphinxcontrib-serializinghtml<=1.1.5 + alabaster<=0.7.13 commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} From a929be1035c49c090651e3ce995d08ecd058ec75 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 29 Jan 2024 10:53:22 +0000 Subject: [PATCH 31/69] Update reference files for newer docutils. --- tests/test_directive_/test_output_310_index_html_.html | 6 ++++-- tests/test_directive_/test_output_36_index_html_.html | 6 ++++-- tests/test_directive_/test_output_36_pypy_index_html_.html | 6 ++++-- tests/test_directive_/test_output_37_index_html_.html | 6 ++++-- tests/test_directive_/test_output_37_pypy_index_html_.html | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 066b4c1..e312886 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -12,8 +12,10 @@ - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} + {% if docutils_version[1] == 18 %} + {% elif docutils_version[1] == 17 %} + {% elif docutils_version[1] == 19 %} + {% elif docutils_version[1] == 20 %} {% endif %} sphinx-autofixture Demo — Python documentation diff --git a/tests/test_directive_/test_output_36_index_html_.html b/tests/test_directive_/test_output_36_index_html_.html index 8db9374..5bd13e2 100644 --- a/tests/test_directive_/test_output_36_index_html_.html +++ b/tests/test_directive_/test_output_36_index_html_.html @@ -12,8 +12,10 @@ - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} + {% if docutils_version[1] == 18 %} + {% elif docutils_version[1] == 17 %} + {% elif docutils_version[1] == 19 %} + {% elif docutils_version[1] == 20 %} {% endif %} sphinx-autofixture Demo — Python documentation diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html index 6905d21..21c0519 100644 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ b/tests/test_directive_/test_output_36_pypy_index_html_.html @@ -12,8 +12,10 @@ - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} + {% if docutils_version[1] == 18 %} + {% elif docutils_version[1] == 17 %} + {% elif docutils_version[1] == 19 %} + {% elif docutils_version[1] == 20 %} {% endif %} sphinx-autofixture Demo — Python documentation diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 32fbe79..55f6a1d 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -12,8 +12,10 @@ - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} + {% if docutils_version[1] == 18 %} + {% elif docutils_version[1] == 17 %} + {% elif docutils_version[1] == 19 %} + {% elif docutils_version[1] == 20 %} {% endif %} sphinx-autofixture Demo — Python documentation diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index 861e28c..7b9fbd7 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -12,8 +12,10 @@ - {% if docutils_version >= (0, 18) %} - {% elif docutils_version >= (0, 17) %} + {% if docutils_version[1] == 18 %} + {% elif docutils_version[1] == 17 %} + {% elif docutils_version[1] == 19 %} + {% elif docutils_version[1] == 20 %} {% endif %} sphinx-autofixture Demo — Python documentation From 5bffdb7bb8a93bb2a0d68ee29c3728fe0399b8f1 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 29 Jan 2024 14:05:45 +0000 Subject: [PATCH 32/69] Update reference file for Python 3.11 --- tests/test_directive_/test_output_310_index_html_.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index e312886..3d03bff 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -369,7 +369,7 @@

- list of weak references to the object (if defined) + list of weak references to the object{% if python_version < (3, 11) %} (if defined){% endif %}

From d7ec086f5f0c195e31bde608b8072e7264545ea0 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:06:42 +0000 Subject: [PATCH 33/69] Updated files with 'repo_helper'. (#61) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- .readthedocs.yml | 3 +++ README.rst | 2 +- doc-source/index.rst | 2 +- tox.ini | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 6e13a91..c4192dc 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -30,7 +30,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.23.3 + conda-build-version: 3.28.4 python-version: "3.8" miniforge-variant: Mambaforge diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 7bbf2ab..ef3041f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -194,7 +194,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: activate-environment: env - conda-build-version: 3.23.3 + conda-build-version: 3.28.4 python-version: "3.8" miniforge-variant: Mambaforge diff --git a/.readthedocs.yml b/.readthedocs.yml index 4a2ec5f..e928b70 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -19,3 +19,6 @@ build: jobs: post_create_environment: - pip install . + post_install: + - pip install sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 sphinxcontrib-htmlhelp==2.0.1 + sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 diff --git a/README.rst b/README.rst index 5ed7cdb..ff8bcc6 100644 --- a/README.rst +++ b/README.rst @@ -114,7 +114,7 @@ and `the documentation for coincidence`_ for an example with the ReadTheDocs the :target: https://github.com/sphinx-toolbox/sphinx-autofixture/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2023 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/sphinx-autofixture diff --git a/doc-source/index.rst b/doc-source/index.rst index ddad5dc..3a2dca0 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -114,7 +114,7 @@ sphinx-autofixture :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2023 + .. |maintained| maintained-shield:: 2024 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/tox.ini b/tox.ini index 0b234f7..86c545a 100644 --- a/tox.ini +++ b/tox.ini @@ -114,7 +114,7 @@ deps = flake8-dunder-all>=0.1.1 flake8-encodings>=0.1.0 flake8-github-actions>=0.1.0 - flake8-noqa>=1.1.0 + flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 flake8-pytest-style>=1.3.0 flake8-quotes>=3.3.0 From f1de6ab43f2bfd05558e62ccda828a202ec4a34d Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 29 Jan 2024 15:21:30 +0000 Subject: [PATCH 34/69] Add coincidence to docs requirements. --- doc-source/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index acfcae1..bbd469b 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -1,3 +1,4 @@ +coincidence>=0.6.5 default-values>=0.6.0 domdf-python-tools[testing]>=1.5.0 extras-require>=0.5.0 From b2ac046d261c11de463930209e0735957a30edde Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 11:50:09 +0000 Subject: [PATCH 35/69] Updated files with 'repo_helper'. (#62) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 4 ++-- .github/workflows/docs_test_action.yml | 2 +- .github/workflows/flake8.yml | 4 ++-- .github/workflows/mypy.yml | 4 ++-- .github/workflows/python_ci.yml | 8 ++++---- .github/workflows/python_ci_linux.yml | 20 ++++++++++---------- .github/workflows/python_ci_macos.yml | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index c4192dc..d771dc7 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index 917a145..331606e 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 8221173..0a8c0c3 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -33,7 +33,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 9b28b5f..10c6f30 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files uses: dorny/paths-filter@v2 @@ -38,7 +38,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "3.8" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 0ab31b7..f07afdf 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} @@ -43,7 +43,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -58,7 +58,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index ef3041f..513f447 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} @@ -44,7 +44,7 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -59,7 +59,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" @@ -89,10 +89,10 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: 3.8 @@ -138,11 +138,11 @@ jobs: runs-on: "ubuntu-20.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" if: startsWith(github.ref, 'refs/tags/') - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" if: startsWith(github.ref, 'refs/tags/') with: python-version: 3.8 @@ -183,10 +183,10 @@ jobs: if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Setup Python 🐍 - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: 3.8 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 41c7059..5cbc44e 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.2,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,14 +35,14 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ - uses: "actions/checkout@v3" + uses: "actions/checkout@v4" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true @@ -57,7 +57,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v4" + uses: "actions/setup-python@v5" with: python-version: "${{ matrix.config.python-version }}" From 5d17890bc7d00a94d27d697bf13cb62b22402e46 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:56:52 +0000 Subject: [PATCH 36/69] Bump pre-commit hooks. (#63) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 64d9ea8..01e0065 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.0 + rev: v0.9.1 hooks: - id: reformat-pyproject @@ -43,13 +43,13 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.0 + rev: v0.3.1 hooks: - id: ensure-dunder-all files: ^sphinx_autofixture/.*\.py$ - repo: https://github.com/domdfcoding/flake2lint - rev: v0.4.2 + rev: v0.4.3 hooks: - id: flake2lint @@ -76,18 +76,18 @@ repos: - id: forbid-crlf - repo: https://github.com/python-formate/snippet-fmt - rev: v0.1.4 + rev: v0.1.5 hooks: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.5.0 + rev: v0.7.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - repo: https://github.com/domdfcoding/dep_checker - rev: v0.7.1 + rev: v0.8.0 hooks: - id: dep_checker args: From db7523d25b92f89836be3f7be71a15e03fc63ad0 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:44:40 +0000 Subject: [PATCH 37/69] Updated files with 'repo_helper'. (#64) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 6 +++--- .github/workflows/python_ci_linux.yml | 10 +++++----- .github/workflows/python_ci_macos.yml | 6 +++--- formate.toml | 2 +- tox.ini | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f07afdf..f5e2633 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} @@ -75,7 +75,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 513f447..043ad5c 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} @@ -77,7 +77,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" @@ -102,7 +102,7 @@ jobs: python -m pip install --upgrade "coveralls>=3.0.0" coverage_pyver_pragma - name: "Download Coverage 🪂" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: coverage @@ -120,7 +120,7 @@ jobs: - name: "Upload Combined Coverage Artefact 🚀" if: ${{ steps.show.outcome != 'failure' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "combined-coverage" path: .coverage diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 5cbc44e..9331805 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.3,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} @@ -74,7 +74,7 @@ jobs: run: python -m tox -e "${{ matrix.config.testenvs }}" -s false - name: "Upload Coverage 🚀" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.setup-python.outcome == 'success' }} with: name: "coverage-${{ matrix.config.python-version }}" diff --git a/formate.toml b/formate.toml index 762e00d..a4a34ce 100644 --- a/formate.toml +++ b/formate.toml @@ -47,5 +47,5 @@ known_third_party = [ "sphinx_jinja2_compat", "sphinx_toolbox", ] -known_first_party = "sphinx_autofixture" +known_first_party = [ "sphinx_autofixture",] line_length = 115 diff --git a/tox.ini b/tox.ini index 86c545a..3417502 100644 --- a/tox.ini +++ b/tox.ini @@ -93,8 +93,7 @@ changedir = {toxinidir} deps = build[virtualenv]>=0.3.1 check-wheel-contents>=0.1.0 - twine>=3.2.0; python_version < "3.13" - twine@git+https://github.com/pypa/twine; python_version >= "3.13" + twine>=3.2.0 cryptography<40; implementation_name == "pypy" and python_version <= "3.7" commands = python -m build --sdist --wheel "{toxinidir}" From a85246a0757126d48dcbf687d1b5880b7ae9821a Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:18:36 +0000 Subject: [PATCH 38/69] [repo-helper] Configuration Update (#65) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .dependabot/config.yml | 9 --------- .github/dependabot.yml | 1 + .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 .dependabot/config.yml diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index 4584924..0000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This file is managed by 'repo_helper'. Don't edit it directly. ---- -version: 1 -update_configs: -- package_manager: python - directory: / - update_schedule: weekly - default_reviewers: - - domdfcoding diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e769ad3..454225a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,5 +6,6 @@ updates: directory: / schedule: interval: weekly + open-pull-requests-limit: 0 reviewers: - domdfcoding diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f5e2633..f07fba5 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 043ad5c..16aef6a 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 9331805..33367d9 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.4,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} From 4c40154dc921e77f75bd18b8c03ea56e62dd672a Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 22:33:37 +0100 Subject: [PATCH 39/69] [repo-helper] Configuration Update (#66) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 3417502..ecd49f3 100644 --- a/tox.ini +++ b/tox.ini @@ -115,7 +115,7 @@ deps = flake8-github-actions>=0.1.0 flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 - flake8-pytest-style>=1.3.0 + flake8-pytest-style>=1.3.0,<2 flake8-quotes>=3.3.0 flake8-slots>=0.1.0 flake8-sphinx-links>=0.0.4 @@ -211,8 +211,8 @@ exclude_lines = raise NotImplementedError if 0: if False: - if TYPE_CHECKING: - if typing.TYPE_CHECKING: + if TYPE_CHECKING + if typing.TYPE_CHECKING if __name__ == .__main__.: [check-wheel-contents] From f88da561f3b19165bf9a3fe40addc6b490adcc46 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:14:44 +0000 Subject: [PATCH 40/69] [repo-helper] Configuration Update (#67) * Updated files with 'repo_helper'. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- doc-source/conf.py | 6 ++++++ formate.toml | 16 ++++++++-------- pyproject.toml | 29 +++++++++++++---------------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 01e0065..800b9ed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.1 + rev: v0.11.0 hooks: - id: reformat-pyproject diff --git a/doc-source/conf.py b/doc-source/conf.py index 65d1593..8ce77e9 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -74,5 +74,11 @@ def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout + from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) + app.connect("build-finished", sphinxemoji.copy_asset_files) + app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("twemoji.js") + app.add_css_file("twemoji.css") + app.add_transform(sphinxemoji.EmojiSubstitutions) diff --git a/formate.toml b/formate.toml index a4a34ce..ef2e426 100644 --- a/formate.toml +++ b/formate.toml @@ -6,21 +6,17 @@ noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 -[config] -indent = "\t" -line_length = 115 - [hooks.yapf] priority = 30 -[hooks.isort] -priority = 50 - [hooks.yapf.kwargs] yapf_style = ".style.yapf" +[hooks.isort] +priority = 50 + [hooks.isort.kwargs] -indent = "\t\t" +indent = " " multi_line_output = 8 import_heading_stdlib = "stdlib" import_heading_thirdparty = "3rd party" @@ -49,3 +45,7 @@ known_third_party = [ ] known_first_party = [ "sphinx_autofixture",] line_length = 115 + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index c1beb0a..8c05557 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,14 +10,13 @@ readme = "README.rst" keywords = [ "documentation", "pytest", "sphinx", "sphinx-extension",] dynamic = [ "requires-python", "classifiers", "dependencies",] +[project.license] +file = "LICENSE" + [[project.authors]] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" - -[project.license] -file = "LICENSE" - [project.urls] Homepage = "https://github.com/sphinx-toolbox/sphinx-autofixture" "Issue Tracker" = "https://github.com/sphinx-toolbox/sphinx-autofixture/issues" @@ -66,7 +65,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -77,7 +75,6 @@ extensions = [ "sphinx_autofixture", "html_section", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -137,6 +134,16 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] +[tool.snippet-fmt.languages.python] +reformat = true + +[tool.snippet-fmt.languages.TOML] +reformat = true + +[tool.snippet-fmt.languages.ini] + +[tool.snippet-fmt.languages.json] + [tool.dep_checker] allowed_unused = [ "sphinx_jinja2_compat",] @@ -150,13 +157,3 @@ include = false [tool.dependency-dash."doc-source/requirements.txt"] order = 30 include = false - -[tool.snippet-fmt.languages.python] -reformat = true - -[tool.snippet-fmt.languages.TOML] -reformat = true - -[tool.snippet-fmt.languages.ini] - -[tool.snippet-fmt.languages.json] From cb1698d86dc0c8e5a324ec67af0569fbf85e437c Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:26:15 +0000 Subject: [PATCH 41/69] Bump Python 3.13 alpha (#68) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f07fba5..78b1f20 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 16aef6a..7d47798 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 33367d9..d2a3eb1 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} From 1719d1ac56b9379bbc141fe00c78cc7722c46975 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 16:58:22 +0100 Subject: [PATCH 42/69] Updated files with 'repo_helper'. (#69) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 2 +- tox.ini | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index d2a3eb1..b314058 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-latest / Python ${{ matrix.config.python-version }}" - runs-on: "macos-latest" + name: "macos-13 / Python ${{ matrix.config.python-version }}" + runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 800b9ed..8533ba1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.1 + rev: v0.4.1 hooks: - id: ensure-dunder-all files: ^sphinx_autofixture/.*\.py$ diff --git a/tox.ini b/tox.ini index ecd49f3..cc31b1f 100644 --- a/tox.ini +++ b/tox.ini @@ -88,6 +88,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_PREFER_BINARY=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = From 58b136be6732b060504621fb1519e24978227a07 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 23:26:16 +0100 Subject: [PATCH 43/69] [repo-helper] Configuration Update (#70) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- tox.ini | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 78b1f20..f4e2a60 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 7d47798..918fc8b 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index b314058..62b57ba 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-alpha.6", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/tox.ini b/tox.ini index cc31b1f..cdb6ebe 100644 --- a/tox.ini +++ b/tox.ini @@ -69,6 +69,7 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] setenv = @@ -254,6 +255,7 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] setenv = From c92dac33b519c75c38eff4c7d37f14aa07c09e13 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 19 Jun 2024 16:38:45 +0100 Subject: [PATCH 44/69] Exclude new attributes added in Python 3.13 from test output --- tests/doc-test/test-root/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/doc-test/test-root/index.rst b/tests/doc-test/test-root/index.rst index c24ff15..9a97d52 100644 --- a/tests/doc-test/test-root/index.rst +++ b/tests/doc-test/test-root/index.rst @@ -10,10 +10,10 @@ sphinx-autofixture Demo :members: tmp_pathplus :noindex: :no-docstring: - :exclude-members: __dict__ + :exclude-members: __dict__,__firstlineno__,__replace__,__static_attributes__ .. automodule:: tests.myproject :members: :undoc-members: :special-members: - :exclude-members: __dict__ + :exclude-members: __dict__,__firstlineno__,__replace__,__static_attributes__ From 250c9274e8d27ea4f9a5944b2f27c58134b7267d Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:25:05 +0100 Subject: [PATCH 45/69] Updated files with 'repo_helper'. (#71) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/conda_ci.yml | 7 ++++--- .github/workflows/python_ci.yml | 6 +++--- .github/workflows/python_ci_linux.yml | 11 ++++++----- .github/workflows/python_ci_macos.yml | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index d771dc7..652efac 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -24,14 +24,15 @@ jobs: - name: Setup Python 🐍 uses: "actions/setup-python@v5" with: - python-version: "3.8" + python-version: "3.11" - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v2.1.1 with: activate-environment: env conda-build-version: 3.28.4 - python-version: "3.8" + miniconda-version: py311_24.1.2-0 + python-version: "3.11" miniforge-variant: Mambaforge - name: Install dependencies 🔧 diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f4e2a60..50d1e6b 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,11 +35,11 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 918fc8b..23acb2a 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} @@ -188,14 +188,15 @@ jobs: - name: Setup Python 🐍 uses: "actions/setup-python@v5" with: - python-version: 3.8 + python-version: 3.11 - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v2.1.1 with: activate-environment: env conda-build-version: 3.28.4 - python-version: "3.8" + miniconda-version: py311_24.1.2-0 + python-version: "3.11" miniforge-variant: Mambaforge - name: Install dependencies 🔧 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 62b57ba..b1e007d 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} From f37ca0332a3bd0c0817bac80570f3b8dba0d8ac7 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:33:21 +0100 Subject: [PATCH 46/69] Updated files with 'repo_helper'. (#72) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/conf.py | 17 ++++++++++++++++- doc-source/requirements.txt | 6 ++++++ 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 50d1e6b..4cec2a0 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 23acb2a..ba4b886 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index b1e007d..6a91f22 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.2,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.2", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/doc-source/conf.py b/doc-source/conf.py index 8ce77e9..bc7c1a8 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -71,13 +71,28 @@ } +# Fix for pathlib issue with sphinxemoji on Python 3.9 and Sphinx 4.x +def copy_asset_files(app, exc): + # 3rd party + from domdf_python_tools.compat import importlib_resources + from sphinx.util.fileutil import copy_asset + + if exc: + return + + asset_files = ["twemoji.js", "twemoji.css"] + for path in asset_files: + path_str = os.fspath(importlib_resources.files("sphinxemoji") / path) + copy_asset(path_str, os.path.join(app.outdir, "_static")) + + def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) - app.connect("build-finished", sphinxemoji.copy_asset_files) + app.connect("build-finished", copy_asset_files) app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") app.add_js_file("twemoji.js") app.add_css_file("twemoji.css") diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index bbd469b..a1014a1 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -13,6 +13,12 @@ sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 +sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-httpdomain>=1.7.0 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 sphinxemoji>=0.1.6 toctree-plus>=0.6.1 From e9155b787e30a333e1847e23f3ce8352dc4352b2 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:21:56 +0100 Subject: [PATCH 47/69] [repo-helper] Configuration Update (#73) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- doc-source/requirements.txt | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 4cec2a0..f6ae094 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index ba4b886..27adc5f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 6a91f22..27f9c2a 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.3,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.3", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/doc-source/requirements.txt b/doc-source/requirements.txt index a1014a1..4971871 100644 --- a/doc-source/requirements.txt +++ b/doc-source/requirements.txt @@ -9,9 +9,7 @@ sphinx-copybutton>=0.2.12 sphinx-debuginfo>=0.2.2 sphinx-licenseinfo>=0.3.1 sphinx-notfound-page>=0.7.1 -sphinx-prompt>=1.1.0 sphinx-pyproject>=0.1.0 -sphinx-tabs>=1.1.13 sphinx-toolbox>=3.5.0 sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 From 5c5df484163ab3ff97996645261aea940f1db855 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:08:01 +0100 Subject: [PATCH 48/69] Updated files with 'repo_helper'. (#74) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index f6ae094..846847d 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 27adc5f..39ad543 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 27f9c2a..00caa6d 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.4,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-beta.4", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} From 12ec80b6f35bbc4905ca2abcfda9849179a015e6 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:58:57 +0100 Subject: [PATCH 49/69] Updated files with 'repo_helper'. (#75) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 4 ++-- .github/workflows/python_ci_linux.yml | 4 ++-- .github/workflows/python_ci_macos.yml | 4 ++-- .pre-commit-config.yaml | 6 +++--- tox.ini | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 846847d..1dac6be 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 39ad543..c494ee7 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 00caa6d..286899a 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,7 +22,7 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-rc.1,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13.0-rc.1", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8533ba1..f32ee0c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.0 + rev: v0.11.1 hooks: - id: reformat-pyproject @@ -42,7 +42,7 @@ repos: exclude: ^(doc-source/conf|__pkginfo__|setup|tests/.*)\.py$ - id: bind-requirements - - repo: https://github.com/domdfcoding/flake8-dunder-all + - repo: https://github.com/python-formate/flake8-dunder-all rev: v0.4.1 hooks: - id: ensure-dunder-all @@ -86,7 +86,7 @@ repos: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ - - repo: https://github.com/domdfcoding/dep_checker + - repo: https://github.com/python-coincidence/dep_checker rev: v0.8.0 hooks: - id: dep_checker diff --git a/tox.ini b/tox.ini index cdb6ebe..a762fd1 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ # * envlists # * testenv:.package # * testenv:py313-dev +# * testenv:py313 # * testenv:py312-dev # * testenv:py312 # * testenv:docs @@ -66,12 +67,14 @@ setenv = PIP_DISABLE_PIP_VERSION_CHECK=1 [testenv:py313-dev] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From cb18ce927fa7a25c3f16a9d5f3a4f3b8684bbd23 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 17 Oct 2024 14:30:50 +0100 Subject: [PATCH 50/69] Fix tests with newer alabaster versions. --- tests/test_directive.py | 16 ++++++++++++++-- .../test_output_36_index_html_.html | 4 ++-- .../test_output_36_pypy_index_html_.html | 4 ++-- tox.ini | 2 ++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/test_directive.py b/tests/test_directive.py index 0941ff7..ee2c102 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -1,7 +1,7 @@ # stdlib import os from pathlib import Path -from typing import Any, Iterator +from typing import Any, Iterator, Tuple, no_type_check # 3rd party import pytest @@ -101,4 +101,16 @@ def test_output( div["src"] = div["src"].split("?v=")[0] print(div["src"]) - html_regression.check(page, jinja2=True) + html_regression.check(page, jinja2=True, jinja2_namespace={"alabaster_version": _get_alabaster_version()}) + + +@no_type_check +def _get_alabaster_version() -> Tuple[int, int, int]: + try: + # 3rd party + import alabaster._version as alabaster # type: ignore[import] + except ImportError: + # 3rd party + import alabaster # type: ignore[import] + + return tuple(map(int, alabaster.__version__.split('.'))) diff --git a/tests/test_directive_/test_output_36_index_html_.html b/tests/test_directive_/test_output_36_index_html_.html index 5bd13e2..165af58 100644 --- a/tests/test_directive_/test_output_36_index_html_.html +++ b/tests/test_directive_/test_output_36_index_html_.html @@ -28,8 +28,8 @@ {% endif %} - + {% if alabaster_version < (0, 7, 15) %} + {% endif %}
diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html index 21c0519..45a4ba9 100644 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ b/tests/test_directive_/test_output_36_pypy_index_html_.html @@ -28,8 +28,8 @@ {% endif %} - + {% if alabaster_version < (0, 7, 15) %} + {% endif %}
diff --git a/tox.ini b/tox.ini index a762fd1..eb464ec 100644 --- a/tox.ini +++ b/tox.ini @@ -247,6 +247,8 @@ filterwarnings = always:datetime.datetime.utcfromtimestamp is deprecated and scheduled for removal in a future version.:DeprecationWarning:sphinx.builders.gettext always:The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead:DeprecationWarning:sphinxcontrib.applehelp always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.http_date.epoch_to_rfc1123' instead.:DeprecationWarning:sphinxcontrib.applehelp + always:The alias 'sphinx.util.typing.stringify' is deprecated, use 'sphinx.util.typing.stringify_annotation' instead. Check CHANGES for Sphinx API modifications.:DeprecationWarning + markers = sphinx [testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] From 9c5587efbf8790976f36f4b035d106777db4bbb4 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 17 Oct 2024 15:30:40 +0100 Subject: [PATCH 51/69] Fix tests with newer alabaster versions. (part 2) --- tests/test_directive_/test_output_310_index_html_.html | 4 ++-- tests/test_directive_/test_output_37_index_html_.html | 4 ++-- tests/test_directive_/test_output_37_pypy_index_html_.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 3d03bff..3189f29 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -30,8 +30,8 @@ {% if sphinx_version >= (5, 2) %} {% endif %} - + {% endif %}{% if alabaster_version < (0, 7, 15) %} + {% endif %}
diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 55f6a1d..6f41498 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -30,8 +30,8 @@ {% if sphinx_version >= (5, 2) %} {% endif %} - + {% endif %}{% if alabaster_version < (0, 7, 15) %} + {% endif %}
diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index 7b9fbd7..66a4e10 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -30,8 +30,8 @@ {% if sphinx_version >= (5, 2) %} {% endif %} - + {% endif %}{% if alabaster_version < (0, 7, 15) %} + {% endif %}
From 8702bf92be7064350b8f88344367d30bb8d2f0f8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 13 Feb 2025 11:36:23 +0000 Subject: [PATCH 52/69] Update for latest beautifulsoup --- tests/test_directive.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/test_directive.py b/tests/test_directive.py index ee2c102..800f80f 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -1,11 +1,11 @@ # stdlib import os from pathlib import Path -from typing import Any, Iterator, Tuple, no_type_check +from typing import Any, Iterator, Tuple, Union, cast, no_type_check # 3rd party import pytest -from bs4 import BeautifulSoup, element # type: ignore[import] +from bs4 import BeautifulSoup, NavigableString, PageElement, Tag, element from coincidence import max_version, min_version, not_pypy, only_pypy, only_version from domdf_python_tools.paths import PathPlus from sphinx.application import Sphinx @@ -84,21 +84,23 @@ def test_output( version: str, ) -> None: - code: element.Tag + code: Union[PageElement, Tag, NavigableString] for code in page.find_all("code", attrs={"class": "sig-prename descclassname"}): - + assert isinstance(code, Tag) first_child = code.contents[0] if isinstance(first_child, element.Tag): code.contents = [first_child.contents[0]] for code in page.find_all("code", attrs={"class": "sig-name descname"}): + assert isinstance(code, Tag) first_child = code.contents[0] if isinstance(first_child, element.Tag): code.contents = [first_child.contents[0]] - for div in page.findAll("script"): + for div in page.find_all("script"): + assert isinstance(div, Tag) if div.get("src"): - div["src"] = div["src"].split("?v=")[0] + div["src"] = cast(str, div["src"]).split("?v=")[0] print(div["src"]) html_regression.check(page, jinja2=True, jinja2_namespace={"alabaster_version": _get_alabaster_version()}) From cde42959e9ed6e5acdd87f2171e68f71d6e40117 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 13 Feb 2025 11:39:01 +0000 Subject: [PATCH 53/69] Lint --- tests/myproject.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/myproject.py b/tests/myproject.py index 9d917a4..d1ae879 100644 --- a/tests/myproject.py +++ b/tests/myproject.py @@ -18,9 +18,9 @@ class A: __all__.append('A') -def foo(): +def foo() -> Callable: - def bar(): + def bar(): # noqa: MAN002 """ A locally defined function. """ @@ -32,7 +32,7 @@ def bar(): # fizbuzz = foo() -def create_fizbuzz(): +def create_fizbuzz(): # noqa: MAN002 # Based on the dataclass module from CPython locals = {"BUILTINS": builtins} # noqa: A001 # pylint: disable=redefined-builtin local_vars = ", ".join(locals.keys()) From 7328768b5c8a86a2f3bf11b90ffd94164bed68be Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:32:53 +0000 Subject: [PATCH 54/69] Updated files with 'repo_helper'. (#76) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- tox.ini | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f32ee0c..d1e334a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -81,7 +81,7 @@ repos: - id: snippet-fmt - repo: https://github.com/python-formate/formate - rev: v0.7.0 + rev: v0.8.0 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/README.rst b/README.rst index ff8bcc6..8d9a01c 100644 --- a/README.rst +++ b/README.rst @@ -114,7 +114,7 @@ and `the documentation for coincidence`_ for an example with the ReadTheDocs the :target: https://github.com/sphinx-toolbox/sphinx-autofixture/commit/master :alt: GitHub last commit -.. |maintained| image:: https://img.shields.io/maintenance/yes/2024 +.. |maintained| image:: https://img.shields.io/maintenance/yes/2025 :alt: Maintenance .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/sphinx-autofixture diff --git a/doc-source/index.rst b/doc-source/index.rst index 3a2dca0..db351b2 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -114,7 +114,7 @@ sphinx-autofixture :last-commit: :alt: GitHub last commit - .. |maintained| maintained-shield:: 2024 + .. |maintained| maintained-shield:: 2025 :alt: Maintenance .. |pypi-downloads| pypi-shield:: diff --git a/tox.ini b/tox.ini index eb464ec..c7921ca 100644 --- a/tox.ini +++ b/tox.ini @@ -248,15 +248,16 @@ filterwarnings = always:The alias 'sphinx.util.SkipProgressMessage' is deprecated, use 'sphinx.util.display.SkipProgressMessage' instead:DeprecationWarning:sphinxcontrib.applehelp always:The alias 'sphinx.util.progress_message' is deprecated, use 'sphinx.http_date.epoch_to_rfc1123' instead.:DeprecationWarning:sphinxcontrib.applehelp always:The alias 'sphinx.util.typing.stringify' is deprecated, use 'sphinx.util.typing.stringify_annotation' instead. Check CHANGES for Sphinx API modifications.:DeprecationWarning - markers = sphinx [testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 [testenv:py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] +download = True setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From 722ba85c0a28282387b804a4b3da9811214254e8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 7 Apr 2025 14:58:27 +0100 Subject: [PATCH 55/69] Drop support for Python 3.6 --- .github/workflows/python_ci.yml | 6 ++--- .github/workflows/python_ci_linux.yml | 6 ++--- .github/workflows/python_ci_macos.yml | 5 ++-- pyproject.toml | 2 +- repo_helper.yml | 34 +-------------------------- tox.ini | 19 ++++++++------- 6 files changed, 19 insertions(+), 53 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 1dac6be..02c0976 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,21 +22,19 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5}", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index c494ee7..7091b90 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,21 +23,19 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} - - {python-version: "pypy-3.6", testenvs: "pypy36-sphinx{3.2,3.3,3.4,3.5},build", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 286899a..946cdb1 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -22,20 +22,19 @@ jobs: runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False matrix: config: - - {python-version: "3.6", testenvs: "py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5},build", experimental: False} - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} diff --git a/pyproject.toml b/pyproject.toml index 8c05557..0b2ceab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ base-classifiers = [ "Topic :: Software Development :: Documentation", "Typing :: Typed", ] -python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",] +python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",] python-implementations = [ "CPython", "PyPy",] platforms = [ "Windows", "macOS", "Linux",] license-key = "MIT" diff --git a/repo_helper.yml b/repo_helper.yml index 6c2a1c3..71318c8 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -18,19 +18,6 @@ min_coverage: 95 # Versions to run tests for python_versions: - '3.6': - matrix_exclude: - sphinx: - - 5.0 - - 5.1 - - 5.2 - - 5.3 - - 6.0 - - 6.1 - - 6.2 - - 7.0 - - 7.1 - - 7.2 '3.7': matrix_exclude: sphinx: @@ -48,26 +35,7 @@ python_versions: '3.10': "3.11": "3.12": - 3.13-dev: - pypy36: - matrix_exclude: - sphinx: - - 4.0 - - 4.1 - - 4.2 - - 4.3 - - 4.4 - - 4.5 - - 5.0 - - 5.1 - - 5.2 - - 5.3 - - 6.0 - - 6.1 - - 6.2 - - 7.0 - - 7.1 - - 7.2 + 3.13: pypy37: matrix_exclude: sphinx: diff --git a/tox.ini b/tox.ini index c7921ca..7f28fd6 100644 --- a/tox.ini +++ b/tox.ini @@ -22,15 +22,13 @@ [tox] envlist = - py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy36-sphinx{3.2,3.3,3.4,3.5} + py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -46,15 +44,13 @@ requires = [envlists] test = - py36-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5} py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy36-sphinx{3.2,3.3,3.4,3.5} + py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -66,7 +62,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py313-dev] +[testenv:py313] download = True setenv = PYTHONDEVMODE=1 @@ -199,7 +195,7 @@ inline-quotes = " multiline-quotes = """ docstring-quotes = """ count = True -min_python_version = 3.6.1 +min_python_version = 3.7 unused-arguments-ignore-abstract-functions = True unused-arguments-ignore-overload-functions = True unused-arguments-ignore-magic-methods = True @@ -256,6 +252,13 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 +[testenv:py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] +download = True +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 + [testenv:py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] download = True setenv = From 0e2c21001f109ff40370bbc02b8ee46c9d908cc6 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 10:10:34 +0100 Subject: [PATCH 56/69] Bump Ubuntu to 22.04 (#78) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci_linux.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 10c6f30..bd74787 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: ['ubuntu-20.04', 'windows-2019'] + os: ['ubuntu-22.04', 'windows-2019'] fail-fast: false steps: diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 7091b90..7b4980e 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -19,8 +19,8 @@ permissions: jobs: tests: - name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}" - runs-on: "ubuntu-20.04" + name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}" + runs-on: "ubuntu-22.04" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' @@ -84,7 +84,7 @@ jobs: Coverage: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" @@ -133,7 +133,7 @@ jobs: Deploy: needs: tests - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ uses: "actions/checkout@v4" From bda1c5f2cbd87fc2f7d37380e8df99acd1edbb33 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 15:14:36 +0100 Subject: [PATCH 57/69] Run Flake8 CI on Ubuntu 22.04 (#80) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/flake8.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 0a8c0c3..af1b394 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -16,7 +16,7 @@ permissions: jobs: Run: name: "Flake8" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ From 71f70f387a5aca2b2cd9e97b54687529d9953acd Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 09:36:37 +0100 Subject: [PATCH 58/69] [repo-helper] Configuration Update (#81) * Updated files with 'repo_helper'. * Updated files with 'repo_helper'. --------- Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci_macos.yml | 24 ++++++++++++------------ .readthedocs.yml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 946cdb1..48d8efa 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "macos-13 / Python ${{ matrix.config.python-version }}" - runs-on: "macos-13" + name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}" + runs-on: "macos-${{ matrix.config.os-ver }}" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' @@ -28,16 +28,16 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.7", os-ver: "13", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} + - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} + - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.readthedocs.yml b/.readthedocs.yml index e928b70..83fc025 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -13,7 +13,7 @@ python: - requirements: requirements.txt - requirements: doc-source/requirements.txt build: - os: ubuntu-20.04 + os: ubuntu-22.04 tools: python: '3.9' jobs: From 6f6ac5bd247cbff467d47fb021421e8257fb7b19 Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 21:42:24 +0100 Subject: [PATCH 59/69] Updated files with 'repo_helper'. (#82) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/python_ci.yml | 1 + .github/workflows/python_ci_linux.yml | 3 +++ .github/workflows/python_ci_macos.yml | 1 + .pre-commit-config.yaml | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 02c0976..ef52f48 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -78,3 +78,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 7b4980e..c6883d3 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -80,6 +80,7 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true Coverage: @@ -122,6 +123,7 @@ jobs: with: name: "combined-coverage" path: .coverage + include-hidden-files: true - name: "Upload Combined Coverage to Coveralls" if: ${{ steps.show.outcome != 'failure' }} @@ -207,6 +209,7 @@ jobs: $CONDA/bin/conda config --set always_yes yes --set changeps1 no $CONDA/bin/conda update -n base conda $CONDA/bin/conda info -a + $CONDA/bin/conda install conda-forge::py-lief=0.14.1 $CONDA/bin/conda config --add channels conda-forge $CONDA/bin/conda config --add channels domdfcoding diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 48d8efa..547e8c5 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -78,3 +78,4 @@ jobs: with: name: "coverage-${{ matrix.config.python-version }}" path: .coverage + include-hidden-files: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1e334a..3f31ad0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.11.1 + rev: v0.13.0 hooks: - id: reformat-pyproject From f48b60065fe6b27c09d89592556b7fe8d2212042 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 4 Jun 2025 15:13:38 +0100 Subject: [PATCH 60/69] Remove old Python 3.6 reference output. --- .../test_output_36_index_html_.html | 208 ------------------ .../test_output_36_pypy_index_html_.html | 208 ------------------ 2 files changed, 416 deletions(-) delete mode 100644 tests/test_directive_/test_output_36_index_html_.html delete mode 100644 tests/test_directive_/test_output_36_pypy_index_html_.html diff --git a/tests/test_directive_/test_output_36_index_html_.html b/tests/test_directive_/test_output_36_index_html_.html deleted file mode 100644 index 165af58..0000000 --- a/tests/test_directive_/test_output_36_index_html_.html +++ /dev/null @@ -1,208 +0,0 @@ -{% macro span_pre(text, indent='', min_version=(3, 5)) -%} -{% if sphinx_version >= min_version %} -{{ indent }} {{ text }} -{{ indent }}{% else %}{{ text }}{% endif %} -{%- endmacro -%} -{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} -{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} -{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} -{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - -= (5, 0) %} lang="en"{% endif %}> - - - - {% if docutils_version[1] == 18 %} - {% elif docutils_version[1] == 17 %} - {% elif docutils_version[1] == 19 %} - {% elif docutils_version[1] == 20 %} - {% endif %} - sphinx-autofixture Demo — Python documentation - - - - {% if sphinx_version >= (5, 0) %} - {% endif %} - {% if alabaster_version < (0, 7, 15) %} - {% endif %} - - -
-
-
-
- <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo"> -
- sphinx-autofixture Demo - - ¶ - -
-
- - - {{ span_pre("fixture", " ", (3, 5)) }} - - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("coincidence.fixtures.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("tmp_pathplus", " ") }} - - - ¶ - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
-
- - - - coincidence.fixtures.tmp_pathplus - - - -
-
- - - {{ span_pre("fixture", " ", (3, 5)) }} - - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("coincidence.fixtures.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("tmp_pathplus", " ") }} - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
- - -
- - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("tests.myproject.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("baz", " ") }} - - - ( - - - ) - - - ¶ - -
-
-
- A locally defined function. -
-
-
-
- - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("tests.myproject.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("fizbuzz", " ") }} - - - ( - - - ) - - - ¶ - -
-
-
- A locally defined function. -
-
-
- = (0, 17) %}section{% else %}div{% endif %}> - - - -
-
- - - diff --git a/tests/test_directive_/test_output_36_pypy_index_html_.html b/tests/test_directive_/test_output_36_pypy_index_html_.html deleted file mode 100644 index 45a4ba9..0000000 --- a/tests/test_directive_/test_output_36_pypy_index_html_.html +++ /dev/null @@ -1,208 +0,0 @@ -{% macro span_pre(text, indent='', min_version=(3, 5)) -%} -{% if sphinx_version >= (3, 5) %} -{{ indent }} {{ text }} -{{ indent }}{% else %}{{ text }}{% endif %} -{%- endmacro -%} -{% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} -{% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} -{% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} -{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - -= (5, 0) %} lang="en"{% endif %}> - - - - {% if docutils_version[1] == 18 %} - {% elif docutils_version[1] == 17 %} - {% elif docutils_version[1] == 19 %} - {% elif docutils_version[1] == 20 %} - {% endif %} - sphinx-autofixture Demo — Python documentation - - - - {% if sphinx_version >= (5, 0) %} - {% endif %} - {% if alabaster_version < (0, 7, 15) %} - {% endif %} - - -
-
-
-
- <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo"> -
- sphinx-autofixture Demo - - ¶ - -
-
- - - {{ span_pre("fixture", " ") }} - - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("coincidence.fixtures.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("tmp_pathplus", " ") }} - - - ¶ - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
-
- - - - coincidence.fixtures.tmp_pathplus - - - -
-
- - - {{ span_pre("fixture", " ") }} - - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("coincidence.fixtures.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("tmp_pathplus", " ") }} - -
-
-
- - Scope: - - function -
-
- Pytest fixture which returns a temporary directory in the form of a - - - PathPlus - - - object. -
-
- The directory is unique to each test function invocation, -created as a sub directory of the base temporary directory. -
-
- Use it as follows: -
-
-
-
pytest_plugins = ("coincidence", ) - -def test_something(tmp_pathplus: PathPlus): - assert True -
-
-
-
-
- - -
- - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("tests.myproject.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("baz", " ") }} - - - ( - - - ) - - - ¶ - -
-
-
- A locally defined function. -
-
-
-
- - <{{ sig_prename_tag }} class="sig-prename descclassname"> - {{ span_pre("tests.myproject.", " ") }} - - <{{ sig_prename_tag }} class="sig-name descname"> - {{ span_pre("fizbuzz", " ") }} - - - ( - - - ) - - - ¶ - -: -
- A locally defined function. -
-

- = (0, 17) %}section{% else %}div{% endif %}> - - - -

- - - From abf3f09e4f5c227b8e8ae80e7dd583ffe53ac535 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 4 Jun 2025 15:55:34 +0100 Subject: [PATCH 61/69] Test against multiple pytest versions and newer Sphinx versions --- .github/workflows/python_ci.yml | 20 +- .github/workflows/python_ci_linux.yml | 20 +- .github/workflows/python_ci_macos.yml | 20 +- formate.toml | 1 + repo_helper.yml | 118 +++++++++- sphinx_autofixture/__init__.py | 10 +- tests/doc-test/test-root/conf.py | 1 + tests/requirements.txt | 3 +- tests/test_directive.py | 9 +- .../test_output_310_index_html_.html | 51 ++-- .../test_output_37_index_html_.html | 49 ++-- .../test_output_37_pypy_index_html_.html | 49 ++-- tests/test_sphinx_version.py | 22 ++ tox.ini | 217 +++++++++++++----- 14 files changed, 427 insertions(+), 163 deletions(-) create mode 100644 tests/test_sphinx_version.py diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index ef52f48..546a7f0 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -28,16 +28,16 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},py37-pytest7.4,build", experimental: False} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},py38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},py39-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index c6883d3..c6cfc9f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -29,16 +29,16 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.7", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},py37-pytest7.4,build", experimental: False} + - {python-version: "3.8", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},py38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "3.9", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},py39-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} + - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 547e8c5..760d5e6 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -28,16 +28,16 @@ jobs: fail-fast: False matrix: config: - - {python-version: "3.7", os-ver: "13", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False} - - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False} - - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: True} + - {python-version: "3.7", os-ver: "13", testenvs: "py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},py37-pytest7.4,build", experimental: False} + - {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},py38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},py39-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} + - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} + - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} steps: - name: Checkout 🛎️ diff --git a/formate.toml b/formate.toml index ef2e426..25f5c52 100644 --- a/formate.toml +++ b/formate.toml @@ -31,6 +31,7 @@ known_third_party = [ "coincidence", "coverage", "coverage_pyver_pragma", + "defusedxml", "domdf_python_tools", "github", "importlib_metadata", diff --git a/repo_helper.yml b/repo_helper.yml index 71318c8..d46558b 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -20,6 +20,9 @@ min_coverage: 95 python_versions: '3.7': matrix_exclude: + pytest: + - 8.3 + - latest sphinx: - 6.0 - 6.1 @@ -27,29 +30,123 @@ python_versions: - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 + - 8.0 + - 8.1 + - 8.2 + - latest '3.8': matrix_exclude: + pytest: + - latest sphinx: - 7.2 - '3.9': - '3.10': + - 7.3 + - 7.4 + - 8.0 + - 8.1 + - 8.2 + - latest + 3.9: + matrix_exclude: + sphinx: + - 8.0 + - 8.1 + - 8.2 + "3.10": + matrix_exclude: + sphinx: + - 8.2 "3.11": "3.12": - 3.13: + matrix_exclude: + sphinx: + - 3.2 + - 3.3 + - 3.4 + - 3.5 + - 4.0 + - 4.1 + - 4.2 + - 4.3 + "3.13": + matrix_exclude: + sphinx: + - 3.2 + - 3.3 + - 3.4 + - 3.5 + - 4.0 + - 4.1 + - 4.2 + - 4.3 + - 4.4 + - 4.5 + - 5.0 + - 5.1 + - 5.2 + - 5.3 + - 6.0 + - 6.1 pypy37: matrix_exclude: + pytest: + - 8.3 + - latest sphinx: + - 3.2 + - 3.3 + - 3.4 + - 3.5 + - 4.0 + - 4.1 + - 4.2 - 6.0 - 6.1 - 6.2 - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 + - 8.0 + - 8.1 + - 8.2 + - latest pypy38: matrix_exclude: + pytest: + - latest sphinx: + - 3.2 + - 3.3 + - 3.4 + - 3.5 + - 4.0 + - 4.1 + - 4.2 - 7.2 + - 7.3 + - 7.4 + - 8.0 + - 8.1 + - 8.2 + - latest pypy39: + matrix_exclude: + sphinx: + - 3.2 + - 3.3 + - 3.4 + - 3.5 + - 4.0 + - 4.1 + - 4.2 + - 8.0 + - 8.1 + - 8.2 + - latest conda_channels: - conda-forge @@ -79,7 +176,16 @@ third_party_version_matrix: - 6.2 - 7.0 - 7.1 - # - 7.2 + - 7.2 + - 7.3 + - 7.4 + - 8.0 + - 8.1 + - 8.2 + pytest: + - 7.4 + - 8.3 + - latest keywords: - sphinx @@ -98,6 +204,4 @@ classifiers: exclude_files: - contributing - -tox_unmanaged: - - testenv + - tox diff --git a/sphinx_autofixture/__init__.py b/sphinx_autofixture/__init__.py index d0350e7..368ff4a 100644 --- a/sphinx_autofixture/__init__.py +++ b/sphinx_autofixture/__init__.py @@ -50,6 +50,14 @@ __all__ = ["FixtureDecoratorFinder", "FixtureDocumenter", "is_fixture", "setup"] +try: # pragma: no cover + # 3rd party + from _pytest.fixtures import FixtureFunctionDefinition +except ImportError: # pragma: no cover + + class FixtureFunctionDefinition: + pass + class FixtureDecoratorFinder(ast.NodeVisitor): """ @@ -160,7 +168,7 @@ def can_document_member( :param parent: The parent of the member. """ - if isinstance(member, FunctionType): + if isinstance(member, (FunctionType, FixtureFunctionDefinition)): return is_fixture(member)[0] else: # pragma: no cover return False diff --git a/tests/doc-test/test-root/conf.py b/tests/doc-test/test-root/conf.py index 36055e4..b2ccf4c 100644 --- a/tests/doc-test/test-root/conf.py +++ b/tests/doc-test/test-root/conf.py @@ -5,3 +5,4 @@ ] package_root = "dummy_package" +project = "Python" diff --git a/tests/requirements.txt b/tests/requirements.txt index d1d77c7..830698f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,9 +1,10 @@ coincidence>=0.2.0 coverage>=5.1 coverage-pyver-pragma>=0.2.1 +defusedxml>=0.7.1 importlib-metadata>=3.6.0 pytest>=6.0.0 pytest-cov>=2.8.1 pytest-randomly>=3.7.0 pytest-timeout>=1.4.2 -sphinx-toolbox[testing]>=2.13.0b1 +sphinx-toolbox[testing]>=4.0.0 diff --git a/tests/test_directive.py b/tests/test_directive.py index 800f80f..79b01c8 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -1,17 +1,24 @@ # stdlib import os +import pathlib from pathlib import Path from typing import Any, Iterator, Tuple, Union, cast, no_type_check # 3rd party import pytest +import sphinx from bs4 import BeautifulSoup, NavigableString, PageElement, Tag, element from coincidence import max_version, min_version, not_pypy, only_pypy, only_version from domdf_python_tools.paths import PathPlus from sphinx.application import Sphinx -from sphinx.testing.path import path from sphinx_toolbox.testing import HTMLRegressionFixture +if sphinx.version_info >= (7, 2): + path = pathlib.Path +else: + # 3rd party + from sphinx.testing.path import path # type: ignore[misc] + pytest_plugins = "sphinx.testing.fixtures" diff --git a/tests/test_directive_/test_output_310_index_html_.html b/tests/test_directive_/test_output_310_index_html_.html index 3189f29..7b39c2b 100644 --- a/tests/test_directive_/test_output_310_index_html_.html +++ b/tests/test_directive_/test_output_310_index_html_.html @@ -3,23 +3,30 @@ {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} {%- endmacro -%} +{% macro span_target (module, indent='', min_version=(7, 2)) -%} +{% if sphinx_version >= min_version %}

{% else %} +{{ indent }} +{{ indent }}

{% endif %} +{%- endmacro -%} +{% set permalink = ("Link" if sphinx_version >= (7, 2) else 'Permalink') -%} {% set heading = ("heading" if sphinx_version >= (5, 0) else 'headline') -%} {% set sig_prename_tag=("span" if sphinx_version >= (4, 0) else 'code') -%} {% set sig_object_class=(' class="sig sig-object py"' if sphinx_version >= (4, 0) else '') -%} {% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} -= (5, 0) %} lang="en"{% endif %}> += (7, 2) %} data-content_root="./"{% endif %}{% if sphinx_version >= (5, 0) %} lang="en"{% endif %}> {% if docutils_version[1] == 18 %} {% elif docutils_version[1] == 17 %} {% elif docutils_version[1] == 19 %} - {% elif docutils_version[1] == 20 %} + {% elif docutils_version[1] >= 20 %} {% endif %} sphinx-autofixture Demo — Python documentation - - {% if sphinx_version < (6, 0) %} @@ -41,7 +48,7 @@ <{% if docutils_version >= (0, 17) %}section{% else %}div class="section"{% endif %} id="sphinx-autofixture-demo">

sphinx-autofixture Demo - + ¶

@@ -56,7 +63,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

- - -

+ {{ span_target("tests.myproject", " ")}} {{ span_pre("class", " ", (3, 5)) }} @@ -162,7 +167,7 @@
<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("A", " ") }} - + ¶ @@ -184,7 +189,7 @@

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False{{ DataclassParams_end_args }}){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -252,7 +257,7 @@

{% else %} = None{% endif %} - + ¶ @@ -285,7 +290,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -309,7 +314,7 @@

{% else %} = (){% endif %} - + ¶ @@ -330,7 +335,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -348,7 +353,7 @@

) - + ¶ @@ -363,7 +368,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("weakref", " ") }} - + ¶ @@ -389,7 +394,7 @@

) - + ¶ @@ -413,7 +418,7 @@

) - + ¶ @@ -423,7 +428,9 @@

- = (0, 17) %}section{% else %}div{% endif %}> + = (0, 17) %}section{% else %}div{% endif %}>{% if sphinx_version >= (8, 1) %} +

{% endif %} diff --git a/tests/test_directive_/test_output_37_index_html_.html b/tests/test_directive_/test_output_37_index_html_.html index 6f41498..bdfc0b2 100644 --- a/tests/test_directive_/test_output_37_index_html_.html +++ b/tests/test_directive_/test_output_37_index_html_.html @@ -3,23 +3,30 @@ {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} {%- endmacro -%} +{% macro span_target (module, indent='', min_version=(7, 2)) -%} +{% if sphinx_version >= min_version %}

{% else %} +{{ indent }} +{{ indent }}

sphinx-autofixture Demo - + ¶

@@ -56,7 +63,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

- - -

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -252,7 +257,7 @@

{% else %} = None{% endif %} - + ¶ @@ -285,7 +290,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -309,7 +314,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -327,7 +332,7 @@

) - + ¶ @@ -342,7 +347,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("weakref", " ") }} - + ¶ @@ -368,7 +373,7 @@

) - + ¶ @@ -392,7 +397,7 @@

) - + ¶ @@ -402,7 +407,9 @@

- = (0, 17) %}section{% else %}div{% endif %}> + = (0, 17) %}section{% else %}div{% endif %}>{% if sphinx_version >= (8, 1) %} +

{% endif %} diff --git a/tests/test_directive_/test_output_37_pypy_index_html_.html b/tests/test_directive_/test_output_37_pypy_index_html_.html index 66a4e10..ef3551e 100644 --- a/tests/test_directive_/test_output_37_pypy_index_html_.html +++ b/tests/test_directive_/test_output_37_pypy_index_html_.html @@ -3,23 +3,30 @@ {{ indent }} {{ text }} {{ indent }}{% else %}{{ text }}{% endif %} {%- endmacro -%} +{% macro span_target (module, indent='', min_version=(7, 2)) -%} +{% if sphinx_version >= min_version %}

{% else %} +{{ indent }} +{{ indent }}

sphinx-autofixture Demo - + ¶

@@ -56,7 +63,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

- - -

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -249,7 +254,7 @@

{% else %} = None{% endif %} - + ¶ @@ -282,7 +287,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -303,7 +308,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -321,7 +326,7 @@

) - + ¶ @@ -342,7 +347,7 @@

{% else %} = None{% endif %} - + ¶ @@ -365,7 +370,7 @@

) - + ¶ @@ -389,7 +394,7 @@

) - + ¶ @@ -399,7 +404,9 @@

- = (0, 17) %}section{% else %}div{% endif %}> + = (0, 17) %}section{% else %}div{% endif %}>{% if sphinx_version >= (8, 1) %} +

{% endif %} diff --git a/tests/test_sphinx_version.py b/tests/test_sphinx_version.py new file mode 100644 index 0000000..14846f2 --- /dev/null +++ b/tests/test_sphinx_version.py @@ -0,0 +1,22 @@ +# stdlib +import os +import re + +# 3rd party +import sphinx +from domdf_python_tools.compat import importlib_metadata + + +def test_sphinx_version_against_tox(): + m = re.match(r"py.*-sphinx(\d)\.(\d)", os.getenv("TOX_ENV_NAME", '')) + if m is not None: + target_version = tuple(map(int, m.groups())) + assert target_version == sphinx.version_info[:2] + + +def test_pytest_version_against_tox(): + m = re.match(r"py.*-pytest(\d)\.(\d)", os.getenv("TOX_ENV_NAME", '')) + if m is not None: + target_version = tuple(map(int, m.groups())) + pytest_version = tuple(map(int, importlib_metadata.version("pytest").split('.')[:2])) + assert target_version == pytest_version diff --git a/tox.ini b/tox.ini index 7f28fd6..e271a62 100644 --- a/tox.ini +++ b/tox.ini @@ -22,16 +22,26 @@ [tox] envlist = - py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3} + pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} + py37-pytest7.4 + py38-pytest{7.4,8.3} + py39-pytest{7.4,8.3,latest} + py310-pytest{7.4,8.3,latest} + py311-pytest{7.4,8.3,latest} + py312-pytest{7.4,8.3,latest} + py313-pytest{7.4,8.3,latest} + pypy37-pytest7.4 + pypy38-pytest{7.4,8.3} + pypy39-pytest{7.4,8.3,latest} mypy build skip_missing_interpreters = True @@ -46,14 +56,24 @@ requires = test = py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} - pypy38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} - pypy39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} + py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1} + py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3} + pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} + pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} + py37-pytest7.4 + py38-pytest{7.4,8.3} + py39-pytest{7.4,8.3,latest} + py310-pytest{7.4,8.3,latest} + py311-pytest{7.4,8.3,latest} + py312-pytest{7.4,8.3,latest} + py313-pytest{7.4,8.3,latest} + pypy37-pytest7.4 + pypy38-pytest{7.4,8.3} + pypy39-pytest{7.4,8.3,latest} qa = mypy, lint cov = py38-sphinx3.2, coverage @@ -62,19 +82,6 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -[testenv:py313] -download = True -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - UNSAFE_PYO3_SKIP_VERSION_CHECK=1 - -[testenv:py312] -download = True -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - [testenv:docs] setenv = SHOW_TODOS = 1 passenv = SPHINX_BUILDER @@ -246,31 +253,6 @@ filterwarnings = always:The alias 'sphinx.util.typing.stringify' is deprecated, use 'sphinx.util.typing.stringify_annotation' instead. Check CHANGES for Sphinx API modifications.:DeprecationWarning markers = sphinx -[testenv:py312-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] -download = True -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - -[testenv:py313-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] -download = True -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - UNSAFE_PYO3_SKIP_VERSION_CHECK=1 - -[testenv:py313-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] -download = True -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - UNSAFE_PYO3_SKIP_VERSION_CHECK=1 - -[testenv:py312-dev-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}] -setenv = - PYTHONDEVMODE=1 - PIP_DISABLE_PIP_VERSION_CHECK=1 - [testenv] setenv = PYTHONDEVMODE=1 @@ -290,17 +272,17 @@ deps = sphinx4.3: sphinx==4.3.2 sphinx4.4: sphinx==4.4.0 sphinx4.5: sphinx==4.5.0 - sphinx4.{0,1,2,3,4,5}: docutils<=0.17.1 + sphinx4.{0,1,2,3,4,5}: docutils==0.17.1 sphinx5.0: sphinx==5.0.2 sphinx5.1: sphinx==5.1.1 - sphinx5.2: sphinx==5.2.1 + sphinx5.2: sphinx==5.2.3 sphinx5.3: sphinx==5.3.0 sphinx6.0: sphinx==6.0.1 - sphinx6.1: sphinx==6.1.2 + sphinx6.1: sphinx==6.1.3 sphinx6.2: sphinx==6.2.1 sphinx7.0: sphinx==7.0.1 sphinx7.1: sphinx==7.1.2 - sphinx7.2: sphinx==7.2.5 + sphinxcontrib-applehelp<=1.0.4 sphinxcontrib-devhelp<=1.0.2 sphinxcontrib-htmlhelp<=2.0.1 @@ -311,3 +293,120 @@ deps = commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{39,310,311,312,313,py39}-sphinx7.2] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==7.2.6 + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{39,310,311,312,313,py39}-sphinx7.3] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==7.3.7 + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{39,310,311,312,313,py39}-sphinx7.4] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==7.4.7 + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{310,311,312,313}-sphinx8.0] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==8.0.2 + pip install pygments>=2.7.4,<=2.13.0 alabaster==0.7.16 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{310,311,312,313}-sphinx8.1] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==8.1.3 + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{311,312,313}-sphinx8.2] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt +commands = + pip install sphinx==8.2.1 + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{37,38,39,310,311,312,313}-pytest7.4] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt + pytest~=7.4.0 +commands = + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{38,39,310,311,312,313}-pytest8.3] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt + pytest~=8.3.0 +commands = + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} + +[testenv:py{39,310,311,312,313}-pytestlatest] +setenv = + PYTHONDEVMODE=1 + PIP_DISABLE_PIP_VERSION_CHECK=1 +deps = + -r{toxinidir}/tests/requirements.txt + -r{toxinidir}/requirements.txt + pytest +commands = + pip install pygments>=2.7.4,<=2.13.0 + python --version + python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} From d468ff3536c34ab50c039ead3ce82d2e53b06d62 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 4 Jun 2025 16:12:27 +0100 Subject: [PATCH 62/69] Lint --- sphinx_autofixture/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx_autofixture/__init__.py b/sphinx_autofixture/__init__.py index 368ff4a..3b957e4 100644 --- a/sphinx_autofixture/__init__.py +++ b/sphinx_autofixture/__init__.py @@ -52,10 +52,10 @@ try: # pragma: no cover # 3rd party - from _pytest.fixtures import FixtureFunctionDefinition + from _pytest.fixtures import FixtureFunctionDefinition # type: ignore[attr-defined] except ImportError: # pragma: no cover - class FixtureFunctionDefinition: + class FixtureFunctionDefinition: # type: ignore[no-redef] pass From 36f7561245d3abd5c0d5a4bf6008e62ad877dd4c Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Wed, 4 Jun 2025 16:57:42 +0100 Subject: [PATCH 63/69] Set encoding when reading test output files. --- tests/test_directive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_directive.py b/tests/test_directive.py index 79b01c8..e31ab37 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -38,7 +38,7 @@ def content(app: Sphinx) -> Iterator[Sphinx]: @pytest.fixture() def page(content: Any, request: Any) -> Iterator[BeautifulSoup]: pagename = request.param - c = (content.outdir / pagename).read_text() + c = (content.outdir / pagename).read_text(encoding="UTF-8") yield BeautifulSoup(c, "html5lib") From d47d9f195a480f4efecdb49162b04e44b36404ef Mon Sep 17 00:00:00 2001 From: "repo-helper[bot]" <74742576+repo-helper[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 10:06:27 +0100 Subject: [PATCH 64/69] Updated files with 'repo_helper'. (#83) Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com> --- .github/workflows/mypy.yml | 2 +- .github/workflows/python_ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index bd74787..df78eb0 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: ['ubuntu-22.04', 'windows-2019'] + os: ['ubuntu-22.04', 'windows-2022'] fail-fast: false steps: diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 546a7f0..125c2f3 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -18,8 +18,8 @@ permissions: jobs: tests: - name: "windows-2019 / Python ${{ matrix.config.python-version }}" - runs-on: "windows-2019" + name: "windows-2022 / Python ${{ matrix.config.python-version }}" + runs-on: "windows-2022" continue-on-error: ${{ matrix.config.experimental }} env: USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9' From fb5f132c93e48267b9ae1024d21337f14e6a4c7d Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 5 Jun 2025 10:05:47 +0100 Subject: [PATCH 65/69] Fix pytest tests on PyPy --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index e271a62..ee49f37 100644 --- a/tox.ini +++ b/tox.ini @@ -372,7 +372,7 @@ commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} -[testenv:py{37,38,39,310,311,312,313}-pytest7.4] +[testenv:py{37,38,39,310,311,312,313,py37,py38,py39}-pytest7.4] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -385,7 +385,7 @@ commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} -[testenv:py{38,39,310,311,312,313}-pytest8.3] +[testenv:py{38,39,310,311,312,313,py38,py39}-pytest8.3] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -398,7 +398,7 @@ commands = python --version python -m pytest --cov=sphinx_autofixture -r aR tests/ {posargs} -[testenv:py{39,310,311,312,313}-pytestlatest] +[testenv:py{39,310,311,312,313,py39}-pytestlatest] setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 From e1268193a208a002cece1feaa834bbb8f665e0a8 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 5 Jun 2025 10:44:33 +0100 Subject: [PATCH 66/69] Update tox config. --- repo_helper.yml | 5 ++++- tox.ini | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/repo_helper.yml b/repo_helper.yml index d46558b..7042b93 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -204,4 +204,7 @@ classifiers: exclude_files: - contributing - - tox + +tox_unmanaged: + - testenv + - fixups diff --git a/tox.ini b/tox.ini index ee49f37..f5b6151 100644 --- a/tox.ini +++ b/tox.ini @@ -22,12 +22,12 @@ [tox] envlist = - py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} + py37-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3} py38-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} - py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -59,7 +59,7 @@ test = py39-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4} py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1} py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} - py312-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} + py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2} pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3} pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1} @@ -133,7 +133,7 @@ deps = git+https://github.com/domdfcoding/flake8-rst-docstrings.git git+https://github.com/python-formate/flake8-unused-arguments.git@magic-methods git+https://github.com/python-formate/flake8-missing-annotations.git - pydocstyle>=6.0.0 + git+https://github.com/domdfcoding/pydocstyle.git@stub-functions pygments>=2.7.1 importlib_metadata<4.5.0; python_version<'3.8' commands = python3 -m flake8_rst_docstrings_sphinx sphinx_autofixture tests --allow-toolbox {posargs} From 5ac46865e4e94b8793c3992699d14ca21abe65f4 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 5 Jun 2025 11:10:55 +0100 Subject: [PATCH 67/69] Skip pytest 7.4 on Python 3.13 --- .github/workflows/python_ci.yml | 2 +- .github/workflows/python_ci_linux.yml | 2 +- .github/workflows/python_ci_macos.yml | 2 +- repo_helper.yml | 2 ++ tox.ini | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 125c2f3..21af2ba 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -34,7 +34,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{8.3,latest},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index c6cfc9f..2ef4c9f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.11", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} - - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{8.3,latest},build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 760d5e6..3c04907 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -34,7 +34,7 @@ jobs: - {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},py310-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.2,3.3,3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py311-pytest{7.4,8.3,latest},build", experimental: False} - {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py312-pytest{7.4,8.3,latest},build", experimental: False} - - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{7.4,8.3,latest},build", experimental: False} + - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},py313-pytest{8.3,latest},build", experimental: False} - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},pypy37-pytest7.4,build", experimental: False} - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},pypy38-pytest{7.4,8.3},build", experimental: False} - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},pypy39-pytest{7.4,8.3,latest},build", experimental: True} diff --git a/repo_helper.yml b/repo_helper.yml index 7042b93..36a2dd9 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -89,6 +89,8 @@ python_versions: - 5.3 - 6.0 - 6.1 + pytest: + - 7.4 pypy37: matrix_exclude: pytest: diff --git a/tox.ini b/tox.ini index f5b6151..cbc048c 100644 --- a/tox.ini +++ b/tox.ini @@ -38,7 +38,7 @@ envlist = py310-pytest{7.4,8.3,latest} py311-pytest{7.4,8.3,latest} py312-pytest{7.4,8.3,latest} - py313-pytest{7.4,8.3,latest} + py313-pytest{8.3,latest} pypy37-pytest7.4 pypy38-pytest{7.4,8.3} pypy39-pytest{7.4,8.3,latest} @@ -70,7 +70,7 @@ test = py310-pytest{7.4,8.3,latest} py311-pytest{7.4,8.3,latest} py312-pytest{7.4,8.3,latest} - py313-pytest{7.4,8.3,latest} + py313-pytest{8.3,latest} pypy37-pytest7.4 pypy38-pytest{7.4,8.3} pypy39-pytest{7.4,8.3,latest} From 19adf9dda27f61b400187d32de8e950929fd6692 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 5 Jun 2025 11:41:21 +0100 Subject: [PATCH 68/69] Bump version v0.4.0 -> v0.4.1 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 2 +- README.rst | 2 +- doc-source/index.rst | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 +- sphinx_autofixture/__init__.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2e87e36..928aa5d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.0 +current_version = 0.4.1 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 652efac..15edb67 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -58,7 +58,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld sphinx-autofixture=0.4.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld sphinx-autofixture=0.4.1=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/README.rst b/README.rst index 8d9a01c..0138f80 100644 --- a/README.rst +++ b/README.rst @@ -106,7 +106,7 @@ and `the documentation for coincidence`_ for an example with the ReadTheDocs the .. |language| image:: https://img.shields.io/github/languages/top/sphinx-toolbox/sphinx-autofixture :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/sphinx-autofixture/v0.4.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/sphinx-toolbox/sphinx-autofixture/v0.4.1 :target: https://github.com/sphinx-toolbox/sphinx-autofixture/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/index.rst b/doc-source/index.rst index db351b2..90d5ae1 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -107,7 +107,7 @@ sphinx-autofixture :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v0.4.0 + :commits-since: v0.4.1 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/pyproject.toml b/pyproject.toml index 0b2ceab..2a22246 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "whey" [project] name = "sphinx-autofixture" -version = "0.4.0" +version = "0.4.1" description = "Sphinx autodocumenter for pytest fixtures." readme = "README.rst" keywords = [ "documentation", "pytest", "sphinx", "sphinx-extension",] diff --git a/repo_helper.yml b/repo_helper.yml index 36a2dd9..477b73c 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -7,7 +7,7 @@ email: 'dominic@davis-foster.co.uk' username: "sphinx-toolbox" assignee: "domdfcoding" primary_conda_channel: 'domdfcoding' -version: '0.4.0' +version: '0.4.1' license: 'MIT' short_desc: 'Sphinx autodocumenter for pytest fixtures.' diff --git a/sphinx_autofixture/__init__.py b/sphinx_autofixture/__init__.py index 3b957e4..145e1ea 100644 --- a/sphinx_autofixture/__init__.py +++ b/sphinx_autofixture/__init__.py @@ -45,7 +45,7 @@ __author__: str = "Dominic Davis-Foster" __copyright__: str = "2020 Dominic Davis-Foster" __license__: str = "MIT License" -__version__: str = "0.4.0" +__version__: str = "0.4.1" __email__: str = "dominic@davis-foster.co.uk" __all__ = ["FixtureDecoratorFinder", "FixtureDocumenter", "is_fixture", "setup"] From 7f38c380853f087389bf1675e527669e8efb7f2e Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Mon, 9 Jun 2025 16:27:11 +0100 Subject: [PATCH 69/69] Bump mypy --- .github/workflows/flake8.yml | 2 +- .github/workflows/mypy.yml | 2 +- pyproject.toml | 2 +- repo_helper.yml | 2 ++ sphinx_autofixture/__init__.py | 4 ++-- tests/test_directive.py | 6 +++--- tox.ini | 14 +++++++------- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index af1b394..5e67c5c 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -35,7 +35,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v5" with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies 🔧 if: steps.changes.outputs.code == 'true' diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index df78eb0..4c22a52 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -40,7 +40,7 @@ jobs: if: steps.changes.outputs.code == 'true' uses: "actions/setup-python@v5" with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies 🔧 run: | diff --git a/pyproject.toml b/pyproject.toml index 2a22246..14bdb4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,7 +124,7 @@ autodoc_exclude_members = [ ] [tool.mypy] -python_version = "3.8" +python_version = "3.9" namespace_packages = true check_untyped_defs = true warn_unused_ignores = true diff --git a/repo_helper.yml b/repo_helper.yml index 477b73c..f926df4 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -15,6 +15,8 @@ use_whey: true sphinx_html_theme: furo preserve_custom_theme: true min_coverage: 95 +mypy_version: 1.16 +python_deploy_version: 3.9 # Versions to run tests for python_versions: diff --git a/sphinx_autofixture/__init__.py b/sphinx_autofixture/__init__.py index 145e1ea..507e693 100644 --- a/sphinx_autofixture/__init__.py +++ b/sphinx_autofixture/__init__.py @@ -52,7 +52,7 @@ try: # pragma: no cover # 3rd party - from _pytest.fixtures import FixtureFunctionDefinition # type: ignore[attr-defined] + from _pytest.fixtures import FixtureFunctionDefinition except ImportError: # pragma: no cover class FixtureFunctionDefinition: # type: ignore[no-redef] @@ -169,7 +169,7 @@ def can_document_member( """ if isinstance(member, (FunctionType, FixtureFunctionDefinition)): - return is_fixture(member)[0] + return is_fixture(member)[0] # type: ignore[arg-type] else: # pragma: no cover return False diff --git a/tests/test_directive.py b/tests/test_directive.py index e31ab37..79c44dd 100644 --- a/tests/test_directive.py +++ b/tests/test_directive.py @@ -17,7 +17,7 @@ path = pathlib.Path else: # 3rd party - from sphinx.testing.path import path # type: ignore[misc] + from sphinx.testing.path import path # type: ignore[assignment] pytest_plugins = "sphinx.testing.fixtures" @@ -117,9 +117,9 @@ def test_output( def _get_alabaster_version() -> Tuple[int, int, int]: try: # 3rd party - import alabaster._version as alabaster # type: ignore[import] + import alabaster._version as alabaster # type: ignore[import-untyped] except ImportError: # 3rd party - import alabaster # type: ignore[import] + import alabaster # type: ignore[import-untyped] return tuple(map(int, alabaster.__version__.split('.'))) diff --git a/tox.ini b/tox.ini index cbc048c..d8972dd 100644 --- a/tox.ini +++ b/tox.ini @@ -75,7 +75,7 @@ test = pypy38-pytest{7.4,8.3} pypy39-pytest{7.4,8.3,latest} qa = mypy, lint -cov = py38-sphinx3.2, coverage +cov = py39-sphinx3.2, coverage [testenv:.package] setenv = @@ -109,7 +109,7 @@ commands = check-wheel-contents dist/ [testenv:lint] -basepython = python3.8 +basepython = python3.9 changedir = {toxinidir} ignore_errors = True skip_install = True @@ -139,7 +139,7 @@ deps = commands = python3 -m flake8_rst_docstrings_sphinx sphinx_autofixture tests --allow-toolbox {posargs} [testenv:perflint] -basepython = python3.8 +basepython = python3.9 changedir = {toxinidir} ignore_errors = True skip_install = True @@ -147,17 +147,17 @@ deps = perflint commands = python3 -m perflint sphinx_autofixture {posargs} [testenv:mypy] -basepython = python3.8 +basepython = python3.9 ignore_errors = True changedir = {toxinidir} deps = - mypy==0.971 + mypy==1.16 -r{toxinidir}/tests/requirements.txt -r{toxinidir}/stubs.txt commands = mypy sphinx_autofixture tests {posargs} [testenv:pyup] -basepython = python3.8 +basepython = python3.9 skip_install = True ignore_errors = True changedir = {toxinidir} @@ -165,7 +165,7 @@ deps = pyupgrade-directories commands = pyup_dirs sphinx_autofixture tests --py36-plus --recursive [testenv:coverage] -basepython = python3.8 +basepython = python3.9 skip_install = True ignore_errors = True whitelist_externals = /bin/bash

sphinx-autofixture Demo - + ¶

My Dataclass - - - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

¶

sphinx-autofixture Demo - + ¶

- - - tests.myproject. - - - baz - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -167,13 +172,13 @@

sphinx-autofixture Demo - + ¶

- - + + <{{ sig_prename_tag }} class="sig-prename descclassname"> tests.myproject. - - + + <{{ sig_prename_tag }} class="sig-name descname"> baz - + ( @@ -167,13 +172,13 @@

sphinx-autofixture Demo - + ¶

My Dataclass - - - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

¶

sphinx-autofixture Demo - + ¶

My Dataclass - - - __dataclass_fields__ - - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

- sphinx-autofixture Demo - - ¶ - -

{{ span_pre("fixture", " ") }} <{{ sig_prename_tag }} class="sig-prename descclassname"> - coincidence.fixtures. + {{ span_pre("coincidence.fixtures.", " ") }} <{{ sig_prename_tag }} class="sig-name descname"> - tmp_pathplus + {{ span_pre("tmp_pathplus", " ") }}

- sphinx-autofixture Demo - - ¶ - -

- sphinx-autofixture Demo - - ¶ - -

sphinx-autofixture Demo - + ¶

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("A", " ") }} - + ¶ @@ -184,7 +189,7 @@

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False{{ DataclassParams_end_args }}){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -252,7 +257,7 @@

{% else %} = None{% endif %} - + ¶ @@ -285,7 +290,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -309,7 +314,7 @@

{% else %} = (){% endif %} - + ¶ @@ -330,7 +335,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -348,7 +353,7 @@

) - + ¶ @@ -363,7 +368,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("__weakref__", " ") }} - + ¶ @@ -389,7 +394,7 @@

) - + ¶ @@ -413,7 +418,7 @@

) - + ¶ @@ -423,7 +428,9 @@

sphinx-autofixture Demo - + ¶

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("A", " ") }} - + ¶ @@ -184,7 +189,7 @@

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -252,7 +257,7 @@

{% else %} = None{% endif %} - + ¶ @@ -285,7 +290,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -309,7 +314,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -327,7 +332,7 @@

) - + ¶ @@ -342,7 +347,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("__weakref__", " ") }} - + ¶ @@ -368,7 +373,7 @@

) - + ¶ @@ -392,7 +397,7 @@

) - + ¶ @@ -402,7 +407,9 @@

sphinx-autofixture Demo - + ¶

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("tmp_pathplus", " ") }} - + ¶ @@ -149,9 +156,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("A", " ") }} - + ¶ @@ -184,7 +189,7 @@

{% else %} = {}{% endif %} - + ¶ @@ -205,7 +210,7 @@

{% else %} = _DataclassParams(init=True,repr=True,eq=True,order=False,unsafe_hash=False,frozen=False){% endif %} - + ¶ @@ -228,7 +233,7 @@

) - + ¶ @@ -249,7 +254,7 @@

{% else %} = None{% endif %} - + ¶ @@ -282,7 +287,7 @@

None {% else %} → None{% endif %} - + ¶ @@ -303,7 +308,7 @@

{% else %} = 'tests.myproject'{% endif %} - + ¶ @@ -321,7 +326,7 @@

) - + ¶ @@ -342,7 +347,7 @@

{% else %} = None{% endif %} - + ¶ @@ -365,7 +370,7 @@

) - + ¶ @@ -389,7 +394,7 @@

) - + ¶ @@ -399,7 +404,9 @@

My Dataclass

-
- `- __dataclass_fields__ -` - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

-
- `- tests.myproject. -` - `- baz -` + + <{{ sig_prename_tag }} class="sig-prename descclassname"> + {{ span_pre("tests.myproject.", " ") }} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("baz", " ") }} + ( @@ -167,13 +172,13 @@

-
- `+ + <{{ sig_prename_tag }} class="sig-prename descclassname"> tests.myproject. -` - `+ + <{{ sig_prename_tag }} class="sig-name descname"> baz -` + ( @@ -167,13 +172,13 @@

My Dataclass

-
- `- __dataclass_fields__ -` - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

My Dataclass

-
- `- __dataclass_fields__ -` - {% if sphinx_version >= (3, 5) %} + + <{{ sig_prename_tag }} class="sig-name descname"> + {{ span_pre("__dataclass_fields__", " ") }} + + {% if (3, 5) <= sphinx_version < (4, 3) %} = @@ -186,11 +188,11 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("weakref", " ") }} - + ¶ @@ -389,7 +394,7 @@

<{{ sig_prename_tag }} class="sig-name descname"> {{ span_pre("weakref", " ") }} - + ¶ @@ -368,7 +373,7 @@