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

Commit

Permalink
Fix circular import (#925)
Browse files Browse the repository at this point in the history
#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 <devops@runtimeverification.com>
Co-authored-by: lucasmt <36549752+lucasmt@users.noreply.github.com>
  • Loading branch information
3 people committed Feb 27, 2024
1 parent 674150d commit a71358f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
project = 'pyk'
author = 'Runtime Verification, Inc'
copyright = '2024, Runtime Verification, Inc'
version = '0.1.658'
release = '0.1.658'
version = '0.1.659'
release = '0.1.659'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.658
0.1.659
2 changes: 1 addition & 1 deletion 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.658"
version = "0.1.659"
description = ""
authors = [
"Runtime Verification, Inc. <contact@runtimeverification.com>",
Expand Down
6 changes: 5 additions & 1 deletion src/pyk/kore/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from psutil import Process

from ..ktool.kprove import KoreExecLogFormat
from ..utils import check_dir_path, check_file_path, filter_none, run_process
from .syntax import And, SortApp, kore_term

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


class KoreExecLogFormat(Enum):
STANDARD = 'standard'
ONELINE = 'oneline'


@final
@dataclass
class JsonRpcError(Exception):
Expand Down
6 changes: 1 addition & 5 deletions src/pyk/ktool/kprove.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from ..kast.inner import KInner
from ..kast.manip import extract_subst, flatten_label, free_vars
from ..kast.outer import KDefinition, KFlatModule, KFlatModuleList, KImport, KRequire
from ..kore.rpc import KoreExecLogFormat
from ..prelude.ml import is_top, mlAnd
from ..utils import gen_file_timestamp, run_process, unique
from . import TypeInferenceMode
Expand Down Expand Up @@ -45,11 +46,6 @@ class KProveOutput(Enum):
NONE = 'none'


class KoreExecLogFormat(Enum):
STANDARD = 'standard'
ONELINE = 'oneline'


def _kprove(
spec_file: Path,
*,
Expand Down

0 comments on commit a71358f

Please sign in to comment.