@@ -310,3 +310,4 @@ xibufferview
 xstat
 XXPRIME
 ENOTCAPABLE
+unmarshalled
@@ -305,3 +305,4 @@ xmlcharrefreplace
 xoptions
 xopts
 yieldfrom
+issubnormal
@@ -39,3 +39,4 @@ rustix
 struc
 unscanned
 zelf
+embedders
@@ -38,6 +38,8 @@ repos:
         entry: rustfmt
         language: system
         types: [rust]
+        # Keep the audited upstream source bytes and explicit backports intact.
+        exclude: '^vendor/(rustpython-ruff_python_parser|xml)/'
         priority: 0
 
       - id: generate-rs-opcode-metadata
@@ -67,6 +69,7 @@ repos:
     hooks:
       - id: cspell
         types: [rust]
+        exclude: '^vendor/(rustpython-ruff_python_parser|xml)/'
         additional_dependencies:
           - '@cspell/dict-en_us'
           - '@cspell/dict-cpp'
 
@@ -129,7 +129,9 @@ strip = true
 panic = "abort"
 
 [patch.crates-io]
+xml = { path = "vendor/xml" }
 parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
+rustpython-ruff_python_parser = { path = "vendor/rustpython-ruff_python_parser" }
 # REDOX START, Uncomment when you want to compile/check with redoxer
 # REDOX END
 
@@ -158,7 +160,7 @@ members = [
     ".",
     "crates/*",
 ]
-exclude = ["pymath"]
+exclude = ["pymath", "vendor/rustpython-ruff_python_parser", "vendor/xml"]
 
 [workspace.package]
 version = "0.6.1"
 
@@ -643,6 +643,7 @@ def get_argval_argrepr(self, op, arg, offset):
                 argrepr = _intrinsic_2_descs[arg]
             elif deop == LOAD_COMMON_CONSTANT:
                 obj = _common_constants[arg]
+                argval = obj
                 if isinstance(obj, type):
                     argrepr = obj.__name__
                 else:
@@ -692,10 +693,15 @@ def _get_const_value(op, arg, co_consts):
        Otherwise (if it is a LOAD_CONST and co_consts is not
        provided) returns the dis.UNKNOWN sentinel.
     """
-    assert op in hasconst or op == LOAD_SMALL_INT
+    assert op in hasconst or op == LOAD_SMALL_INT or op == LOAD_COMMON_CONSTANT
 
     if op == LOAD_SMALL_INT:
         return arg
+    if op == LOAD_COMMON_CONSTANT:
+        # Opargs 0-6 are callables; 7-11 are literal values.
+        if 7 <= arg <= 11:
+            return _common_constants[arg]
+        return UNKNOWN
     argval = UNKNOWN
     if co_consts is not None:
         argval = co_consts[arg]
@@ -1015,8 +1021,9 @@ def _find_imports(co):
         if op == IMPORT_NAME and i >= 2:
             from_op = opargs[i-1]
             level_op = opargs[i-2]
-            if (from_op[0] in hasconst and
-                (level_op[0] in hasconst or level_op[0] == LOAD_SMALL_INT)):
+            if ((from_op[0] in hasconst or from_op[0] == LOAD_COMMON_CONSTANT) and
+                (level_op[0] in hasconst or level_op[0] == LOAD_SMALL_INT or
+                 level_op[0] == LOAD_COMMON_CONSTANT)):
                 level = _get_const_value(level_op[0], level_op[1], consts)
                 fromlist = _get_const_value(from_op[0], from_op[1], consts)
                 yield (names[oparg >> 2], level, fromlist)
 
@@ -40,7 +40,11 @@
 _intrinsic_2_descs = _opcode.get_intrinsic2_descs()
 _special_method_names = _opcode.get_special_method_names()
 _common_constants = [builtins.AssertionError, builtins.NotImplementedError,
-                     builtins.tuple, builtins.all, builtins.any]
+                     builtins.tuple, builtins.all, builtins.any, builtins.list,
+                     builtins.set,
+                     # Append-only — must match CONSTANT_* in
+                     # Include/internal/pycore_opcode_utils.h.
+                     None, "", True, False, -1]
 _nb_ops = _opcode.get_nb_ops()
 
 hascompare = [opmap["COMPARE_OP"]]
 
@@ -220,6 +220,9 @@ def _safe_realpath(path):
     _PROJECT_BASE = _safe_realpath(os.environ["_PYTHON_PROJECT_BASE"])
 
 def is_python_build():
+    # RustPython reports source builds without CPython's Modules/Setup files.
+    if getattr(sys, '_is_python_build', False):
+        return True
     for fn in ("Setup", "Setup.local"):
         if os.path.isfile(os.path.join(_PROJECT_BASE, "Modules", fn)):
             return True
 
@@ -654,6 +654,13 @@ def f(x: 'int') -> 'str': ...
         result = get_annotations(f, eval_str=True)
         self.assertEqual(result, {'x': int, 'return': str})
 
+    def test_eval_str_wrapped_partial_cycle_self(self):
+        def f(x: 'int') -> 'str': ...
+        f.__wrapped__ = functools.partial(f, 0)
+        # Cycle is detected and broken; globals from f itself are used.
+        result = get_annotations(f, eval_str=True)
+        self.assertEqual(result, {'x': int, 'return': str})
+
     def test_eval_str_wrapped_cycle_mutual(self):
         # gh-146556: mutual __wrapped__ cycle (a -> b -> a) must not hang.
         def a(x: 'int'): ...
@@ -1874,6 +1881,10 @@ def nested():
             type_repr(Template("hi", Interpolation(42, "   "))),
             "Template('hi', Interpolation(42, '   ', None, ''))",
         )
+        self.assertEqual(
+            type_repr(Template("hi", Interpolation(42, "4!2"))),
+            "Template('hi', Interpolation(42, '4!2', None, ''))",
+        )
         # gh138558: perhaps in the future, we can improve this behavior:
         self.assertEqual(type_repr(Template(Interpolation(42, "99"))), "t'{99}'")
 
@@ -2133,8 +2144,13 @@ def f(a: unknown | str | int | list[str] | tuple[int, ...]): ...
         self.assertIsNone(fr.__resolved_str_cache__)
 
         self.assertEqual(fr.evaluate(format=Format.STRING), "unknown | str | int | list[str] | tuple[int, ...]")
+
+        # Test that the cache is now set correctly
         self.assertEqual(fr.__resolved_str_cache__, "unknown | str | int | list[str] | tuple[int, ...]")
 
+        # Test that future evaluations return the same cache
+        self.assertIs(fr.evaluate(format=Format.STRING), fr.__resolved_str_cache__)
+
     def test_evaluate_forwardref_format(self):
         fr = ForwardRef("undef")
         evaluated = fr.evaluate(format=Format.FORWARDREF)