Merge branch 'main' into mailbox-improvements

Author: srittau

.github/workflows/daily.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:

.github/workflows/meta_tests.yml

@@ -65,7 +65,7 @@ jobs:
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
-          python-version: "3.9" # Oldest version supported for running scripts and tests
+          python-version: "3.10" # Oldest version supported for running scripts and tests
           project: ./pyrightconfig.scripts_and_tests.json
   stubsabot-dry-run:
     name: Stubsabot dry run

.github/workflows/stubtest_stdlib.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:

.github/workflows/tests.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
@@ -84,7 +84,7 @@ jobs:
     strategy:
       matrix:
         python-platform: ["Linux", "Windows", "Darwin"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6

CONTRIBUTING.md

@@ -55,8 +55,6 @@ Note that some tests require extra setup steps to install the required dependenc
   <td>Linux / macOS / WSL</td>
   <td>
 
-  On Linux and macOS, you will be able to run the full test suite on Python
-  3.9-3.12.
   To install the necessary requirements, run the following commands from a
   terminal window:
 
@@ -134,7 +132,7 @@ there represents a PyPI distribution, and contains the following:
   source distribution.
 * (Rarely) some docs specific to a given type stub package in `README` file.
 
-When a third party stub is added or
+When a third-party stub is added or
 modified, an updated version of the corresponding distribution will be
 automatically uploaded to PyPI within a few hours.
 Each time this happens the least significant
@@ -186,7 +184,7 @@ supported:
   stubs for other reasons than the upstream library shipping with type
   information.
 * `upload` (optional): This field is set to `false` to prevent automatic
-  uploads to PyPI. This should only used in special cases, e.g. when the stubs
+  uploads to PyPI. This should only be used in special cases, e.g. when the stubs
   break the upload.
 * `partial_stub` (optional): This field marks the type stub package as
   [partial](https://peps.python.org/pep-0561/#partial-stub-packages). This is for
@@ -344,20 +342,20 @@ the latest mypy (`pip install -r requirements-tests.txt`) before running the scr
 
 ### Supported type system features
 
-Since PEP 484 was accepted, there have been many other PEPs that added
-new features to the Python type system. In general, new features can
-be used in typeshed as soon as the PEP has been accepted and implemented
-and most type checkers support the new feature.
+Since [PEP 484](https://peps.python.org/pep-0484/) was accepted, there have been
+many other PEPs that added new features to the Python type system. In general,
+new features can be used in typeshed as soon as the PEP has been accepted and
+implemented and most type checkers support the new feature.
 
 Supported features include:
-- [PEP 544](https://peps.python.org/pep-0544/) (Protocol)
+- [PEP 544](https://peps.python.org/pep-0544/) (`Protocol`)
 - [PEP 585](https://peps.python.org/pep-0585/) (builtin generics)
-- [PEP 586](https://peps.python.org/pep-0586/) (Literal)
-- [PEP 591](https://peps.python.org/pep-0591/) (Final/@final)
-- [PEP 589](https://peps.python.org/pep-0589/) (TypedDict)
+- [PEP 586](https://peps.python.org/pep-0586/) (`Literal`)
+- [PEP 591](https://peps.python.org/pep-0591/) (`Final`/`@final`)
+- [PEP 589](https://peps.python.org/pep-0589/) (`TypedDict`)
 - [PEP 604](https://peps.python.org/pep-0604/) (`Foo | Bar` union syntax)
-- [PEP 612](https://peps.python.org/pep-0612/) (ParamSpec)
-- [PEP 647](https://peps.python.org/pep-0647/) (TypeGuard):
+- [PEP 612](https://peps.python.org/pep-0612/) (`ParamSpec`)
+- [PEP 647](https://peps.python.org/pep-0647/) (`TypeGuard`):
   see [#5406](https://github.com/python/typeshed/issues/5406)
 - [PEP 655](https://peps.python.org/pep-0655/) (`Required` and `NotRequired`)
 - [PEP 673](https://peps.python.org/pep-0673/) (`Self`)

README.md

@@ -21,7 +21,7 @@ the project the stubs are for, but instead report them here to typeshed.**
 Further documentation on stub files, typeshed, and Python's typing system in
 general, can also be found at https://typing.readthedocs.io/en/latest/.
 
-Typeshed supports Python versions 3.9 to 3.14.
+Typeshed supports Python versions 3.10 to 3.14.
 
 ## Using
 
@@ -38,7 +38,7 @@ you can install the type stubs using
 $ pip install types-html5lib types-requests
 ```
 
-These PyPI packages follow [PEP 561](http://www.python.org/dev/peps/pep-0561/)
+These PyPI packages follow [the typing spec standards](https://typing.python.org/en/latest/spec/distributing.html)
 and are automatically released (up to once a day) by
 [typeshed internal machinery](https://github.com/typeshed-internal/stub_uploader).
 

lib/ts_utils/utils.py

@@ -28,13 +28,43 @@ def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type:
         return text
 
 
+_REMOVE_COMMENT_RE = re.compile(
+    r"""
+    (\"(?:\\.|[^\\\"])*?\")  # matches literal strings
+    |
+    (\/\*.*?\*\/ | \/\/[^\r\n]*?(?:[\r\n]))  # matches single- and multi-line comments
+    """,
+    re.DOTALL | re.VERBOSE,
+)
+_REMOVE_TRAILING_COMMA_RE = re.compile(
+    r"""
+    (\"(?:\\.|[^\\\"])*?\")  # matches literal strings
+    |
+    ,\s*([\]}])  # matches commas before '}' or ']'
+    """,
+    re.DOTALL | re.VERBOSE,
+)
+
+
 PYTHON_VERSION: Final = f"{sys.version_info.major}.{sys.version_info.minor}"
 
 
 def strip_comments(text: str) -> str:
     return text.split("#")[0].strip()
 
 
+def jsonc_to_json(text: str) -> str:
+    """Conversion from JSONC format input to valid JSON."""
+    # Remove comments
+    if not text.endswith("\n"):
+        text += "\n"
+    text = _REMOVE_COMMENT_RE.sub(lambda m: m.group(1) or "", text)
+
+    # Remove trailing commas before } or ]
+    text = _REMOVE_TRAILING_COMMA_RE.sub(lambda m: m.group(1) or m.group(2), text)
+    return text
+
+
 # ====================================================================
 # Printing utilities
 # ====================================================================

pyproject.toml

@@ -3,7 +3,7 @@
 # https://github.com/astral-sh/uv/issues/8666
 name = "typeshed"
 version = "0"
-requires-python = ">=3.9" # Minimum version to run tests, used by uv run
+requires-python = ">=3.10" # Minimum version to run tests, used by uv run
 
 [tool.black]
 line-length = 130
@@ -12,8 +12,6 @@ skip-magic-trailing-comma = true
 
 [tool.ruff]
 line-length = 130
-# Oldest supported Python version
-target-version = "py39"
 fix = true
 exclude = [
     # virtual environment
@@ -149,6 +147,12 @@ extend-safe-fixes = [
     "UP036", # Remove unnecessary `sys.version_info` blocks
 ]
 ignore = [
+    ###
+    # TODO: Disabled temporarily, until Python 3.9 support is fully removed in
+    # May 2026.
+    ###
+    "UP035", # import from typing
+    "UP036", # Remove unnecessary `sys.version_info` blocks
     ###
     # Rules that can conflict with the formatter (Black)
     # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
@@ -255,12 +259,10 @@ extra-standard-library = [
     "_typeshed",
     "typing_extensions",
     # Extra modules not recognized by Ruff
-    # Added in Python 3.9
-    "zoneinfo",
     # Added in Python 3.14
     "compression",
 ]
 known-first-party = ["_utils", "ts_utils"]
 
 [tool.typeshed]
-oldest_supported_python = "3.9"
+oldest_supported_python = "3.10"

pyrightconfig.stricter.json

@@ -9,16 +9,16 @@
         // test cases use a custom pyrightconfig file
         "**/@tests/test_cases",
         "stdlib/__main__.pyi",
+        "stdlib/_tkinter.pyi",
         "stdlib/distutils/cmd.pyi",
         "stdlib/distutils/command",
         "stdlib/distutils/dist.pyi",
         "stdlib/encodings/__init__.pyi",
         "stdlib/lib2to3/fixes/*.pyi",
         "stdlib/numbers.pyi",
-        "stdlib/_tkinter.pyi",
         "stdlib/tkinter/__init__.pyi",
-        "stdlib/tkinter/filedialog.pyi",
         "stdlib/tkinter/dialog.pyi",
+        "stdlib/tkinter/filedialog.pyi",
         "stdlib/tkinter/scrolledtext.pyi",
         "stdlib/tkinter/tix.pyi",
         "stdlib/tkinter/ttk.pyi",
@@ -44,6 +44,7 @@
         "stubs/grpcio-reflection/grpc_reflection/v1alpha",
         "stubs/grpcio-status/grpc_status",
         "stubs/grpcio/grpc/__init__.pyi",
+        "stubs/gunicorn/gunicorn/dirty",
         "stubs/hdbcli/hdbcli/dbapi.pyi",
         "stubs/html5lib",
         "stubs/httplib2",
@@ -66,7 +67,6 @@
         "stubs/opentracing/opentracing/span.pyi",
         "stubs/paramiko/paramiko/_winapi.pyi",
         "stubs/parsimonious/parsimonious/nodes.pyi",
-        "stubs/passlib",
         "stubs/peewee",
         "stubs/pexpect",
         "stubs/pika",
@@ -78,7 +78,6 @@
         "stubs/pycurl",
         "stubs/Pygments",
         "stubs/PyMySQL",
-        "stubs/python-dateutil",
         "stubs/python-jose",
         "stubs/pywin32",
         "stubs/PyYAML",

scripts/create_baseline_stubs.py

@@ -105,12 +105,18 @@ async def get_upstream_repo_url(project: str) -> str | None:
             # Remove `www.`; replace `http://` with `https://`
             url = re.sub(r"^(https?://)?(www\.)?", "https://", url_to_check)
             netloc = urllib.parse.urlparse(url).netloc
-            if netloc in {"gitlab.com", "github.com", "bitbucket.org", "foss.heptapod.net"}:
-                # truncate to https://site.com/user/repo
-                upstream_repo_url = "/".join(url.split("/")[:5])
-                async with session.get(upstream_repo_url) as response:
-                    if response.status == HTTPStatus.OK:
-                        return upstream_repo_url
+            if netloc not in {"gitlab.com", "github.com", "bitbucket.org", "foss.heptapod.net"}:
+                continue
+            # truncate to https://site.com/user/repo
+            upstream_repo_url = "/".join(url.split("/")[:5])
+            async with session.get(upstream_repo_url, allow_redirects=True) as response:
+                if response.status != HTTPStatus.OK:
+                    continue
+                # final url after redirects
+                final_url = str(response.url)
+                # normalize again (in case redirect added extra path)
+                final_repo_url = "/".join(final_url.split("/")[:5])
+                return final_repo_url
     return None