Various fixes and cleanup

Carreau · Carreau · commit d82469364438 · 2025-02-22T19:31:10.000+01:00
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
@@ -11,6 +11,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: t
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}
diff --git a/IPython/core/getipython.py b/IPython/core/getipython.py
@@ -1,4 +1,3 @@
-# encoding: utf-8
 """Simple function to call to get the current InteractiveShell instance
 """
 
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
@@ -111,7 +111,6 @@
 # it is too long.
 FAST_THRESHOLD = 10_000
 
-
 # ---------------------------------------------------------------------------
 class ListTB(TBTools):
     """Print traceback information from a traceback list, with optional color.
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -261,26 +261,10 @@ def sort(  # type:ignore[override]
         return type(self)([t[1] for t in dsu])
 
 
-# FIXME: We need to reimplement type specific displayhook and then add this
-# back as a custom printer. This should also be moved outside utils into the
-# core.
-
-# def print_slist(arg):
-#     """ Prettier (non-repr-like) and more informative printer for SList """
-#     print("SList (.p, .n, .l, .s, .grep(), .fields(), sort() available):")
-#     if hasattr(arg,  'hideonce') and arg.hideonce:
-#         arg.hideonce = False
-#         return
-#
-#     nlprint(arg)   # This was a nested list printer, now removed.
-#
-# print_slist = result_display.register(SList)(print_slist)
-
-
 def indent(instr: str, nspaces: int = 4, ntabs: int = 0, flatten: bool = False) -> str:
     """Indent a string a given number of spaces or tabstops.
 
-    indent(str,nspaces=4,ntabs=0) -> indent str by ntabs+nspaces.
+    indent(str, nspaces=4, ntabs=0) -> indent str by ntabs+nspaces.
 
     Parameters
     ----------
@@ -300,9 +284,7 @@ def indent(instr: str, nspaces: int = 4, ntabs: int = 0, flatten: bool = False)
     str : string indented by ntabs and nspaces.
 
     """
-    if instr is None:
-        return
-    ind = '\t'*ntabs+' '*nspaces
+    ind = "\t" * ntabs + " " * nspaces
     if flatten:
         pat = re.compile(r'^\s*', re.MULTILINE)
     else:
diff --git a/pyproject.toml b/pyproject.toml
@@ -110,6 +110,7 @@ all = [
     "ipython[test,test_extra]",
 ]
 
+
 [tool.mypy]
 python_version = "3.11"
 ignore_missing_imports = true
@@ -136,6 +137,9 @@ exclude = [
 disallow_incomplete_defs = true
 disallow_untyped_defs = true
 warn_redundant_casts = true
+#enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
+#warn_unreachable = true
+#strict = true
 
 [[tool.mypy.overrides]]
 module = [
@@ -316,6 +320,7 @@ check_untyped_defs = false
 disallow_untyped_decorators = false
 
 [tool.pytest.ini_options]
+minversion = "7"
 addopts = [
    "--durations=10",
    "-pIPython.testing.plugin.pytest_ipdoctest",
diff --git a/tests/test_completerlib.py b/tests/test_completerlib.py
@@ -174,7 +174,7 @@ def test_module_without_init():
 
     https://github.com/ipython/ipython/issues/11226
     """
-    fake_module_name = "foo"
+    fake_module_name = "foo_xder_134"
     with TemporaryDirectory() as tmpdir:
         sys.path.insert(0, tmpdir)
         try:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# encoding: utf-8`
`2`	`1`	`"""Simple function to call to get the current InteractiveShell instance`
`3`	`2`	`"""`
`4`	`3`