jpterm 0.2.11__tar.gz → 0.2.12__tar.gz

{jpterm-0.2.11 → jpterm-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jpterm
-Version: 0.2.11
+Version: 0.2.12
 Summary: Jupyter in the terminal
 Project-URL: Homepage, https://github.com/davidbrochart/jpterm
 Author-email: David Brochart <david.brochart@gmail.com>
@@ -16,26 +16,26 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Requires-Dist: rich-click>=1.6.0
-Requires-Dist: txl-cell==0.2.11
-Requires-Dist: txl-console==0.2.11
-Requires-Dist: txl-editors==0.2.11
-Requires-Dist: txl-file-browser==0.2.11
-Requires-Dist: txl-image-viewer==0.2.11
-Requires-Dist: txl-jpterm==0.2.11
-Requires-Dist: txl-kernel==0.2.11
-Requires-Dist: txl-launcher==0.2.11
-Requires-Dist: txl-local-contents==0.2.11
-Requires-Dist: txl-local-kernels==0.2.11
-Requires-Dist: txl-local-terminals==0.2.11
-Requires-Dist: txl-markdown-viewer==0.2.11
-Requires-Dist: txl-notebook-editor==0.2.11
-Requires-Dist: txl-remote-contents==0.2.11
-Requires-Dist: txl-remote-kernels==0.2.11
-Requires-Dist: txl-remote-terminals==0.2.11
-Requires-Dist: txl-terminal==0.2.11
-Requires-Dist: txl-text-editor==0.2.11
-Requires-Dist: txl-widgets==0.2.11
-Requires-Dist: txl==0.2.11
+Requires-Dist: txl-cell==0.2.12
+Requires-Dist: txl-console==0.2.12
+Requires-Dist: txl-editors==0.2.12
+Requires-Dist: txl-file-browser==0.2.12
+Requires-Dist: txl-image-viewer==0.2.12
+Requires-Dist: txl-jpterm==0.2.12
+Requires-Dist: txl-kernel==0.2.12
+Requires-Dist: txl-launcher==0.2.12
+Requires-Dist: txl-local-contents==0.2.12
+Requires-Dist: txl-local-kernels==0.2.12
+Requires-Dist: txl-local-terminals==0.2.12
+Requires-Dist: txl-markdown-viewer==0.2.12
+Requires-Dist: txl-notebook-editor==0.2.12
+Requires-Dist: txl-remote-contents==0.2.12
+Requires-Dist: txl-remote-kernels==0.2.12
+Requires-Dist: txl-remote-terminals==0.2.12
+Requires-Dist: txl-terminal==0.2.12
+Requires-Dist: txl-text-editor==0.2.12
+Requires-Dist: txl-widgets==0.2.12
+Requires-Dist: txl==0.2.12
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == 'docs'
 Requires-Dist: mkdocs-material; extra == 'docs'

jpterm-0.2.12/jpterm/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/cell/txl_cell/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{jpterm-0.2.11 → jpterm-0.2.12}/plugins/cell/txl_cell/components.py

@@ -6,6 +6,7 @@ from importlib.metadata import entry_points
 from asphalt.core import Component, Context
 from pycrdt import Doc, Map, MapEvent, Text
 from rich.text import Text as RichText
+from textual.app import ComposeResult
 from textual.containers import Container
 from textual.widgets import Static
 
@@ -68,7 +69,7 @@ class _Cell(Cell, Container, metaclass=CellMeta, can_focus=True):
         self.show_execution_count = show_execution_count
         self.show_border = show_border
         self.outputs = []
-        self.update()
+        self.update(mount=False)
         self.ycell.observe_deep(self.on_change)
         self.styles.height = "auto"
         self.cell_change_events = asyncio.Queue()
@@ -174,7 +175,14 @@ class _Cell(Cell, Container, metaclass=CellMeta, can_focus=True):
         execution_count = " " if value is None else str(value).removesuffix(".0")
         return f"[green]In [[#66ff00]{execution_count}[/#66ff00]]:[/green]"
 
-    def update(self):
+    def compose(self) -> ComposeResult:
+        if self.show_execution_count:
+            yield self.execution_count
+        yield self.source
+        for output in self.outputs:
+            yield output
+
+    def update(self, mount: bool = True):
         cell = json.loads(str(self.ycell))
         if self.show_execution_count:
             execution_state = self.ycell.get("execution_state")
@@ -187,7 +195,8 @@ class _Cell(Cell, Container, metaclass=CellMeta, can_focus=True):
                     self.get_execution_count("*")
                 )
             self.execution_count = Static(execution_count)
-            self.mount(self.execution_count)
+            if mount:
+                self.mount(self.execution_count)
         cell_type = cell["cell_type"]
         if cell_type == "markdown":
             language = "markdown"
@@ -200,12 +209,14 @@ class _Cell(Cell, Container, metaclass=CellMeta, can_focus=True):
             language=language,
             show_border=self.show_border,
         )
-        self.mount(self.source)
+        if mount:
+            self.mount(self.source)
 
         for output in cell.get("outputs", []):
             output_widget = self.get_output_widget(output)
             if output_widget is not None:
-                self.mount(output_widget)
+                if mount:
+                    self.mount(output_widget)
                 self.outputs.append(output_widget)
 
     def get_output_widget(self, output):

jpterm-0.2.12/plugins/console/txl_console/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/editors/txl_editors/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/file_browser/txl_file_browser/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/image_viewer/txl_image_viewer/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/jpterm/txl_jpterm/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{jpterm-0.2.11 → jpterm-0.2.12}/plugins/jpterm/txl_jpterm/components.py

@@ -26,6 +26,7 @@ class Jpterm(App):
         self.file_browser = file_browser
         self.editors = editors
         self.launcher = launcher
+        self.main_area.show(self.launcher, "Launcher", mount=False)
         super().__init__(*args, **kwargs)
 
     def watch_show_browser(self, show_browser: bool) -> None:
@@ -33,7 +34,6 @@ class Jpterm(App):
 
     def compose(self) -> ComposeResult:
         yield self.header
-        self.main_area.show(self.launcher, "Launcher")
         yield Container(
             self.file_browser,
             self.main_area,

{jpterm-0.2.11 → jpterm-0.2.12}/plugins/jpterm/txl_jpterm/footer.py

@@ -103,9 +103,9 @@ class Footer(AbstractFooter, Widget, metaclass=FooterMeta):
         key_style = self.get_component_rich_style("footer--key")
 
         bindings = [
-            binding
-            for (_namespace, binding) in self.app.namespace_bindings.values()
-            if binding.show
+            active_binding.binding
+            for active_binding in self.app.active_bindings.values()
+            if active_binding.binding.show
         ]
 
         action_to_bindings = defaultdict(list)

{jpterm-0.2.11 → jpterm-0.2.12}/plugins/jpterm/txl_jpterm/main_area.py

@@ -1,5 +1,6 @@
 from typing import Optional
 
+from textual.app import ComposeResult
 from textual.widget import Widget
 from textual.widgets import Tab, Tabs
 
@@ -19,7 +20,7 @@ class MainArea(Widget, AbstractMainArea, metaclass=MainAreaMeta):
         self.widget_to_tab = {}
         self.title = 0
 
-    def show(self, widget: Widget, title: Optional[str] = None):
+    def show(self, widget: Widget, title: Optional[str] = None, mount: bool = True):
         if widget not in self.mounted:
             if title is None:
                 title = self.title
@@ -27,17 +28,22 @@ class MainArea(Widget, AbstractMainArea, metaclass=MainAreaMeta):
             tab = Tab(str(title))
             if self.tabs is None:
                 self.tabs = Tabs(tab)
-                self.mount(self.tabs)
             else:
                 self.tabs.add_tab(tab)
                 self.tabs.active = tab.id
             self.widget_to_tab[widget] = (tab, False)
             self.mounted.append(widget)
-            self.mount(widget)
+            if mount:
+                self.mount(widget)
         else:
             tab, dirty = self.widget_to_tab[widget]
             self.tabs.active = tab.id
 
+    def compose(self) -> ComposeResult:
+        yield self.tabs
+        for widget in self.mounted:
+            yield widget
+
     def get_label(self) -> str:
         tab = self.tabs.active_tab
         return tab.label_text

jpterm-0.2.12/plugins/kernel/txl_kernel/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/launcher/txl_launcher/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/local_contents/txl_local_contents/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/local_kernels/txl_local_kernels/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/local_terminals/txl_local_terminals/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/markdown_viewer/txl_markdown_viewer/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/notebook_editor/txl_notebook_editor/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{jpterm-0.2.11 → jpterm-0.2.12}/plugins/notebook_editor/txl_notebook_editor/components.py

@@ -7,7 +7,7 @@ from typing import Any
 import anyio
 from asphalt.core import Component, Context
 from httpx import AsyncClient
-from textual.app import RenderResult
+from textual.app import ComposeResult, RenderResult
 from textual.containers import VerticalScroll
 from textual.events import Event
 from textual.keys import Keys
@@ -86,7 +86,9 @@ class NotebookEditor(Editor, VerticalScroll, metaclass=NotebookEditorMeta):
         self.nb_change_target = asyncio.Queue()
         self.nb_change_events = asyncio.Queue()
         self.top_bar = TopBar()
-        self.mount(self.top_bar)
+
+    def compose(self) -> ComposeResult:
+        yield self.top_bar
 
     async def watch_busy(self, event):
         self.top_bar.busy = event.busy

jpterm-0.2.12/plugins/remote_contents/txl_remote_contents/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/remote_kernels/txl_remote_kernels/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/remote_terminals/txl_remote_terminals/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/terminal/txl_terminal/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/text_editor/txl_text_editor/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.12/plugins/widgets/txl_widgets/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

{jpterm-0.2.11 → jpterm-0.2.12}/pyproject.toml

@@ -25,26 +25,26 @@ keywords = [
 ]
 dependencies = [
     "rich-click >=1.6.0",
-    "txl ==0.2.11",
-    "txl_cell ==0.2.11",
-    "txl_console ==0.2.11",
-    "txl_editors ==0.2.11",
-    "txl_file_browser ==0.2.11",
-    "txl_image_viewer ==0.2.11",
-    "txl_jpterm ==0.2.11",
-    "txl_kernel ==0.2.11",
-    "txl_local_contents ==0.2.11",
-    "txl_local_terminals ==0.2.11",
-    "txl_local_kernels ==0.2.11",
-    "txl_notebook_editor ==0.2.11",
-    "txl_remote_contents ==0.2.11",
-    "txl_remote_terminals ==0.2.11",
-    "txl_remote_kernels ==0.2.11",
-    "txl_text_editor ==0.2.11",
-    "txl_markdown_viewer ==0.2.11",
-    "txl_terminal ==0.2.11",
-    "txl_launcher ==0.2.11",
-    "txl_widgets ==0.2.11",
+    "txl ==0.2.12",
+    "txl_cell ==0.2.12",
+    "txl_console ==0.2.12",
+    "txl_editors ==0.2.12",
+    "txl_file_browser ==0.2.12",
+    "txl_image_viewer ==0.2.12",
+    "txl_jpterm ==0.2.12",
+    "txl_kernel ==0.2.12",
+    "txl_local_contents ==0.2.12",
+    "txl_local_terminals ==0.2.12",
+    "txl_local_kernels ==0.2.12",
+    "txl_notebook_editor ==0.2.12",
+    "txl_remote_contents ==0.2.12",
+    "txl_remote_terminals ==0.2.12",
+    "txl_remote_kernels ==0.2.12",
+    "txl_text_editor ==0.2.12",
+    "txl_markdown_viewer ==0.2.12",
+    "txl_terminal ==0.2.12",
+    "txl_launcher ==0.2.12",
+    "txl_widgets ==0.2.12",
 ]
 
 [project.optional-dependencies]

{jpterm-0.2.11 → jpterm-0.2.12}/txl/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 ]
 dependencies = [
   "asphalt >=4.12.0,<5",
-  "textual[syntax] >=0.53.1,<0.54.0",
+  "textual[syntax] >=0.63.4,<0.64.0",
 ]
 dynamic = ["version"]
 

jpterm-0.2.12/txl/txl/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.12"

jpterm-0.2.11/.gitattributes

@@ -1,3 +0,0 @@
-# GitHub syntax highlighting
-pixi.lock linguist-language=YAML
-

jpterm-0.2.11/jpterm/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.11"

jpterm-0.2.11/plugins/cell/txl_cell/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/console/txl_console/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/editors/txl_editors/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/file_browser/txl_file_browser/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/image_viewer/txl_image_viewer/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/jpterm/txl_jpterm/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/kernel/txl_kernel/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/launcher/txl_launcher/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/local_contents/txl_local_contents/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/local_kernels/txl_local_kernels/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/local_terminals/txl_local_terminals/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/markdown_viewer/txl_markdown_viewer/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/notebook_editor/txl_notebook_editor/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/remote_contents/txl_remote_contents/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/remote_kernels/txl_remote_kernels/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/remote_terminals/txl_remote_terminals/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/terminal/txl_terminal/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/text_editor/txl_text_editor/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/plugins/widgets/txl_widgets/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"

jpterm-0.2.11/txl/txl/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.10"