Merge branch 'stable'

Author: davidism

.github/workflows/publish.yaml

@@ -63,6 +63,7 @@ jobs:
           CIBW_SKIP: pp*
           CIBW_ARCHS_LINUX: auto aarch64
           CIBW_ARCHS_MACOS: auto universal2
+          CIBW_ARCHS_WINDOWS: auto ARM64
           CIBW_ENABLE: cpython-freethreading
           CIBW_BUILD_FRONTEND: build[uv]
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

CHANGES.rst

@@ -4,6 +4,18 @@ Version 3.1.0
 Unreleased
 
 
+Version 3.0.3
+-------------
+
+Unreleased
+
+-   ``__version__`` raises ``DeprecationWarning`` instead of ``UserWarning``.
+    :issue:`487`
+-   Adopt multi-phase initialisation (:pep:`489`) for the C extension.
+    :issue:`494`
+-   Build Windows ARM64 wheels. :issue:`485`
+
+
 Version 3.0.2
 -------------
 

src/markupsafe/__init__.py

@@ -388,6 +388,7 @@ def __getattr__(name: str) -> t.Any:
             "The '__version__' attribute is deprecated and will be removed in"
             " MarkupSafe 3.1. Use feature detection, or"
             ' `importlib.metadata.version("markupsafe")`, instead.',
+            DeprecationWarning,
             stacklevel=2,
         )
         return importlib.metadata.version("markupsafe")

src/markupsafe/_speedups.c

@@ -175,30 +175,26 @@ static PyMethodDef module_methods[] = {
 	{NULL, NULL, 0, NULL}  /* Sentinel */
 };
 
+static PyModuleDef_Slot module_slots[] = {
+#ifdef Py_mod_multiple_interpreters  // Python 3.12+
+	{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
+#endif
+#ifdef Py_mod_gil  // Python 3.13+
+	{Py_mod_gil, Py_MOD_GIL_NOT_USED},
+#endif
+	{0, NULL}  /* Sentinel */
+};
+
 static struct PyModuleDef module_definition = {
-	PyModuleDef_HEAD_INIT,
-	"markupsafe._speedups",
-	NULL,
-	-1,
-	module_methods,
-	NULL,
-	NULL,
-	NULL,
-	NULL
+	.m_base = PyModuleDef_HEAD_INIT,
+	.m_name = "markupsafe._speedups",
+	.m_size = 0,
+	.m_methods = module_methods,
+	.m_slots = module_slots,
 };
 
 PyMODINIT_FUNC
 PyInit__speedups(void)
 {
-	PyObject *m = PyModule_Create(&module_definition);
-
-	if (m == NULL) {
-		return NULL;
-	}
-
-	#ifdef Py_GIL_DISABLED
-	PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
-	#endif
-
-	return m;
+	return PyModuleDef_Init(&module_definition);
 }

tests/test_ext_init.py

@@ -0,0 +1,27 @@
+import sys
+
+import pytest
+
+import markupsafe
+
+try:
+    from markupsafe import _speedups
+except ImportError:
+    _speedups = None  # type: ignore[assignment]
+
+
+@pytest.mark.skipif(_speedups is None, reason="speedups unavailable")
+def test_ext_init() -> None:
+    """Test that the extension module uses multi-phase init by checking that
+    uncached imports result in different module objects.
+    """
+    if markupsafe._escape_inner is not _speedups._escape_inner:  # type: ignore[attr-defined]
+        pytest.skip("speedups not active")
+
+    for k in [k for k in sys.modules if k.startswith("markupsafe")]:
+        del sys.modules[k]
+
+    import markupsafe._speedups as new
+
+    assert _speedups.__dict__ != new.__dict__
+    assert _speedups._escape_inner is not new._escape_inner