micropython v1.25.0 merge: fix tests, fix typos, fix includes

dhalbert · dhalbert · commit b874e04166db · 2025-06-21T11:25:07.000-04:00
diff --git a/ports/litex/common-hal/microcontroller/Pin.h b/ports/litex/common-hal/microcontroller/Pin.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "py/mphal.h"
+#include "py/obj.h"
 
 
 typedef struct {
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -12,7 +12,8 @@ CFLAGS += \
 LDFLAGS += -fprofile-arcs -ftest-coverage
 
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
-USER_C_MODULES = $(TOP)/examples/usercmodule
+# CIRCUITPY-CHANGE: don't include user C modules
+# USER_C_MODULES = $(TOP)/examples/usercmodule
 
 # CIRCUITPY-CHANGE: use CircuitPython bindings and implementations
 SRC_QRIO := $(patsubst ../../%,%,$(wildcard ../../shared-bindings/qrio/*.c ../../shared-module/qrio/*.c ../../lib/quirc/lib/*.c))
diff --git a/ports/zephyr-cp/common-hal/microcontroller/Pin.h b/ports/zephyr-cp/common-hal/microcontroller/Pin.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "py/mphal.h"
+#include "py/obj.h"
 
 #include <zephyr/drivers/gpio.h>
 
diff --git a/py/emitnative.c b/py/emitnative.c
@@ -93,7 +93,7 @@
 #endif
 
 #ifndef N_XTENSAWIN
-#define N_XTENSWIN (0)
+#define N_XTENSAWIN (0)
 #endif
 
 #ifndef N_PRELUDE_AS_BYTES_OBJ
diff --git a/tests/extmod/re_sub.py b/tests/extmod/re_sub.py
@@ -49,7 +49,8 @@ def A():
 print(re.sub("a", "b", "c"))
 
 # with maximum substitution count specified
-if sys.implementation.name != "micropython":
+# CIRCUITPY-CHANGE: was "micropython"
+if sys.implementation.name != "circuitpython":
     # On CPython 3.13 and later the substitution count must be a keyword argument.
     print(re.sub("a", "b", "1a2a3a", count=2))
 else:
diff --git a/tests/misc/non_compliant.py.exp b/tests/misc/non_compliant.py.exp
@@ -13,8 +13,6 @@ NotImplementedError
 NotImplementedError
 NotImplementedError
 NotImplementedError
-b'\x01\x02'
-b'\x01\x00'
 NotImplementedError
 AttributeError
 TypeError
