Merge branch 'master' into fix/17870

Author: Mr-Sunglasses

.pre-commit-config.yaml

@@ -6,12 +6,12 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1  # must match test-requirements.txt
+    rev: 24.8.0  # must match test-requirements.txt
     hooks:
       - id: black
         exclude: '^(test-data/)'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0  # must match test-requirements.txt
+    rev: v0.6.9  # must match test-requirements.txt
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]

mypy/fastparse.py

@@ -2033,7 +2033,7 @@ def visit_UnaryOp(self, n: UnaryOp) -> Type:
         if (
             isinstance(typ, RawExpressionType)
             # Use type() because we do not want to allow bools.
-            and type(typ.literal_value) is int  # noqa: E721
+            and type(typ.literal_value) is int
         ):
             if isinstance(n.op, USub):
                 typ.literal_value *= -1

mypy/ipc.py

@@ -17,9 +17,8 @@
 
 if sys.platform == "win32":
     # This may be private, but it is needed for IPC on Windows, and is basically stable
-    import ctypes
-
     import _winapi
+    import ctypes
 
     _IPCHandle = int
 

mypy/server/astmerge.py

@@ -160,7 +160,7 @@ def replacement_map_from_symbol_table(
         ):
             new_node = new[name]
             if (
-                type(new_node.node) == type(node.node)  # noqa: E721
+                type(new_node.node) == type(node.node)
                 and new_node.node
                 and node.node
                 and new_node.node.fullname == node.node.fullname

mypy/stubtest.py

@@ -700,7 +700,7 @@ def _verify_arg_default_value(
                         stub_default != runtime_arg.default
                         # We want the types to match exactly, e.g. in case the stub has
                         # True and the runtime has 1 (or vice versa).
-                        or type(stub_default) is not type(runtime_arg.default)  # noqa: E721
+                        or type(stub_default) is not type(runtime_arg.default)
                     )
                 ):
                     yield (

mypy/util.py

@@ -15,9 +15,8 @@
 from typing_extensions import Literal
 
 try:
-    import curses
-
     import _curses  # noqa: F401
+    import curses
 
     CURSES_ENABLED = True
 except ImportError:

mypyc/lib-rt/pythoncapi_compat.h

@@ -1537,7 +1537,7 @@ static inline int PyUnicode_Equal(PyObject *str1, PyObject *str2)
     }
 
 #if PY_VERSION_HEX >= 0x030d0000 && !defined(PYPY_VERSION)
-    extern int _PyUnicode_Equal(PyObject *str1, PyObject *str2);
+    PyAPI_FUNC(int) _PyUnicode_Equal(PyObject *str1, PyObject *str2);
 
     return _PyUnicode_Equal(str1, str2);
 #elif PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION)
@@ -1564,7 +1564,7 @@ static inline PyObject* PyBytes_Join(PyObject *sep, PyObject *iterable)
 static inline Py_hash_t Py_HashBuffer(const void *ptr, Py_ssize_t len)
 {
 #if PY_VERSION_HEX >= 0x03000000 && !defined(PYPY_VERSION)
-    extern Py_hash_t _Py_HashBytes(const void *src, Py_ssize_t len);
+    PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void *src, Py_ssize_t len);
 
     return _Py_HashBytes(ptr, len);
 #else

mypyc/lib-rt/pythonsupport.h

@@ -402,45 +402,15 @@ _CPyObject_HasAttrId(PyObject *v, _Py_Identifier *name) {
     PyObject_CallMethodObjArgs((self), (name), (arg), NULL)
 #endif
 
-#if CPY_3_13_FEATURES
-
-// These are copied from genobject.c in Python 3.13
-
-/* Returns a borrowed reference */
-static inline PyCodeObject *
-_PyGen_GetCode(PyGenObject *gen) {
-    _PyInterpreterFrame *frame = (_PyInterpreterFrame *)(gen->gi_iframe);
-    return _PyFrame_GetCode(frame);
-}
-
-static int
-gen_is_coroutine(PyObject *o)
-{
-    if (PyGen_CheckExact(o)) {
-        PyCodeObject *code = _PyGen_GetCode((PyGenObject*)o);
-        if (code->co_flags & CO_ITERABLE_COROUTINE) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-#elif CPY_3_12_FEATURES
+#if CPY_3_12_FEATURES
 
 // These are copied from genobject.c in Python 3.12
 
-/* Returns a borrowed reference */
-static inline PyCodeObject *
-_PyGen_GetCode(PyGenObject *gen) {
-    _PyInterpreterFrame *frame = (_PyInterpreterFrame *)(gen->gi_iframe);
-    return frame->f_code;
-}
-
 static int
 gen_is_coroutine(PyObject *o)
 {
     if (PyGen_CheckExact(o)) {
-        PyCodeObject *code = _PyGen_GetCode((PyGenObject*)o);
+        PyCodeObject *code = PyGen_GetCode((PyGenObject*)o);
         if (code->co_flags & CO_ITERABLE_COROUTINE) {
             return 1;
         }

pyproject.toml

@@ -66,8 +66,10 @@ ignore = [
   "E2",    # conflicts with black
   "E402",  # module level import not at top of file
   "E501",  # conflicts with black
+  "E721",  # Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance checks
   "E731",  # Do not assign a `lambda` expression, use a `def`
   "E741",  # Ambiguous variable name
+  "UP031", # Use format specifiers instead of percent format
   "UP032", # 'f-string always preferable to format' is controversial
   "C416",  # There are a few cases where it's nice to have names for the dict items
 ]

test-requirements.in

@@ -4,14 +4,15 @@
 -r mypy-requirements.txt
 -r build-requirements.txt
 attrs>=18.0
-black==24.3.0  # must match version in .pre-commit-config.yaml
+black==24.8.0  # must match version in .pre-commit-config.yaml
 filelock>=3.3.0
 # lxml 4.9.3 switched to manylinux_2_28, the wheel builder still uses manylinux2014
 lxml>=4.9.1,<4.9.3; (python_version<'3.11' or sys_platform!='win32') and python_version<'3.12'
 psutil>=4.0
 pytest>=8.1.0
 pytest-xdist>=1.34.0
 pytest-cov>=2.10.0
-ruff==0.2.0  # must match version in .pre-commit-config.yaml
+ruff==0.6.9  # must match version in .pre-commit-config.yaml
 setuptools>=65.5.1
 tomli>=1.1.0  # needed even on py311+ so the self check passes with --python-version 3.8
+pre_commit>=3.5.0