Skip to content

Commit da57691

Browse files
committed
Merge remote-tracking branch 'origin/main' into support-python-3.14
2 parents 8efb08b + b99d99b commit da57691

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

admin/create_secrets_files.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
import sys
99
import textwrap
1010
from pathlib import Path
11-
from typing import TYPE_CHECKING
1211

1312
import vws_web_tools
1413
from selenium.common.exceptions import TimeoutException
15-
16-
if TYPE_CHECKING:
17-
from selenium.webdriver.remote.webdriver import WebDriver
18-
from vws_web_tools import DatabaseDict, VuMarkDatabaseDict
19-
14+
from selenium.webdriver.remote.webdriver import WebDriver
15+
from vws_web_tools import DatabaseDict, VuMarkDatabaseDict
2016

2117
VUMARK_TEMPLATE_SVG_FILE_PATH = Path(__file__).with_name(
2218
name="vumark_template.svg",

docs/source/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@
2626
"sphinxcontrib.spelling",
2727
"sphinxcontrib.autohttp.flask",
2828
"sphinx_toolbox.more_autodoc.autoprotocol",
29-
"enum_tools.autoenum",
3029
]
3130

31+
# Required by sphinx-toolbox 4.2.0rc1 for compatibility with Sphinx 9.
32+
# See https://github.com/sphinx-toolbox/sphinx-toolbox/issues/201#issuecomment-4313483053.
33+
autodoc_use_legacy_class_based = True
34+
3235
templates_path = ["_templates"]
3336
source_suffix = ".rst"
3437
master_doc = "index"

docs/source/mock-api-reference.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ API Reference
2525
:undoc-members:
2626
:exclude-members: to_dict, from_dict, not_deleted_targets
2727

28-
.. autoenum:: mock_vws.states.States
28+
.. autoclass:: mock_vws.states.States
2929
:members:
3030
:undoc-members:
3131

32-
.. autoenum:: mock_vws.database_type.DatabaseType
32+
.. autoclass:: mock_vws.database_type.DatabaseType
3333
:members:
3434
:undoc-members:
3535

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ optional-dependencies.dev = [
6161
"doc8==2.0.0",
6262
"doccmd==2026.3.26.2",
6363
"docker==7.1.0",
64-
"enum-tools[sphinx]==0.13.0",
6564
"freezegun==1.5.5",
6665
"furo==2025.12.19",
6766
"interrogate==1.7.0",
@@ -88,13 +87,13 @@ optional-dependencies.dev = [
8887
# use it to lint shell commands in GitHub workflow files.
8988
"shellcheck-py==0.11.0.1",
9089
"shfmt-py==3.12.0.2",
91-
"sphinx==8.2.3",
90+
"sphinx==9.1.0",
9291
"sphinx-copybutton==0.5.2",
9392
"sphinx-lint==1.0.2",
9493
"sphinx-paramlinks==0.6",
9594
"sphinx-pyproject==0.3.0",
9695
"sphinx-substitution-extensions==2026.1.12",
97-
"sphinx-toolbox==4.1.2",
96+
"sphinx-toolbox==4.2.0rc1",
9897
"sphinxcontrib-httpdomain==2.0.0",
9998
"sphinxcontrib-spelling==8.0.2",
10099
"sybil==10.0.1",
@@ -433,6 +432,7 @@ ignore_names = [
433432
"autoclass_content",
434433
"autoclass_content",
435434
"autodoc_member_order",
435+
"autodoc_use_legacy_class_based",
436436
"copybutton_exclude",
437437
"extensions",
438438
"html_show_copyright",

0 commit comments

Comments
 (0)