🔀 Merge pull request #60 from davep/bump-textual

Bump Textual to v3.1.0

Author: davep

Diff for: ChangeLog.md

@@ -1,5 +1,16 @@
 # Peplum ChangeLog
 
+## Unreleased
+
+**Released: WiP**
+
+- Make Textual v3.1.0 the minimum required version, to take advantage of the
+  fix for [#58](https://github.com/davep/peplum/issues/58).
+  ([#60](https://github.com/davep/peplum/pull/60))
+- Add a workaround for
+  [textual#5742](https://github.com/Textualize/textual/issues/5742).
+  ([#60](https://github.com/davep/peplum/pull/60))
+
 ## v0.6.0
 
 **Released: 2025-04-09**

Diff for: pyproject.toml

@@ -7,7 +7,7 @@ authors = [
 ]
 dependencies = [
     "httpx>=0.28.1",
-    "textual>=3.0.1",
+    "textual>=3.1.0",
     "xdg-base-dirs>=6.0.2",
     "typing-extensions>=4.12.2",
     "packaging>=24.2",

Diff for: requirements-dev.lock

@@ -53,7 +53,7 @@ ghp-import==2.1.0
     # via mkdocs
 h11==0.14.0
     # via httpcore
-httpcore==1.0.7
+httpcore==1.0.8
     # via httpx
 httpx==0.28.1
     # via peplum
@@ -75,7 +75,7 @@ jinja2==3.1.6
     # via textual-serve
 linkify-it-py==2.0.3
     # via markdown-it-py
-markdown==3.7
+markdown==3.8
     # via mkdocs
     # via mkdocs-material
     # via pymdown-extensions
@@ -103,7 +103,7 @@ mkdocs-material-extensions==1.3.1
     # via mkdocs-material
 msgpack==1.1.0
     # via textual-dev
-multidict==6.3.2
+multidict==6.4.3
     # via aiohttp
     # via yarl
 mypy==1.15.0
@@ -155,7 +155,7 @@ six==1.17.0
     # via python-dateutil
 sniffio==1.3.1
     # via anyio
-textual==3.0.1
+textual==3.1.0
     # via peplum
     # via textual-dev
     # via textual-enhanced
@@ -168,14 +168,14 @@ textual-fspicker==0.4.1
     # via peplum
 textual-serve==1.1.1
     # via textual-dev
-typing-extensions==4.13.1
+typing-extensions==4.13.2
     # via mypy
     # via peplum
     # via textual
     # via textual-dev
 uc-micro-py==1.0.3
     # via linkify-it-py
-urllib3==2.3.0
+urllib3==2.4.0
     # via requests
 virtualenv==20.30.0
     # via pre-commit

Diff for: requirements.lock

@@ -17,7 +17,7 @@ certifi==2025.1.31
     # via httpx
 h11==0.14.0
     # via httpcore
-httpcore==1.0.7
+httpcore==1.0.8
     # via httpx
 httpx==0.28.1
     # via peplum
@@ -46,15 +46,15 @@ rich==14.0.0
     # via textual
 sniffio==1.3.1
     # via anyio
-textual==3.0.1
+textual==3.1.0
     # via peplum
     # via textual-enhanced
     # via textual-fspicker
 textual-enhanced==0.11.0
     # via peplum
 textual-fspicker==0.4.1
     # via peplum
-typing-extensions==4.13.1
+typing-extensions==4.13.2
     # via peplum
     # via textual
 uc-micro-py==1.0.3

Diff for: src/peplum/app/peplum.py

@@ -6,7 +6,7 @@
 
 ##############################################################################
 # Textual imports.
-from textual.app import InvalidThemeError
+from textual.app import InvalidThemeError, ScreenStackError
 
 ##############################################################################
 # Textual enhanced imports.
@@ -67,7 +67,10 @@ def __init__(self, arguments: Namespace) -> None:
                 self.theme = arguments.theme or configuration.theme
             except InvalidThemeError:
                 pass
-        self.update_keymap(configuration.bindings)
+        try:
+            self.update_keymap(configuration.bindings)
+        except ScreenStackError:  # https://github.com/Textualize/textual/issues/5742
+            pass
 
     def watch_theme(self) -> None:
         """Save the application's theme when it's changed."""