Merge branch 'main' into patch-1

Author: zware

.github/workflows/downstream.yml

@@ -2,7 +2,15 @@ name: Run Downstream tests
 
 on:
   push:
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - '**.rst'
   pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - '**.rst'
   # Run weekly on Monday at 1:23 UTC
   schedule:
   - cron:  '23 1 * * 1'
@@ -25,7 +33,7 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.13"]
         include:
-          - os: macos-13
+          - os: macos-14
             python-version: "3.13"
 
     steps:

.github/workflows/test.yml

@@ -105,6 +105,7 @@ jobs:
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v5
       with:
+         token: ${{ secrets.CODECOV_TOKEN }}
          name: Test
          files: /home/runner/work/ipython/ipython/coverage.xml
 

IPython/core/async_helpers.py

@@ -136,20 +136,15 @@ def _pseudo_sync_runner(coro):
 
 
 def _should_be_async(cell: str) -> bool:
-    """Detect if a block of code need to be wrapped in an `async def`
+    """Detect if a block of code needs to be wrapped in an `async def`
 
-    Attempt to parse the block of code, it it compile we're fine.
-    Otherwise we  wrap if and try to compile.
-
-    If it works, assume it should be async. Otherwise Return False.
-
-    Not handled yet: If the block of code has a return statement as the top
-    level, it will be seen as async. This is a know limitation.
+    If the code block has a top-level return statement or is otherwise
+    invalid, `False` will be returned.
     """
     try:
         code = compile(
             cell, "<>", "exec", flags=getattr(ast, "PyCF_ALLOW_TOP_LEVEL_AWAIT", 0x0)
         )
         return inspect.CO_COROUTINE & code.co_flags == inspect.CO_COROUTINE
-    except (SyntaxError, MemoryError):
+    except (SyntaxError, ValueError, MemoryError):
         return False

IPython/core/interactiveshell.py

@@ -2141,7 +2141,7 @@ def get_exception_only(self, exc_tuple=None):
 
     def showtraceback(
         self,
-        exc_tuple: tuple[type[BaseException], BaseException, Any] | None = None,
+        exc_tuple: tuple[type[BaseException], BaseException, AnyType] | None = None,
         filename: str | None = None,
         tb_offset: int | None = None,
         exception_only: bool = False,

codecov.yml

@@ -5,14 +5,37 @@ coverage:
       default: false
       library:
         target: auto
-        paths: ['!.*/tests/.*']
+        paths:
+          - '!**/tests/**'
+          - '!**/testing/**'
         threshold: 0.1%
       tests:
         target: auto
-        paths: ['.*/tests/.*']
+        paths:
+          - '**/tests/**'
+          - '**/testing/**'
         threshold: 0.1%
+flag_management:
+  default_rules:
+    statuses:
+      - type: patch
+        target: auto%
+        threshold: 0.1%
+      - type: project
+        target: auto%
+        threshold: 0.1%
+  individual_flags:
+    - name: unit-tests
+      paths:
+        - '**/tests/**'
+        - '**/testing/**'
+    - name: library
+      paths:
+        - '!**/tests/**'
+        - '!**/testing/**'
 codecov:
   require_ci_to_pass: false
+  branch: main
 
 ignore:
   - IPython/kernel/*

docs/source/conf.py

@@ -92,6 +92,12 @@
     }
 )
 
+# External links configuration (replaces custom github extension)
+extlinks = {
+    "ghissue": ("https://github.com/ipython/ipython/issues/%s/", "#%s"),
+    "ghpull": ("https://github.com/ipython/ipython/pull/%s/", "PR #%s"),
+}
+
 
 # Options for HTML output
 # -----------------------

docs/source/sphinx.toml

@@ -13,11 +13,11 @@ extensions = [
     "sphinx.ext.inheritance_diagram",
     "sphinx.ext.intersphinx",
     "sphinx.ext.graphviz",
+    "sphinx.ext.extlinks",  # for easy GitHub links
     "sphinxcontrib.jquery",
     "IPython.sphinxext.ipython_console_highlighting",
     "IPython.sphinxext.ipython_directive",
     "sphinx.ext.napoleon",  # to preprocess docstrings
-    "github",  # for easy GitHub links
     "magics",
     "configtraits",
 ]

docs/sphinxext/github.py

@@ -4,6 +4,7 @@
 Should only trigger on python 3.5+ or will have syntax errors.
 """
 
+import sys
 from itertools import chain, repeat
 from textwrap import dedent, indent
 from typing import TYPE_CHECKING
@@ -44,6 +45,16 @@ async def awaitable():
             )
         )
 
+        self.assertFalse(_should_be_async("return await foo()"))
+        self.assertFalse(_should_be_async("return bar()"))
+        self.assertFalse(_should_be_async("some invalid Python code"))
+
+        self.assertFalse(_should_be_async("'\\ud800'"))
+        
+        if sys.version_info >= (3, 13):
+            # Note: the next assert assumes the tests run without the `-OO` flag
+            self.assertFalse(_should_be_async("'\\ud800'\nawait foo"))
+
     def _get_top_level_cases(self):
         # These are test cases that should be valid in a function
         # but invalid outside of a function.