ipython 9.13.0__tar.gz → 9.14.0__tar.gz

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/debugger.py

@@ -515,6 +515,12 @@ class Pdb(OldPdb):
                 else:
                     self.error("No exception with that number")
 
+        def do_exception(self, arg):
+            """exception [number]
+            Alias for the ``exceptions`` command.
+            """
+            return self.do_exceptions(arg)
+
     def interaction(self, frame, tb_or_exc):
         try:
             if CHAIN_EXCEPTIONS:

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/history.py

@@ -47,7 +47,7 @@ from weakref import ref, WeakSet
 
 if TYPE_CHECKING:
     from IPython.core.interactiveshell import InteractiveShell
-    from IPython.config.Configuration import Configuration
+    from traitlets.config import Config as Configuration
 
 try:
     from sqlite3 import DatabaseError, OperationalError
@@ -696,7 +696,7 @@ class HistoryManager(HistoryAccessor):
                 self.hist_file,
                 exc_info=True,
             )
-            self.hist_file = ":memory:"
+            self._switch_to_memory_history()
 
         self.using_thread = False
         if self.enabled and self.hist_file != ":memory:":
@@ -708,7 +708,8 @@ class HistoryManager(HistoryAccessor):
                     "Failed to start history saving thread. History will not be saved.",
                     exc_info=True,
                 )
-                self.hist_file = ":memory:"
+                self._switch_to_memory_history()
+                self.save_thread = None
             else:
                 self.using_thread = True
         self._instances.add(self)
@@ -717,6 +718,16 @@ class HistoryManager(HistoryAccessor):
             HistoryManager._max_inst,
         )
 
+    def _switch_to_memory_history(self) -> None:
+        """Switch history storage to an in-memory SQLite database."""
+        try:
+            self.db.close()
+        except Exception:
+            pass
+        self.hist_file = ":memory:"
+        self.init_db()
+        self.new_session()
+
     def __del__(self) -> None:
         if self.save_thread is not None:
             self.save_thread.stop()
@@ -1176,7 +1187,7 @@ class HistorySavingThread(threading.Thread):
 
         self.save_flag.set()
         self._stopped = True
-        if self != threading.current_thread():
+        if self.ident is not None and self != threading.current_thread():
             self.join()
 
     def __del__(self) -> None:

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/interactiveshell.py

@@ -1024,19 +1024,19 @@ class InteractiveShell(SingletonConfigurable):
 
     @property
     def banner(self):
-        if (when := os.environ.get("SOURCE_DATE_EPOCH", None)) is not None:
+        banner = self.banner1
+        # Only use SOURCE_DATE_EPOCH if the user hasn't set a custom banner (default starts with "Python")
+        if banner is self.banner1 and (when := os.environ.get("SOURCE_DATE_EPOCH", None)) is not None:
             from datetime import datetime
-
             date = datetime.fromtimestamp(int(when))
-            return textwrap.dedent(
+            banner = textwrap.dedent(
                 f"""
-            Python 3.y.z | Packaged with love | (main, {date.strftime("%A, %d %B %Y")}) [Compiler]
-            Type 'copyright', 'credits' or 'license' for more information
-            IPython 9.y.z -- An enhanced Interactive Python. Type '?' for help.
-            Tip: unset SOURCE_DATE_EPOCH to restore dynamic banner.
-            """
+                Python 3.y.z | Packaged with love | (main, {date.strftime("%A, %d %B %Y")}) [Compiler]
+                Type 'copyright', 'credits' or 'license' for more information
+                IPython 9.y.z -- An enhanced Interactive Python. Type '?' for help.
+                Tip: unset SOURCE_DATE_EPOCH to restore dynamic banner.
+                """
             ).lstrip()
-        banner = self.banner1
         if self.profile and self.profile != 'default':
             banner += '\nIPython profile: %s\n' % self.profile
         if self.banner2:

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/kitty.py

@@ -10,7 +10,8 @@ def _supports_kitty_graphics() -> bool:
     if platform.system() not in ("Darwin", "Linux"):
         return False
 
-    if not sys.stdout.isatty():
+    isatty = getattr(sys.stdout, "isatty", None)
+    if not callable(isatty) or not isatty():
         return False
     # Hardcoding process names instead of using
     # https://sw.kovidgoyal.net/kitty/graphics-protocol/#querying-support-and-available-transmission-mediums

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/oinspect.py

@@ -1093,7 +1093,7 @@ class Inspector(Configurable):
         """
         Check whether the source *src* contains the docstring *doc*.
 
-        This is is helper function to skip displaying the docstring if the
+        This is a helper function to skip displaying the docstring if the
         source already contains it, avoiding repetition of information.
         """
         try:

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/release.py

@@ -16,7 +16,7 @@
 # release.  'dev' as a _version_extra string means this is a development
 # version
 _version_major = 9
-_version_minor = 13
+_version_minor = 14
 _version_patch = 0
 _version_extra = ".dev"
 # _version_extra = "b2"

{ipython-9.13.0 → ipython-9.14.0}/IPython/core/usage.py

@@ -46,7 +46,7 @@ Usage
     This file is typically installed in the `IPYTHONDIR` directory, and there
     is a separate configuration directory for each profile. The default profile
     directory will be located in $IPYTHONDIR/profile_default. IPYTHONDIR
-    defaults to to `$HOME/.ipython`.  For Windows users, $HOME resolves to
+    defaults to `$HOME/.ipython`.  For Windows users, $HOME resolves to
     C:\\Users\\YourUserName in most instances.
 
     To initialize a profile with the default configuration file, do::

{ipython-9.13.0 → ipython-9.14.0}/IPython/terminal/interactiveshell.py

@@ -401,7 +401,7 @@ class TerminalInteractiveShell(InteractiveShell):
 
     term_title_format = Unicode("IPython: {cwd}",
         help="Customize the terminal title format.  This is a python format string. " +
-             "Available substitutions are: {cwd}."
+             "Available substitutions include {cwd}."
     ).tag(config=True)
 
     display_completions = Enum(('column', 'multicolumn','readlinelike'),
@@ -745,13 +745,13 @@ class TerminalInteractiveShell(InteractiveShell):
 
     prompt_line_number_format = Unicode(
         "",
-        help="The format for line numbering, will be passed `line` (int, 1 based)"
-        " the current line number and `rel_line` the relative line number."
-        " for example to display both you can use the following template string :"
-        " c.TerminalInteractiveShell.prompt_line_number_format='{line: 4d}/{rel_line:+03d} | '"
-        " This will display the current line number, with leading space and a width of at least 4"
-        " character, as well as the relative line number 0 padded and always with a + or - sign."
-        " Note that when using Emacs mode the prompt of the first line may not update.",
+        help="The format for line numbering. Will be passed the current line number"
+        " ``line`` (int, 1 based), and the relative line number ``rel_line``."
+        " For example to display both, you can use the following template string:"
+        " ``c.TerminalInteractiveShell.prompt_line_number_format = '{line: 4d}/{rel_line:+03d} | '``"
+        " This will display the current line number, with a leading space and a width of at least 4"
+        " characters, as well as the relative line number, 0-padded and always with a + or - sign."
+        " Note that when using Emacs mode, the prompt of the first line may not update.",
     ).tag(config=True)
 
     @observe('term_title')

{ipython-9.13.0 → ipython-9.14.0}/IPython/utils/_sysinfo.py

@@ -1,2 +1,2 @@
 # GENERATED BY setup.py
-commit = "7c1654d"
+commit = "9d1f24b"

{ipython-9.13.0/ipython.egg-info → ipython-9.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.13.0
+Version: 9.14.0
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org
@@ -33,7 +33,7 @@ Requires-Dist: jedi>=0.18.2
 Requires-Dist: matplotlib-inline>=0.1.6
 Requires-Dist: pexpect>4.6; sys_platform != "win32" and sys_platform != "emscripten"
 Requires-Dist: prompt_toolkit<3.1.0,>=3.0.41
-Requires-Dist: psutil>=7
+Requires-Dist: psutil>=7; sys_platform != "emscripten"
 Requires-Dist: pygments>=2.14.0
 Requires-Dist: stack_data>=0.6.0
 Requires-Dist: traitlets>=5.13.0

{ipython-9.13.0 → ipython-9.14.0}/docs/requirements.txt

@@ -10,3 +10,4 @@ docrepr
 prompt_toolkit
 ipykernel
 intersphinx_registry
+sphinx_toml

{ipython-9.13.0 → ipython-9.14.0}/docs/source/_templates/breadcrumbs.html

@@ -2,6 +2,8 @@
 
 {% block breadcrumbs_aside %}
 {% if not meta or meta.get('github_url') != 'hide' %}
-{{ super() }}
+  {% if not pagename.startswith('api/generated/') %}
+    {{ super() }}
+  {% endif %}
 {% endif %}
-{% endblock %}
+{% endblock %}

{ipython-9.13.0 → ipython-9.14.0}/docs/source/config/details.rst

@@ -26,7 +26,7 @@ multiple configuration options to be set to properly work:
 
  - Configure said provider with models, API keys, etc – this will depend on the
    provider, and you will have to refer to Jupyter-AI documentation, and/or your
-   LLM documenatation.
+   LLM documentation.
 
 
 While setting up IPython to use a real LLM, you can refer to
@@ -88,7 +88,7 @@ by setting the ``llm_construction_kwargs`` traitlet.
 
     c.TerminalInteractiveShell.llm_constructor_kwargs = {"model": "skynet"}
 
-This will depdend on the provider you chose, and you will have to refer to
+This will depend on the provider you chose, and you will have to refer to
 the provider documentation.
 
 Extra configuration may be needed by setting environment variables, this will

{ipython-9.13.0 → ipython-9.14.0}/docs/source/interactive/autoawait.rst

@@ -312,7 +312,7 @@ task is running, if and only if the foreground task is async::
    In [4]: await asyncio.sleep(3)
    background 4
    background 5
-   background 6g
+   background 6
 
 In a Notebook, QtConsole, or any other frontend using IPykernel, background
 tasks should behave as expected.

{ipython-9.13.0 → ipython-9.14.0}/docs/source/whatsnew/version0.11.rst

@@ -200,7 +200,7 @@ requests and 285 regular issues (:ref:`a full list with links
 pull requests are a fantastic mechanism for reviewing code and building a
 shared ownership of the project, and we are making enthusiastic use of it.
 
-.. Note::
+.. note::
 
    This undercounts the number of issues closed in this development cycle,
    since we only moved to github for issue tracking in May 2010, but we have no

{ipython-9.13.0 → ipython-9.14.0}/docs/source/whatsnew/version9.rst

@@ -2,6 +2,76 @@
  9.x Series
 ============
 
+.. _version 9.14:
+
+IPython 9.14
+------------
+
+Summary
+~~~~~~~
+
+This release is mostly a maintenance release, with fixes for SQLite history
+handling, terminal image rendering, reproducible banner output, Pyodide
+support, and a number of documentation improvements.
+
+- :ghpull:`15204` Fix history memory fallback after SQLite lock
+- :ghpull:`15208` Fix banner customization when ``SOURCE_DATE_EPOCH`` is set
+- :ghpull:`15196` Handle stdout without ``isatty`` in kitty support check
+- :ghpull:`15190` Avoid ``psutil`` requirement on emscripten
+- :ghpull:`15206` Accept singular pdb exception command
+- :ghpull:`15203` Fix incorrect ``Configuration`` type import
+- :ghpull:`15179` Copyedit ``prompt_line_number_format`` description
+- :ghpull:`15209` Fix typos in user-facing documentation
+- :ghpull:`15211` Fix duplicated words in ``usage.py`` and ``oinspect.py`` docstrings
+- :ghpull:`15215` Fix terminal title config description
+- :ghpull:`15218` Fix broken 'Edit on GitHub' link for auto-generated API docs
+- :ghpull:`15224` Fix docstring formatting for ``prompt_line_number_format`` help text
+
+
+SQLite History Fallback Fix
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When file-backed SQLite history could not create a new session (for example
+because the ``history.sqlite`` file was locked by another running session), the
+fallback only changed ``hist_file`` to ``:memory:`` while the existing
+connection still pointed at the locked on-disk database. Later history writes
+could therefore keep raising ``sqlite3.OperationalError: database is locked``.
+The fallback now closes the current connection, switches to an in-memory
+database, and creates a fresh history session there (:ghpull:`15204`).
+
+
+Reproducible Banner Output
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Banner customization now honors the ``SOURCE_DATE_EPOCH`` environment variable,
+fixing reproducible-build setups that pin the date (:ghpull:`15208`).
+
+
+Terminal Image Rendering Robustness
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Kitty graphics protocol support check now handles the case where ``stdout``
+has no ``isatty`` method, avoiding an ``AttributeError`` in some embedded or
+redirected-output environments (:ghpull:`15196`).
+
+
+Pyodide / Emscripten Support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+IPython no longer requires ``psutil`` on the emscripten platform, where it is
+not available (:ghpull:`15190`).
+
+
+Thanks
+~~~~~~
+
+Thanks as well to the `D. E. Shaw group <https://deshaw.com/>`_ for sponsoring
+work on IPython.
+
+As usual, you can find the full list of PRs on GitHub under `the 9.14
+<https://github.com/ipython/ipython/milestone/164?closed=1>`__ milestone.
+
+
 .. _version 9.13:
 
 IPython 9.13

{ipython-9.13.0 → ipython-9.14.0/ipython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipython
-Version: 9.13.0
+Version: 9.14.0
 Summary: IPython: Productive Interactive Computing
 Author: The IPython Development Team
 Author-email: ipython-dev@python.org
@@ -33,7 +33,7 @@ Requires-Dist: jedi>=0.18.2
 Requires-Dist: matplotlib-inline>=0.1.6
 Requires-Dist: pexpect>4.6; sys_platform != "win32" and sys_platform != "emscripten"
 Requires-Dist: prompt_toolkit<3.1.0,>=3.0.41
-Requires-Dist: psutil>=7
+Requires-Dist: psutil>=7; sys_platform != "emscripten"
 Requires-Dist: pygments>=2.14.0
 Requires-Dist: stack_data>=0.6.0
 Requires-Dist: traitlets>=5.13.0

{ipython-9.13.0 → ipython-9.14.0}/ipython.egg-info/SOURCES.txt

@@ -405,6 +405,7 @@ tests/test_interactivshell.py
 tests/test_io.py
 tests/test_iplib.py
 tests/test_ipunittest.py
+tests/test_kitty.py
 tests/test_latextools.py
 tests/test_logger.py
 tests/test_magic.py

{ipython-9.13.0 → ipython-9.14.0}/ipython.egg-info/requires.txt

@@ -3,7 +3,6 @@ ipython-pygments-lexers>=1.0.0
 jedi>=0.18.2
 matplotlib-inline>=0.1.6
 prompt_toolkit<3.1.0,>=3.0.41
-psutil>=7
 pygments>=2.14.0
 stack_data>=0.6.0
 traitlets>=5.13.0
@@ -11,6 +10,9 @@ traitlets>=5.13.0
 [:python_version < "3.12"]
 typing_extensions>=4.6
 
+[:sys_platform != "emscripten"]
+psutil>=7
+
 [:sys_platform != "win32" and sys_platform != "emscripten"]
 pexpect>4.6
 

{ipython-9.13.0 → ipython-9.14.0}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "matplotlib-inline>=0.1.6",
     'pexpect>4.6; sys_platform != "win32" and sys_platform != "emscripten"',
     "prompt_toolkit>=3.0.41,<3.1.0",
-    "psutil>=7",
+    'psutil>=7; sys_platform != "emscripten"',
     "pygments>=2.14.0", # wheel
     "stack_data>=0.6.0",
     "traitlets>=5.13.0",

{ipython-9.13.0 → ipython-9.14.0}/tests/test_debugger.py

@@ -279,6 +279,19 @@ def test_interruptible_core_debugger():
         sys.settrace(tracer_orig)
 
 
+@pytest.mark.skipif(
+    not debugger.CHAIN_EXCEPTIONS,
+    reason="chained exception navigation is not available",
+)
+def test_exception_command_aliases_exceptions():
+    ipdb = debugger.Pdb()
+
+    with patch.object(ipdb, "do_exceptions", return_value=True) as do_exceptions:
+        assert ipdb.onecmd("exception 0") is True
+
+    do_exceptions.assert_called_once_with("0")
+
+
 @skip_win32
 def test_xmode_skip():
     """that xmode skip frames

{ipython-9.13.0 → ipython-9.14.0}/tests/test_history.py

@@ -8,6 +8,7 @@
 import io
 import gc
 import os
+import sqlite3
 import sys
 import tempfile
 from datetime import datetime
@@ -274,6 +275,72 @@ def test_hist_file_config(hmmax3):
             HistoryManager.__max_inst = 1
 
 
+def test_histmanager_memory_fallback_reopens_db(hmmax3, tmp_path, caplog):
+    hist_file = tmp_path / "history.sqlite"
+    ip = get_ipython()
+    hm1 = None
+    hm2 = None
+    lock = None
+    try:
+        hm1 = HistoryManager(shell=ip, hist_file=hist_file)
+        hm1.end_session()
+        hm1.save_thread.stop()
+        hm1.db.close()
+
+        lock = sqlite3.connect(hist_file)
+        lock.execute("BEGIN IMMEDIATE")
+
+        hm2 = HistoryManager(shell=ip, hist_file=hist_file)
+        assert hm2.hist_file == ":memory:"
+        assert hm2.db.execute("PRAGMA database_list").fetchall() == [(0, "main", "")]
+
+        hm2.store_inputs(1, "a = 1")
+        hm2.writeout_cache()
+        assert list(hm2.get_tail(1, include_latest=True)) == [
+            (hm2.session_number, 1, "a = 1")
+        ]
+    finally:
+        if hm2 is not None:
+            hm2.end_session()
+            hm2.db.close()
+        if lock is not None:
+            lock.rollback()
+            lock.close()
+        hm1 = None
+        hm2 = None
+        caplog.clear()
+        gc.collect()
+
+
+def test_histmanager_thread_start_failure_uses_memory(
+    hmmax2, tmp_path, monkeypatch, caplog
+):
+    def fail_start(self):
+        raise RuntimeError("thread unavailable")
+
+    monkeypatch.setattr("IPython.core.history.HistorySavingThread.start", fail_start)
+
+    hm = None
+    try:
+        hm = HistoryManager(shell=get_ipython(), hist_file=tmp_path / "history.sqlite")
+        assert hm.hist_file == ":memory:"
+        assert hm.db.execute("PRAGMA database_list").fetchall() == [(0, "main", "")]
+        assert hm.save_thread is None
+
+        hm.store_inputs(1, "a = 1")
+        hm.writeout_cache()
+        assert list(hm.get_tail(1, include_latest=True)) == [
+            (hm.session_number, 1, "a = 1")
+        ]
+    finally:
+        if hm is not None:
+            hm.end_session()
+            hm.db.close()
+        hm = None
+        caplog.clear()
+        gc.collect()
+
+
 def test_histmanager_disabled(hmmax2):
     """Ensure that disabling the history manager doesn't create a database."""
     cfg = Config()

ipython-9.14.0/tests/test_kitty.py

@@ -0,0 +1,50 @@
+import subprocess
+import sys
+from pathlib import Path
+
+
+class DummyStdout:
+    def write(self, *args, **kwargs):
+        pass
+
+    def flush(self):
+        pass
+
+
+class StdoutWithNonCallableIsatty(DummyStdout):
+    isatty = False
+
+
+def test_supports_kitty_graphics_handles_stdout_without_callable_isatty(monkeypatch):
+    import platform
+
+    from IPython.core import kitty
+
+    monkeypatch.setattr(platform, "system", lambda: "Linux")
+    for stdout in (DummyStdout(), StdoutWithNonCallableIsatty()):
+        monkeypatch.setattr(sys, "stdout", stdout)
+        assert kitty._supports_kitty_graphics() is False
+
+
+def test_import_ipython_handles_stdout_without_isatty():
+    code = """
+import sys
+
+class DummyFile:
+    def write(self, *args, **kwargs):
+        pass
+
+    def flush(self):
+        pass
+
+sys.stdout = DummyFile()
+import IPython
+"""
+    repo_root = Path(__file__).resolve().parents[1]
+    result = subprocess.run(
+        [sys.executable, "-c", code],
+        cwd=repo_root,
+        capture_output=True,
+        text=True,
+    )
+    assert result.returncode == 0, result.stderr