Merge branch 'bump-types-docutils' into dependabot/pip/types-docutils-0.21.0.20250516

Author: adamtheturtle

.github/workflows/lint.yml

@@ -123,3 +123,21 @@ jobs:
       run: |
         python -m build .
         twine check dist/*
+
+  prettier:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: "20"
+        cache: "npm"
+    - run: >
+        npx prettier@3.5
+        --check
+        "sphinx/themes/**/*.js"
+        "!sphinx/themes/bizstyle/static/css3-mediaqueries*.js"
+        "tests/js/**/*.{js,mjs}"
+        "!tests/js/fixtures/**"

.prettierrc.toml

@@ -0,0 +1,2 @@
+# https://prettier.io/docs/options
+experimentalOperatorPosition = "start"

pyproject.toml

@@ -92,12 +92,12 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.10",
+    "ruff==0.11.11",
     "mypy==1.15.0",
     "sphinx-lint>=0.9",
     "types-colorama==0.4.15.20240311",
     "types-defusedxml==0.7.0.20250516",
-    "types-docutils==0.21.0.20250523",
+    "types-docutils==0.21.0.20250525",
     "types-Pillow==10.2.0.20240822",
     "types-Pygments==2.19.0.20250516",
     "types-requests==2.32.0.20250515",  # align with requests
@@ -135,7 +135,7 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.10",
+    "ruff==0.11.11",
     "sphinx-lint>=0.9",
 ]
 package = [
@@ -158,14 +158,15 @@ translations = [
 ]
 types = [
     "mypy==1.15.0",
+    "pyrefly",
     "pyright==1.1.400",
     { include-group = "type-stubs" },
 ]
 type-stubs = [
     # align with versions used elsewhere
     "types-colorama==0.4.15.20240311",
     "types-defusedxml==0.7.0.20250516",
-    "types-docutils==0.21.0.20250523",
+    "types-docutils==0.21.0.20250525",
     "types-Pillow==10.2.0.20240822",
     "types-Pygments==2.19.0.20250516",
     "types-requests==2.32.0.20250515",

pyrefly.toml

@@ -0,0 +1,27 @@
+# Configuration file for Pyrefly_.
+# n.b. Pyrefly is early in development.
+#      Sphinx's current primary/reference type-checker is mypy.
+#
+# .. _Pyrefly: https://pyrefly.org/en/docs/configuration/
+
+project_includes = [
+    "doc/conf.py",
+    "doc/development/tutorials/examples/autodoc_intenum.py",
+    "doc/development/tutorials/examples/helloworld.py",
+    "sphinx",
+    "tests",
+    "utils",
+]
+project_excludes = [
+    "**/tests/roots*",
+]
+python_version = "3.11"
+replace_imports_with_any = [
+    "imagesize",
+    "pyximport",
+    "snowballstemmer",
+]
+
+# https://pyrefly.org/en/docs/error-kinds/
+[errors]
+implicitly-defined-attribute = false  # many false positives

sphinx/builders/_epub_base.py

@@ -114,8 +114,8 @@ class NavPoint(NamedTuple):
 
 def sphinx_smarty_pants(t: str, language: str = 'en') -> str:
     t = t.replace('"', '"')
-    t = smartquotes.educateDashesOldSchool(t)  # type: ignore[no-untyped-call]
-    t = smartquotes.educateQuotes(t, language)  # type: ignore[no-untyped-call]
+    t = smartquotes.educateDashesOldSchool(t)
+    t = smartquotes.educateQuotes(t, language)
     t = t.replace('"', '"')
     return t
 

sphinx/search/__init__.py

@@ -81,11 +81,11 @@ class SearchLanguage:
 /**
  * Dummy stemmer for languages without stemming rules.
  */
-var Stemmer = function() {
-  this.stemWord = function(w) {
+var Stemmer = function () {
+  this.stemWord = function (w) {
     return w;
-  }
-}
+  };
+};
 """
 
     _word_re = re.compile(r'\w+')

sphinx/themes/basic/static/doctools.js

@@ -59,7 +59,7 @@ const Documentation = {
     Object.assign(Documentation.TRANSLATIONS, catalog.messages);
     Documentation.PLURAL_EXPR = new Function(
       "n",
-      `return (${catalog.plural_expr})`
+      `return (${catalog.plural_expr})`,
     );
     Documentation.LOCALE = catalog.locale;
   },
@@ -89,7 +89,7 @@ const Documentation = {
 
     const togglerElements = document.querySelectorAll("img.toggler");
     togglerElements.forEach((el) =>
-      el.addEventListener("click", (event) => toggler(event.currentTarget))
+      el.addEventListener("click", (event) => toggler(event.currentTarget)),
     );
     togglerElements.forEach((el) => (el.style.display = ""));
     if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) togglerElements.forEach(toggler);
@@ -98,14 +98,15 @@ const Documentation = {
   initOnKeyListeners: () => {
     // only install a listener if it is really needed
     if (
-      !DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS &&
-      !DOCUMENTATION_OPTIONS.ENABLE_SEARCH_SHORTCUTS
+      !DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS
+      && !DOCUMENTATION_OPTIONS.ENABLE_SEARCH_SHORTCUTS
     )
       return;
 
     document.addEventListener("keydown", (event) => {
       // bail for input elements
-      if (BLACKLISTED_KEY_CONTROL_ELEMENTS.has(document.activeElement.tagName)) return;
+      if (BLACKLISTED_KEY_CONTROL_ELEMENTS.has(document.activeElement.tagName))
+        return;
       // bail with special keys
       if (event.altKey || event.ctrlKey || event.metaKey) return;