Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e64226c
bump textual, update to breaking changes
Jun 5, 2023
eb2e549
Merge e64226ce7df36cac8bdf96cd2678212e31913929 into 174ce21c9db642166…
iFrostizz Jun 5, 2023
3821950
Set Version: 0.1.319
rv-auditor Jun 5, 2023
769d05e
lock
Jun 8, 2023
cd4e354
Merge branch 'textual-bump' of github.com:runtimeverification/pyk int…
Jun 8, 2023
b1174fd
Merge branch 'master' into textual-bump
ehildenb Jun 14, 2023
8a129fa
Merge b1174fda370f03260f980ec4dc529578673cd48c into 97156938ac5a52ee2…
iFrostizz Jun 14, 2023
65e506b
Set Version: 0.1.332
rv-auditor Jun 14, 2023
ae41f37
Merge branch 'master' into textual-bump
rv-jenkins Jun 14, 2023
bcbed07
Merge ae41f371df5d72045a9ddee70910b800aada984e into 400fc7e5ad13d786e…
iFrostizz Jun 14, 2023
1fd9888
Set Version: 0.1.333
rv-auditor Jun 14, 2023
bb8e50b
Merge branch 'master' into textual-bump
rv-jenkins Jun 15, 2023
dca7129
Merge bb8e50b32321c7805f6f77d5240472477fa04291 into a781d67de6f69a1f5…
iFrostizz Jun 15, 2023
c0a54c2
Set Version: 0.1.334
rv-auditor Jun 15, 2023
48f4de4
Merge branch 'master' into textual-bump
rv-jenkins Jun 15, 2023
bb3c955
Merge 48f4de486e1eb7267990915243e637b24926639c into 2443106d0ecda70ab…
iFrostizz Jun 15, 2023
a6c7dba
Set Version: 0.1.335
rv-auditor Jun 15, 2023
18d1705
fix circular dependency in python packages
goodlyrottenapple Jun 16, 2023
b991852
Merge branch 'master' into textual-bump
Jun 16, 2023
648d30d
Merge b9918525cc153e6a23ea3e8cd0d93360c7ac2fff into 9720f2c5ea0192b5c…
iFrostizz Jun 16, 2023
4f53696
Set Version: 0.1.336
rv-auditor Jun 16, 2023
9a047d2
merge
Jun 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,32 @@
# We remove `"dev"` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies.
checkGroups = [ ];
overrides = prev.poetry2nix.overrides.withDefaults
(finalPython: prevPython: {
nanoid = prevPython.nanoid.overridePythonAttrs
(oldAttrs: {
(finalPython: prevPython:
let
markdown-it-py-wo-mdit-py-plugins =
prevPython.markdown-it-py.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs =
builtins.filter (p: p.pname != "mdit-py-plugins")
oldAttrs.propagatedBuildInputs;
buildInputs = (oldAttrs.buildInputs or [ ])
++ [ finalPython.flit-core ];
});
in {
nanoid = prevPython.nanoid.overridePythonAttrs (oldAttrs: {
buildInputs = (oldAttrs.buildInputs or [ ])
++ [ prevPython.setuptools ];
});
});

mdit-py-plugins =
prevPython.mdit-py-plugins.overridePythonAttrs
(oldAttrs: {
propagatedBuildInputs =
builtins.filter (p: p.pname != "markdown-it-py")
oldAttrs.propagatedBuildInputs;
buildInputs = (oldAttrs.buildInputs or [ ])
++ [ markdown-it-py-wo-mdit-py-plugins ];
});
});
};
in rec {
pyk = pyk-python310;
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.335
0.1.336
87 changes: 67 additions & 20 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pyk"
version = "0.1.335"
version = "0.1.336"
description = ""
authors = [
"Runtime Verification, Inc. <contact@runtimeverification.com>",
Expand All @@ -18,7 +18,7 @@ filelock = "^3.9.0"
graphviz = "^0.20.1"
psutil = "^5.9.4"
pybind11 = "^2.10.3"
textual = "^0.10.1"
textual = "^0.27.0"
tomli = "^2.0.1"

[tool.poetry.group.dev.dependencies]
Expand Down
17 changes: 8 additions & 9 deletions src/pyk/kcfg/tui.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

from textual.app import ComposeResult
from textual.events import Click
from textual.message import MessageTarget

from ..kast import KInner
from ..ktool.kprint import KPrint
Expand All @@ -35,9 +34,9 @@ class GraphChunk(Static):
class Selected(Message):
chunk_id: str

def __init__(self, sender: MessageTarget, chunk_id: str) -> None:
def __init__(self, chunk_id: str) -> None:
self.chunk_id = chunk_id
super().__init__(sender)
super().__init__()

def __init__(self, id: str, node_text: Iterable[str] = ()) -> None:
self._node_text = '\n'.join(node_text)
Expand All @@ -49,8 +48,8 @@ def on_enter(self) -> None:
def on_leave(self) -> None:
self.styles.border_left = None # type: ignore

async def on_click(self, click: Click) -> None:
await self.emit(GraphChunk.Selected(self, self.id or ''))
def on_click(self, click: Click) -> None:
self.post_message(GraphChunk.Selected(self.id or ''))
click.stop()


Expand All @@ -59,7 +58,7 @@ class BehaviorView(Widget):
_kprint: KPrint
_minimize: bool
_node_printer: Callable[[CTerm], Iterable[str]] | None
_nodes: Iterable[GraphChunk]
_kcfg_nodes: Iterable[GraphChunk]

def __init__(
self,
Expand All @@ -74,13 +73,13 @@ def __init__(
self._kprint = kprint
self._minimize = minimize
self._node_printer = node_printer
self._nodes = []
self._kcfg_nodes = []
kcfg_show = KCFGShow(kprint)
for lseg_id, node_lines in kcfg_show.pretty_segments(self._kcfg, minimize=self._minimize):
self._nodes.append(GraphChunk(lseg_id, node_lines))
self._kcfg_nodes.append(GraphChunk(lseg_id, node_lines))

def compose(self) -> ComposeResult:
return self._nodes
return self._kcfg_nodes


class NodeView(Widget):
Expand Down