Rename kontrol module and command to kontrolx (#2078)

* Rename `kontrol` module and command to `kontrolx` In order to avoid name collision with the downstream project in the interim period both projects distribute the module. * Set Version: 1.0.295 * Set Version: 1.0.296 --------- Co-authored-by: devops <[email protected]> Co-authored-by: rv-jenkins <[email protected]>
runtimeverification · Sep 19, 2023 · 051c16c · 051c16c
1 parent f431756
commit 051c16c
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 19 deletions.
diff --git a/flake.nix b/flake.nix
@@ -103,7 +103,7 @@
               makeWrapper ${final.kevm-pyk}/bin/kevm $out/bin/kevm --prefix PATH : ${
                 prev.lib.makeBinPath [ prev.which k ]
               } --set NIX_LIBS "${nixLibs prev}" --set KEVM_DIST_DIR $out
-              makeWrapper ${final.kevm-pyk}/bin/kontrol $out/bin/kontrol --prefix PATH : ${
+              makeWrapper ${final.kevm-pyk}/bin/kontrolx $out/bin/kontrolx --prefix PATH : ${
                 prev.lib.makeBinPath [
                   (solc.mkDefault final final.solc_0_8_13)
                   final.foundry-bin
@@ -148,7 +148,7 @@
           projectDir = ./kevm-pyk;
 
           postPatch = ''
-            substituteInPlace ./src/kontrol/foundry.py \
+            substituteInPlace ./src/kontrolx/foundry.py \
               --replace "'forge', 'build'," "'forge', 'build', '--no-auto-detect',"
           '';
 

diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml
@@ -4,14 +4,14 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kevm-pyk"
-version = "1.0.295"
+version = "1.0.296"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
 ]
 packages = [
     { include = "kevm_pyk", from = "src/" },
-    { include = "kontrol", from = "src/" },
+    { include = "kontrolx", from = "src/" },
 ]
 
 [tool.poetry.dependencies]
@@ -43,7 +43,7 @@ kevm = "kevm_pyk.__main__:main"
 kevm-pyk = "kevm_pyk.__main__:main"
 kevm-dist = "kevm_pyk.dist:main"
 gst-to-kore = "kevm_pyk.gst_to_kore:main"
-kontrol = "kontrol.__main__:main"
+kontrolx = "kontrolx.__main__:main"
 
 [tool.isort]
 profile = "black"

diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py
@@ -6,4 +6,4 @@
     from typing import Final
 
 
-VERSION: Final = '1.0.295'
+VERSION: Final = '1.0.296'
diff --git a/kevm-pyk/src/kontrol/__init__.py → kevm-pyk/src/kontrolx/__init__.py b/kevm-pyk/src/kontrol/__init__.py → kevm-pyk/src/kontrolx/__init__.py
diff --git a/kevm-pyk/src/kontrol/__main__.py → kevm-pyk/src/kontrolx/__main__.py b/kevm-pyk/src/kontrol/__main__.py → kevm-pyk/src/kontrolx/__main__.py
@@ -419,7 +419,7 @@ def parse(s: str) -> list[T]:
         return parse
 
     kevm_cli_args = KEVMCLIArgs()
-    parser = ArgumentParser(prog='kontrol')
+    parser = ArgumentParser(prog='kontrolx')
 
     command_parser = parser.add_subparsers(dest='command', required=True)
 

diff --git a/kevm-pyk/src/kontrol/foundry.py → kevm-pyk/src/kontrolx/foundry.py b/kevm-pyk/src/kontrol/foundry.py → kevm-pyk/src/kontrolx/foundry.py
diff --git a/kevm-pyk/src/kontrol/solc_to_k.py → kevm-pyk/src/kontrolx/solc_to_k.py b/kevm-pyk/src/kontrol/solc_to_k.py → kevm-pyk/src/kontrolx/solc_to_k.py
diff --git a/kevm-pyk/src/tests/integration/test_foundry_prove.py b/kevm-pyk/src/tests/integration/test_foundry_prove.py
@@ -9,7 +9,7 @@
 from pyk.proof import APRProof
 from pyk.utils import run_process, single
 
-from kontrol.foundry import (
+from kontrolx.foundry import (
     Foundry,
     foundry_kompile,
     foundry_merge_nodes,

diff --git a/kevm-pyk/src/tests/integration/utils.py b/kevm-pyk/src/tests/integration/utils.py
@@ -6,7 +6,7 @@
 from pyk.utils import check_dir_path
 
 from kevm_pyk.dist import DistTarget
-from kontrol.solc_to_k import solc_to_k
+from kontrolx.solc_to_k import solc_to_k
 
 if TYPE_CHECKING:
     from typing import Final

diff --git a/kevm-pyk/src/tests/profiling/test_foundry_prove.py b/kevm-pyk/src/tests/profiling/test_foundry_prove.py
@@ -6,7 +6,7 @@
 
 from pyk.utils import run_process
 
-from kontrol.foundry import foundry_kompile, foundry_prove
+from kontrolx.foundry import foundry_kompile, foundry_prove
 
 from .utils import TEST_DATA_DIR
 

diff --git a/kevm-pyk/src/tests/unit/test_foundry_list.py b/kevm-pyk/src/tests/unit/test_foundry_list.py
@@ -6,8 +6,8 @@
 
 from pyk.proof.proof import Proof
 
-from kontrol.foundry import foundry_list
-from kontrol.solc_to_k import Contract
+from kontrolx.foundry import foundry_list
+from kontrolx.solc_to_k import Contract
 
 from .utils import TEST_DATA_DIR
 
@@ -53,7 +53,7 @@ def get_optional_proof(self, test_id: str) -> Proof | None:
 
 
 def test_foundry_list(mocker: MockerFixture, update_expected_output: bool) -> None:
-    foundry_mock = mocker.patch('kontrol.foundry.Foundry')
+    foundry_mock = mocker.patch('kontrolx.foundry.Foundry')
     foundry_mock.return_value = FoundryMock()
 
     with LIST_EXPECTED.open() as f:

diff --git a/kevm-pyk/src/tests/unit/test_solc_to_k.py b/kevm-pyk/src/tests/unit/test_solc_to_k.py
@@ -6,7 +6,7 @@
 from pyk.kast.inner import KToken, KVariable
 
 from kevm_pyk.kevm import KEVM
-from kontrol.solc_to_k import _range_predicate
+from kontrolx.solc_to_k import Contract, _range_predicate
 
 from .utils import TEST_DATA_DIR
 
@@ -39,8 +39,6 @@ def test_range_predicate(test_id: str, term: KInner, type: str, expected: KInner
     assert ret == expected
 
 
-from kontrol.solc_to_k import Contract
-
 ESCAPE_DATA: list[tuple[str, str, str, str]] = [
     ('has_underscore', 'S2K', 'My_contract', 'S2KMyZUndcontract'),
     ('no_change', '', 'mycontract', 'mycontract'),

diff --git a/package/debian/changelog b/package/debian/changelog
@@ -1,4 +1,4 @@
-kevm (1.0.295) unstable; urgency=medium
+kevm (1.0.296) unstable; urgency=medium
 
   * Initial Release.
 

diff --git a/package/test-package.sh b/package/test-package.sh
@@ -32,7 +32,7 @@ if ! ${APPLE_SILICON:-false}; then
 fi
 
 
-kontrol solc-to-k tests/specs/examples/ERC20.sol ERC20 --target haskell --main-module ERC20-VERIFICATION > tests/specs/examples/erc20-bin-runtime.k
+kontrolx solc-to-k tests/specs/examples/ERC20.sol ERC20 --target haskell --main-module ERC20-VERIFICATION > tests/specs/examples/erc20-bin-runtime.k
 kevm kompile tests/specs/examples/erc20-spec.md                 \
     --target haskell                                            \
     --output-definition tests/specs/examples/erc20-spec/haskell \

diff --git a/package/version b/package/version
@@ -1 +1 @@
-1.0.295
+1.0.296