Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit a71358f

Browse files
nwatson22rv-auditorlucasmt
authored
Fix circular import (#925)
#915 introduced a circular import crash which is triggered when executing `pyk rpc-kast` `rpc.py > kprove.py > cterm > symbolic.py > rpc.py` Moves `KoreExecLogFormat` to `kore/rpc.py` --------- Co-authored-by: devops <[email protected]> Co-authored-by: lucasmt <[email protected]>
1 parent 674150d commit a71358f

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
project = 'pyk'
1010
author = 'Runtime Verification, Inc'
1111
copyright = '2024, Runtime Verification, Inc'
12-
version = '0.1.658'
13-
release = '0.1.658'
12+
version = '0.1.659'
13+
release = '0.1.659'
1414

1515
# -- General configuration ---------------------------------------------------
1616
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

package/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.658
1+
0.1.659

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pyk"
7-
version = "0.1.658"
7+
version = "0.1.659"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",

src/pyk/kore/rpc.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
from psutil import Process
2020

21-
from ..ktool.kprove import KoreExecLogFormat
2221
from ..utils import check_dir_path, check_file_path, filter_none, run_process
2322
from .syntax import And, SortApp, kore_term
2423

@@ -38,6 +37,11 @@
3837
_LOGGER: Final = logging.getLogger(__name__)
3938

4039

40+
class KoreExecLogFormat(Enum):
41+
STANDARD = 'standard'
42+
ONELINE = 'oneline'
43+
44+
4145
@final
4246
@dataclass
4347
class JsonRpcError(Exception):

src/pyk/ktool/kprove.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from ..kast.inner import KInner
1818
from ..kast.manip import extract_subst, flatten_label, free_vars
1919
from ..kast.outer import KDefinition, KFlatModule, KFlatModuleList, KImport, KRequire
20+
from ..kore.rpc import KoreExecLogFormat
2021
from ..prelude.ml import is_top, mlAnd
2122
from ..utils import gen_file_timestamp, run_process, unique
2223
from . import TypeInferenceMode
@@ -45,11 +46,6 @@ class KProveOutput(Enum):
4546
NONE = 'none'
4647

4748

48-
class KoreExecLogFormat(Enum):
49-
STANDARD = 'standard'
50-
ONELINE = 'oneline'
51-
52-
5349
def _kprove(
5450
spec_file: Path,
5551
*,

0 commit comments

Comments
 (0)