🔀 Merge pull request #28 from davep/become-enhanced

Move a load of code out into textual-enhanced

pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
     "packaging>=24.2",
     "humanize>=4.11.0",
     "textual-fspicker>=0.2.0",
+    "textual-enhanced>=0.3.0",
 ]
 readme = "README.md"
 requires-python = ">= 3.9"

requirements-dev.lock

@@ -22,9 +22,9 @@ aiosignal==1.3.2
     # via aiohttp
 anyio==4.8.0
     # via httpx
-attrs==24.3.0
+attrs==25.1.0
     # via aiohttp
-certifi==2024.12.14
+certifi==2025.1.31
     # via httpcore
     # via httpx
 cfgv==3.4.0
@@ -33,7 +33,7 @@ click==8.1.8
     # via textual-dev
 distlib==0.3.9
     # via virtualenv
-filelock==3.16.1
+filelock==3.17.0
     # via virtualenv
 frozenlist==1.5.0
     # via aiohttp
@@ -46,7 +46,7 @@ httpx==0.28.1
     # via peplum
 humanize==4.11.0
     # via peplum
-identify==2.6.5
+identify==2.6.6
     # via pre-commit
 idna==3.10
     # via anyio
@@ -87,7 +87,7 @@ platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
-pre-commit==4.0.1
+pre-commit==4.1.0
 propcache==0.2.1
     # via aiohttp
     # via yarl
@@ -104,9 +104,12 @@ sniffio==1.3.1
 textual==1.0.0
     # via peplum
     # via textual-dev
+    # via textual-enhanced
     # via textual-fspicker
     # via textual-serve
 textual-dev==1.7.0
+textual-enhanced==0.3.0
+    # via peplum
 textual-fspicker==0.2.0
     # via peplum
 textual-serve==1.1.1
@@ -118,7 +121,7 @@ typing-extensions==4.12.2
     # via textual-dev
 uc-micro-py==1.0.3
     # via linkify-it-py
-virtualenv==20.28.1
+virtualenv==20.29.1
     # via pre-commit
 xdg-base-dirs==6.0.2
     # via peplum

requirements.lock

@@ -12,7 +12,7 @@
 -e file:.
 anyio==4.8.0
     # via httpx
-certifi==2024.12.14
+certifi==2025.1.31
     # via httpcore
     # via httpx
 h11==0.14.0
@@ -48,7 +48,10 @@ sniffio==1.3.1
     # via anyio
 textual==1.0.0
     # via peplum
+    # via textual-enhanced
     # via textual-fspicker
+textual-enhanced==0.3.0
+    # via peplum
 textual-fspicker==0.2.0
     # via peplum
 typing-extensions==4.12.2

src/peplum/app/commands/__init__.py

@@ -7,7 +7,6 @@
 
 ##############################################################################
 # Local imports.
-from .base import Command
 from .filtering import (
     Search,
     SearchAuthor,
@@ -21,8 +20,6 @@
     ChangeTheme,
     EditNotes,
     Escape,
-    Help,
-    Quit,
     RedownloadPEPs,
     TogglePEPDetails,
     ViewPEP,
@@ -38,13 +35,10 @@
 ##############################################################################
 # Exports.
 __all__ = [
-    "Command",
     "ChangeTheme",
     "EditNotes",
     "Escape",
     "FindPEP",
-    "Help",
-    "Quit",
     "RedownloadPEPs",
     "Search",
     "SearchAuthor",

src/peplum/app/commands/filtering.py

@@ -1,8 +1,8 @@
 """Provides command-oriented messages that relate to filtering."""
 
 ##############################################################################
-# Local imports.
-from .base import Command
+# Textual enhanced imports.
+from textual_enhanced.commands import Command
 
 
 ##############################################################################

src/peplum/app/commands/finding.py

@@ -1,8 +1,8 @@
 """Commands related to finding things."""
 
 ##############################################################################
-# Local imports.
-from .base import Command
+# Textual enhanced imports.
+from textual_enhanced.commands import Command
 
 
 ##############################################################################

src/peplum/app/commands/main.py

@@ -1,8 +1,8 @@
 """The main commands used within the application."""
 
 ##############################################################################
-# Local imports.
-from .base import Command
+# Textual enhanced imports.
+from textual_enhanced.commands import Command
 
 
 ##############################################################################
@@ -28,22 +28,6 @@ class Escape(Command):
     BINDING_KEY = "escape"
 
 
-##############################################################################
-class Help(Command):
-    """Show help for and information about the application"""
-
-    BINDING_KEY = "f1, ?"
-    SHOW_IN_FOOTER = True
-
-
-##############################################################################
-class Quit(Command):
-    """Quit the application"""
-
-    BINDING_KEY = "f10, ctrl+q"
-    SHOW_IN_FOOTER = True
-
-
 ##############################################################################
 class RedownloadPEPs(Command):
     """Redownload the list of PEPs"""

src/peplum/app/commands/navigation_sorting.py

@@ -1,8 +1,8 @@
 """Commands for affecting navigation sort ordering."""
 
 ##############################################################################
-# Local imports.
-from .base import Command
+# Textual enhanced imports.
+from textual_enhanced.commands import Command
 
 
 ##############################################################################

src/peplum/app/commands/peps_sorting.py

@@ -1,8 +1,8 @@
 """Provides command-oriented messages that relate to sorting PEPs."""
 
 ##############################################################################
-# Local imports.
-from .base import Command
+# Textual enhanced imports.
+from textual_enhanced.commands import Command
 
 
 ##############################################################################