Fix circular import (#2179)

* Fix circular import

* Set Version: 1.0.359

---------

Co-authored-by: devops <[email protected]>

kevm-pyk/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kevm-pyk"
-version = "1.0.358"
+version = "1.0.359"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

kevm-pyk/src/kevm_pyk/__init__.py

@@ -6,4 +6,4 @@
     from typing import Final
 
 
-VERSION: Final = '1.0.358'
+VERSION: Final = '1.0.359'

kevm-pyk/src/kevm_pyk/kdist/plugin.py

@@ -33,6 +33,7 @@ def build(self, output_dir: Path, deps: dict[str, Path], args: dict[str, Any]) -
             enable_llvm_debug=enable_llvm_debug,
             verbose=verbose,
             ccopts=ccopts,
+            plugin_dir=deps['evm-semantics.plugin'],
             debug_build=debug_build,
             **self._kompile_args,
         )

kevm-pyk/src/kevm_pyk/kompile.py

@@ -10,7 +10,7 @@
 from pyk.ktool.kompile import HaskellKompile, KompileArgs, LLVMKompile, LLVMKompileType, MaudeKompile
 from pyk.utils import run_process
 
-from . import config, kdist
+from . import config
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
@@ -57,11 +57,16 @@ def kevm_kompile(
     llvm_kompile_type: LLVMKompileType | None = None,
     enable_llvm_debug: bool = False,
     llvm_library: Path | None = None,
+    plugin_dir: Path | None = None,
     debug_build: bool = False,
     debug: bool = False,
     verbose: bool = False,
 ) -> Path:
-    plugin_dir = kdist.get('evm-semantics.plugin')
+    if plugin_dir is None:
+        from . import kdist
+
+        plugin_dir = kdist.get('evm-semantics.plugin')
+
     ccopts = list(ccopts) + _lib_ccopts(plugin_dir, debug_build=debug_build)
     return run_kompile(
         target,

package/version

@@ -1 +1 @@
-1.0.358
+1.0.359