Align collections and testing libraries with Python 3.15 by youknowdot · Pull Request #9192 · RustPython/RustPython

youknowdot · 2026-10-18T14:43:54Z

Summary

Split the connected collections/testing-library update out of #8954, following the landed #9189 dependency.

Update _collections_abc, collections, contextlib, difflib, doctest, and seven connected unittest files from CPython 3.15.0 d220409a13b77de7a6c30abe16ea90db01528edc.
Carry the matching canonical tests and difflib HTML fixture. Preserve RustPython's unittest.__init__ helpers and existing test markers; unchanged unittest siblings already match the pin.
Accept frozendict in defaultdict/OrderedDict union operand checks through the existing PyAnyDict abstraction, matching CPython's defdict_or/odict_or. Factory retention, constructors, subclass construction and update order are unchanged.

The initial split was 28 files: 12 production Python files (11 substantive modules plus the runner lazy-import companion), 13 Python test files, one fixture and two Rust files. Python updates use scripts/update_lib; its _copy_single function selects exact production files because the CLI expands Python submodule paths to entire packages. Tests use the updater's migration path. No manual Lib edits, new skips, duplicate snippets or CI workflows. The removed doctest checker injection was inactive: the old file contained no EXPECTED_FAILURE options, and its checker otherwise delegated unchanged.

The dependency order is _collections_abc → collections → contextlib/difflib → unittest.util → case/_log → suite → loader → main → doctest, with the runner companion included. #9189 supplies the matching lazy ByteString handling in typing; without it, the old eager alias emits an extra warning in unittest's subprocess test.

Hosted CI follow-up

Ubuntu CI at the original e3d65138 head (merge ref 29c35936) passed 431 test files, then exposed an old harness expectation in test_regrtest.ArgsTestCase.test_doctest: the canonical doctest reports two failures and one skip instead of the old one failure and no skips. Update the canonical test_regrtest, libregrtest.cmdline, libregrtest.main, libregrtest.utils and pythoninfo together through the updater. These five files provide the matching doctest expectation, runner --pythoninfo integration and build-information heading. Both existing RustPython expected-failure markers remain. The total is now 33 files; no native code changed in this follow-up.

Validation

Candidate e3d65138 is based on main e7e3dfd6. Its 28-file patch is byte-identical to the previously validated 39d9e5a8; all 47 files changed by intervening main merges are disjoint and retained. Earlier results remain attributed to the earlier base. Historical checks on that exact head (native/Cargo files are unchanged in follow-up e4b3feed):

Normal repository hooks passed, including Ruff, rustfmt, spelling and redundant-test-patch checks.
Fresh release build and isolated import/source provenance passed.
All 17 related canonical suites passed, reporting 3,357 tests: collections, deque, defaultdict, ordered_dict, contextlib, contextlib_async, difflib, selected unittest, doctest, selected re, dataclasses, typing, type_aliases, type_annotations, type_params, genericalias and annotationlib. Existing skips/expected failures remain.
Standard workspace tests passed (1,400 passed, 18 existing ignored, including doc tests); CAPI tests passed (123 passed, 4 existing ignored). Both strict all-target Clippy gates passed with -D warnings.
The pinned CPython oracle independently passed all 312 canonical defaultdict/OrderedDict tests.

Source/dependency/toolchain and protected-worktree audits passed. unittest/doctest -E subprocesses generated 85/135 bytecode-cache files; the raw full-tree audits correctly reported those additions. Only hash-verified new caches were quarantined, then separate clean audits passed. Workspace/CAPI tests similarly generated 52/7 caches, with preserved raw statuses and separate clean post-quarantine audits. Raw logs and statuses are retained.

The follow-up uses a new release build bound to its own worktree. Parent, -E child and -I child module paths all resolve the updated harness. The exact hosted failing doctest case passes both the pinned CPython oracle and the new RustPython candidate. The selected canonical test_regrtest passes 121 tests (9 existing skips, 2 expected failures), and all 17 related suites pass again, reporting 3,357 tests. Fresh source/dependency/protected-proof audits pass; generated bytecode caches from isolated children were hash-verified and quarantined with raw audit results retained. Native workspace/CAPI/Clippy results above belong to e3d65138 and are reused only because all native and Cargo paths are unchanged.

Hosted CI on e4b3feed has now completed successfully: 17 checks passed and 3 conditional checks were skipped. Ubuntu, macOS and Windows Python jobs and Rust jobs passed, along with Clippy, Miri, WASM, docs, lint and dependency checks. CI run. The Ubuntu log confirms merge 377fe6f of this head into e7e3dfd6; test_regrtest passed, and the full Python run reported 45,759 tests (existing skips retained).

Local coverage boundaries

Local unittest coverage externally excludes test.test_unittest.test_async_case.* and test.test_unittest.testmock.testasync.*; re excludes *ReTests.test_regression_gh94675, under the existing local socket boundary. These are selected-suite passes, not unfiltered passes. No test-source skip was added. Standard hosted CI complements these omissions. test_contextlib_async directly steps coroutines without creating an event loop. Default test resources remain in effect.

The local test_regrtest run additionally excludes exactly ArgsTestCase.test_rerun_async_setup_hook_failure, ArgsTestCase.test_rerun_async_teardown_hook_failure and ArgsTestCase.test_pythoninfo. The first two require AF_UNIX event loops; the last performs real socket capability/bind probes and system diagnostics. ParseArgsTestCase.test_pythoninfo remains included. These are external selection limits only; the pythoninfo execution integration remains a local coverage gap for hosted CI to check. Even hosted success checks the runner/heading integration, not success of every best-effort diagnostic probe.

AI assistance

This is maintainer-requested Python 3.15 maintenance work. OpenAI Codex assisted with dependency analysis, canonical updater execution, the two native operand checks, automated test execution and this description. The model version is unavailable. Commits include the Assisted-by trailer. The validation above describes automated checks, not a claim of additional manual human testing.

Refresh twelve production modules and canonical tests through scripts/update_lib at CPython d220409a13b77de7a6c30abe16ea90db01528edc. Preserve existing RustPython unittest helpers and test guards. Accept frozendict in native defaultdict and OrderedDict union slots, matching upstream PyAnyDict_Check without changing constructors, factories, or update order. Validated as a local stack on the exact RustPython#9189 regex/dataclasses/typing prerequisite; this dependency avoids eager typing.ByteString deprecation during unittest warning tests. Assisted-by: OpenAI Codex: model version unavailable

coderabbitai · 2026-10-18T14:44:01Z

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true

Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

github-actions · 2026-10-18T15:23:27Z

📦 Library Dependencies

The following Lib/ modules were modified. Here are their dependencies:

:4: SyntaxWarning: invalid decimal literal
:7: SyntaxWarning: "\z" is an invalid escape sequence. Such sequences will not work in the future. Did you mean "\z"? A raw string is also an option.
:10: SyntaxWarning: "\400" is an invalid octal escape sequence. Such sequences will not work in the future. Did you mean "\400"? A raw string is also an option.
:4: SyntaxWarning: invalid decimal literal
:7: SyntaxWarning: "\z" is an invalid escape sequence. Such sequences will not work in the future. Did you mean "\z"? A raw string is also an option.
:10: SyntaxWarning: "\400" is an invalid octal escape sequence. Such sequences will not work in the future. Did you mean "\400"? A raw string is also an option.
:4: SyntaxWarning: invalid decimal literal
:7: SyntaxWarning: "\z" is an invalid escape sequence. Such sequences will not work in the future. Did you mean "\z"? A raw string is also an option.
:10: SyntaxWarning: "\400" is an invalid octal escape sequence. Such sequences will not work in the future. Did you mean "\400"? A raw string is also an option.
[x] lib: cpython/Lib/contextlib.py
[x] test: cpython/Lib/test/test_contextlib.py
[x] test: cpython/Lib/test/test_contextlib_async.py

dependencies:

contextlib

dependent tests: (82 tests)

contextlib: test__colorize test_android test_argparse test_ast test_asyncgen test_asyncio test_bdb test_buffer test_builtin test_calendar test_call test_cmd_line_script test_code_module test_codecs test_compile test_compileall test_concurrent_futures test_contextlib test_contextlib_async test_coroutines test_ctypes test_dbm_dumb test_dbm_sqlite3 test_descr test_dis test_doctest test_email test_embed test_ensurepip test_faulthandler test_finalization test_functools test_generated_cases test_genericalias test_global test_httpservers test_imaplib test_importlib test_ipaddress test_iter test_launcher test_logging test_ordered_dict test_os test_pathlib test_pdb test_peg_generator test_pickle test_platform test_pprint test_profile test_pyclbr test_pydoc test_pyrepl test_regrtest test_repl test_resource test_runpy test_shutil test_socket test_socketserver test_sqlite3 test_ssl test_support test_sys_settrace test_tarfile test_tempfile test_tokenize test_tracemalloc test_typing test_unittest test_urllib2net test_urllibnet test_uuid test_venv test_weakref test_weakset test_with test_xml_etree test_xmlrpc test_zipfile test_zoneinfo

[ ] lib: cpython/Lib/unittest
[x] test: cpython/Lib/test/test_unittest

dependencies:

unittest (native: _io, _log, async_case, builtins, case, loader, main, os.path, result, runner, signals, suite, sys, time, unittest.util, util)
- argparse (native: sys)
- asyncio (native: _asyncio, _overlapped, _pyrepl.console, _pyrepl.main, _pyrepl.simple_interact, _remote_debugging, _winapi, asyncio.tools, base_events, collections.abc, concurrent.futures, coroutines, errno, events, exceptions, futures, graph, itertools, locks, log, math, msvcrt, protocols, queues, readline, runners, streams, sys, taskgroups, tasks, threads, time, timeouts, transports, unix_events, windows_events)
- io (native: _io, _thread, errno, msvcrt, sys)
- pkgutil (native: importlib.machinery, importlib.util, marshal, os.path, sys)
- _colorize, annotationlib, collections, contextlib, contextvars, dataclasses, difflib, fnmatch, functools, inspect, logging, os, pprint, re, signal, threading, traceback, types, warnings, weakref

dependent tests: (402 tests)

unittest: regrtestdata test___all__ test__colorize test__locale test__opcode test__osx_support test_abc test_abstract_numbers test_android test_annotationlib test_apple test_argparse test_array test_asdl_parser test_ast test_asyncgen test_asyncio test_atexit test_audit test_augassign test_base64 test_baseexception test_bdb test_bigaddrspace test_bigmem test_binascii test_binop test_bisect test_bool test_buffer test_builtin test_bytes test_bz2 test_c_locale_coercion test_calendar test_call test_charmapcodec test_class test_clinic test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_code_module test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_iso2022 test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_collections test_colorsys test_compare test_compile test_compileall test_complex test_concurrent_futures test_configparser test_contains test_context test_contextlib test_contextlib_async test_copy test_copyreg test_coroutines test_cprofile test_csv test_ctypes test_datetime test_dbm test_dbm_dumb test_dbm_sqlite3 test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_devpoll test_dict test_dictcomps test_dictviews test_difflib test_dis test_doctest test_doctest2 test_docxmlrpc test_dtrace test_dummy_thread test_dummy_threading test_dynamic test_dynamicclassattribute test_eintr test_email test_embed test_ensurepip test_enum test_enumerate test_eof test_epoll test_errno test_except_star test_exception_group test_exception_hierarchy test_exception_variations test_exceptions test_extcall test_external_inspection test_faulthandler test_fcntl test_file_eintr test_filecmp test_fileinput test_fileutils test_finalization test_float test_flufl test_fnmatch test_fork1 test_format test_fractions test_frame test_frozen test_fstring test_ftplib test_funcattrs test_functools test_future_stmt test_gc test_generated_cases test_generator_stop test_generators test_genericalias test_genericclass test_genericpath test_genexps test_getopt test_getpass test_gettext test_glob test_global test_grammar test_graphlib test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_html test_htmlparser test_http_cookiejar test_http_cookies test_httplib test_httpservers test_idle test_imaplib test_importlib test_index test_inspect test_int test_int_literal test_io test_ioctl test_ipaddress test_isinstance test_iter test_iterlen test_itertools test_json test_keyword test_keywordonlyarg test_kqueue test_launcher test_linecache test_list test_listcomps test_locale test_logging test_long test_longexp test_lzma test_mailbox test_marshal test_math test_math_integer test_math_property test_memoryview test_metaclass test_mimetypes test_minidom test_mmap test_modulefinder test_monitoring test_msvcrt test_multibytecodec test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_named_expressions test_netrc test_ntpath test_nturl2path test_numeric_tower test_opcache test_opcodes test_openpty test_operator test_optimizer test_optparse test_ordered_dict test_os test_osx_env test_pathlib test_patma test_pdb test_peepholer test_peg_generator test_pep646_syntax test_perfmaps test_pickle test_picklebuffer test_pickletools test_pkg test_pkgutil test_platform test_plistlib test_poll test_popen test_poplib test_positional_only_arg test_posixpath test_pow test_pprint test_print test_profile test_property test_pstats test_pty test_pulldom test_pwd test_py_compile test_pyclbr test_pydoc test_pyexpat test_pyrepl test_queue test_quopri test_raise test_random test_range test_re test_regrtest test_repl test_reprlib test_resource test_richcmp test_rlcompleter test_robotparser test_runpy test_sax test_sched test_scope test_script_helper test_secrets test_select test_selectors test_set test_setcomps test_shelve test_shlex test_shutil test_signal test_site test_slice test_smtplib test_smtpnet test_socket test_socketserver test_sort test_sqlite3 test_ssl test_stable_abi_ctypes test_stat test_statistics test_str test_strftime test_string test_string_literals test_stringprep test_strptime test_strtod test_struct test_structseq test_subclassinit test_subprocess test_sundry test_super test_support test_symtable test_syntax test_sys test_sys_setprofile test_sys_settrace test_sysconfig test_syslog test_tabnanny test_tarfile test_tempfile test_termios test_textwrap test_thread test_thread_local_bytecode test_threadedtempfile test_threading test_threading_local test_threadsignals test_time test_timeit test_timeout test_tokenize test_tomllib test_tools test_trace test_traceback test_tracemalloc test_tstring test_tty test_tuple test_turtle test_type_aliases test_type_annotations test_type_cache test_type_comments test_type_params test_typechecks test_types test_typing test_ucn test_unary test_unicode_file test_unicode_file_functions test_unicode_identifiers test_unicodedata test_unittest test_unpack test_unpack_ex test_unparse test_urllib test_urllib2 test_urllib2_localnet test_urllib2net test_urllib_response test_urllibnet test_urlparse test_userdict test_userlist test_userstring test_utf8_mode test_utf8source test_uuid test_venv test_wait3 test_wait4 test_wave test_weakref test_weakset test_webbrowser test_winapi test_winconsoleio test_winreg test_winsound test_with test_wmi test_wsgiref test_xml_dom_minicompat test_xml_dom_xmlbuilder test_xml_etree test_xml_etree_c test_xmlrpc test_xpickle test_xxlimited test_xxtestfuzz test_yield_from test_zipapp test_zipfile test_zipfile64 test_zipimport test_zipimport_support test_zlib test_zoneinfo test_zstd

[x] lib: cpython/Lib/collections
[x] lib: cpython/Lib/_collections_abc.py
[x] test: cpython/Lib/test/test_collections.py
[x] test: cpython/Lib/test/test_deque.py (TODO: 1)
[x] test: cpython/Lib/test/test_defaultdict.py
[x] test: cpython/Lib/test/test_ordered_dict.py

dependencies:

collections

dependent tests: (344 tests)

[x] lib: cpython/Lib/doctest.py
[x] test: cpython/Lib/test/test_doctest

dependencies:

doctest

dependent tests: (36 tests)

doctest: test_builtin test_cmd test_code test_collections test_ctypes test_decimal test_deque test_descrtut test_difflib test_doctest test_doctest2 test_enum test_extcall test_generators test_genexps test_getopt test_heapq test_http_cookies test_itertools test_listcomps test_math test_metaclass test_pdb test_pep646_syntax test_pickle test_pickletools test_setcomps test_statistics test_syntax test_threading_local test_typing test_unpack test_unpack_ex test_weakref test_zipimport test_zipimport_support

[x] lib: cpython/Lib/difflib.py
[x] test: cpython/Lib/test/test_difflib.py

dependencies:

difflib

dependent tests: (247 tests)

[ ] lib: cpython/Lib/test/libregrtest

dependencies:

regrtest (native: _abc, _overlapped, _thread, _winapi, builtins, cmdline, collections.abc, faulthandler, filter, findtests, gc, itertools, logger, math, msvcrt, os.path, parallel_case, pgo, refleak, resource, result, results, run_workers, runtests, save_env, setup, single, sys, termios, testresult, time, tsan, utils, win_utils, winreg, worker, xml.etree, xml.etree.ElementTree)
- libregrtest
- pickle (native: _pickle, itertools, sys)
- platform (native: _wmi, itertools, sys, vms_lib, winreg)
- subprocess (native: _posixsubprocess, _winapi, builtins, errno, fcntl, grp, msvcrt, pwd, select, sys, time)
- sysconfig (native: _sysconfig, _winapi, importlib.machinery, importlib.util, os.path, sys)
- trace (native: main, gc, sys, time)
- argparse, io, unittest
- _colorize, contextlib, copy, copyreg, dataclasses, datetime, doctest, fnmatch, functools, glob, importlib, inspect, json, linecache, locale, operator, os, queue, random, re, shlex, shutil, signal, stat, struct, tempfile, textwrap, threading, traceback, typing, warnings, weakref, zipimport

dependent tests: (no tests depend on regrtest)

Legend:

[+] path exists in CPython
[x] up-to-date, [ ] outdated

Refresh the canonical test_regrtest consumer and its direct runner/pythoninfo closure through scripts/update_lib at CPython d220409a13b77de7a6c30abe16ea90db01528edc. Preserve both existing expected-failure markers. This aligns the runner test with doctest reporting two failed examples and one skipped example. Assisted-by: OpenAI Codex: model version unavailable

Navigation Menu

Repository navigation

Align collections and testing libraries with Python 3.15 - #9192

Align collections and testing libraries with Python 3.15#9192
youknowdot wants to merge 2 commits into
RustPython:mainfrom
youknowdot:fix/testing-collections-315-main

youknowdot commented Oct 18, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Oct 18, 2026

Draft PR not reviewed

Uh oh!

github-actions Bot commented Oct 18, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

youknowdot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Hosted CI follow-up

Validation

Local coverage boundaries

AI assistance

Uh oh!

coderabbitai Bot commented Oct 18, 2026

Draft PR not reviewed

Uh oh!

github-actions Bot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Library Dependencies

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

youknowdot commented Oct 18, 2026 •

edited

Loading

github-actions Bot commented Oct 18, 2026 •

edited

Loading