Merge branch 'main' into gh-138514-fix-getpass-echo-char

Author: bkjoh

.github/workflows/jit.yml

@@ -72,10 +72,10 @@ jobs:
         include:
           - target: i686-pc-windows-msvc/msvc
             architecture: Win32
-            runner: windows-latest
+            runner: windows-2022
           - target: x86_64-pc-windows-msvc/msvc
             architecture: x64
-            runner: windows-latest
+            runner: windows-2022
           - target: aarch64-pc-windows-msvc/msvc
             architecture: ARM64
             runner: windows-11-arm

.github/workflows/reusable-windows-msi.yml

@@ -17,7 +17,7 @@ env:
 jobs:
   build:
     name: installer for ${{ inputs.arch }}
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}

.github/workflows/reusable-windows.yml

@@ -21,7 +21,7 @@ env:
 jobs:
   build:
     name: Build and test (${{ inputs.arch }})
-    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
+    runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-2022' }}
     timeout-minutes: 60
     env:
       ARCH: ${{ inputs.arch }}

.github/workflows/tail-call.yml

@@ -49,13 +49,13 @@ jobs:
         include:
 #          - target: i686-pc-windows-msvc/msvc
 #            architecture: Win32
-#            runner: windows-latest
+#            runner: windows-2022
           - target: x86_64-pc-windows-msvc/msvc
             architecture: x64
-            runner: windows-latest
+            runner: windows-2022
 #          - target: aarch64-pc-windows-msvc/msvc
 #            architecture: ARM64
-#            runner: windows-latest
+#            runner: windows-2022
           - target: x86_64-apple-darwin/clang
             architecture: x86_64
             runner: macos-13

Grammar/python.gram

@@ -1315,6 +1315,14 @@ invalid_assert_stmt:
             a, b,
             "cannot assign to %s here. Maybe you meant '==' instead of '='?",
             _PyPegen_get_expr_name(a)) }
+    | 'assert' a=expression ':=' b=expression {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(
+            a, b,
+            "cannot use named expression without parentheses here") }
+    | 'assert' expression ',' a=expression ':=' b=expression {
+        RAISE_SYNTAX_ERROR_KNOWN_RANGE(
+            a, b,
+            "cannot use named expression without parentheses here") }
 invalid_block:
     | NEWLINE !INDENT { RAISE_INDENTATION_ERROR("expected an indented block") }
 invalid_comprehension:

Include/internal/pycore_magic_number.h

@@ -279,11 +279,13 @@ Known values:
     Python 3.14b1 3624 (Don't optimize LOAD_FAST when local is killed by DELETE_FAST)
     Python 3.14b3 3625 (Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST)
     Python 3.14rc2 3626 (Fix missing exception handlers in logical expression)
+    Python 3.14rc3 3627 (Fix miscompilation of some module-level annotations)
     Python 3.15a0 3650 (Initial version)
     Python 3.15a1 3651 (Simplify LOAD_CONST)
     Python 3.15a1 3652 (Virtual iterators)
     Python 3.15a1 3653 (Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST)
     Python 3.15a1 3654 (Fix missing exception handlers in logical expression)
+    Python 3.15a1 3655 (Fix miscompilation of some module-level annotations)
 
 
     Python 3.16 will start with 3700
@@ -297,7 +299,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3654
+#define PYC_MAGIC_NUMBER 3655
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

Include/pymath.h

@@ -57,9 +57,24 @@
 
 /* Py_NAN: Value that evaluates to a quiet Not-a-Number (NaN).  The sign is
  * undefined and normally not relevant, but e.g. fixed for float("nan").
+ *
+ * Note: On Solaris, NAN is a function address, hence arithmetic is impossible.
+ * For that reason, we instead use the built-in call if available or fallback
+ * to a generic NaN computed from strtod() as a last resort.
+ *
+ * See https://github.com/python/cpython/issues/136006 for details.
  */
 #if !defined(Py_NAN)
-#    define Py_NAN ((double)NAN)
+#  if defined(__sun)
+#    if _Py__has_builtin(__builtin_nanf)
+#       define Py_NAN   ((double)__builtin_nanf(""))
+#    else
+#       include <stdlib.h>
+#       define Py_NAN   (strtod("NAN", NULL))
+#    endif
+#  else
+#    define Py_NAN      ((double)NAN)
+#  endif
 #endif
 
 #endif /* Py_PYMATH_H */