diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 77a1f49a..f9269d75 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -24,7 +24,7 @@ jobs: git config user.email devops@runtimeverification.com - name: 'Install Poetry' uses: Gr1N/setup-poetry@v8 - - name: 'Update KWasm submodule, pyk/K releases' + - name: 'Update KWasm submodule, K release' run: | kwasm_version=$(cat deps/kwasm_release) cd deps/wasm-semantics/ @@ -33,8 +33,7 @@ jobs: cd ../.. git add deps/wasm-semantics && git commit -m "deps/wasm-semantics: update submodule v${kwasm_version}" || true cat deps/wasm-semantics/deps/k_release > deps/k_release - cat deps/wasm-semantics/deps/pyk_release > deps/pyk_release - git add deps/k_release deps/pyk_release && git commit -m 'deps/{k_release,pyk_release}: update versions' || true + git add deps/k_release && git commit -m 'deps/k_release: update versions' || true - name: 'Update poetry files' run: | pykwasm_version="$(cat deps/kwasm_release)" diff --git a/deps/k_release b/deps/k_release index a545989c..b537083a 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.77 +7.0.9 diff --git a/deps/kwasm_release b/deps/kwasm_release index 28d00753..9dd17933 100644 --- a/deps/kwasm_release +++ b/deps/kwasm_release @@ -1 +1 @@ -0.1.32 +0.1.34 diff --git a/deps/pyk_release b/deps/pyk_release deleted file mode 100644 index 774f8cea..00000000 --- a/deps/pyk_release +++ /dev/null @@ -1 +0,0 @@ -v0.1.778 diff --git a/deps/wasm-semantics b/deps/wasm-semantics index fd9ec8c7..ea2fbb31 160000 --- a/deps/wasm-semantics +++ b/deps/wasm-semantics @@ -1 +1 @@ -Subproject commit fd9ec8c73c3f5dd773f037f01284167e6e98bc13 +Subproject commit ea2fbb31597b996237933ebf18926565867ad11c diff --git a/kmultiversx/poetry.lock b/kmultiversx/poetry.lock index ba17776a..8ed96fd0 100644 --- a/kmultiversx/poetry.lock +++ b/kmultiversx/poetry.lock @@ -971,7 +971,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "0.1.778" +version = "7.0.9" description = "" optional = false python-versions = "^3.10" @@ -991,13 +991,14 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" -url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.778" -resolved_reference = "f705bcd96224b80a35619a8e4112f7880bcaae81" +url = "https://github.com/runtimeverification/k.git" +reference = "v7.0.9" +resolved_reference = "8868b0aaf0e4d6c9506b3cd3b8b528fd5f065830" +subdirectory = "pyk" [[package]] name = "pykwasm" -version = "0.1.32" +version = "0.1.34" description = "" optional = false python-versions = "^3.10" @@ -1008,13 +1009,13 @@ develop = false cytoolz = "^0.12.1" numpy = "^1.24.2" py-wasm = {url = "https://github.com/runtimeverification/py-wasm/archive/refs/tags/0.2.0.tar.gz"} -pyk = {git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.778"} +pyk = {git = "https://github.com/runtimeverification/k.git", tag = "v7.0.9", subdirectory = "pyk"} [package.source] type = "git" url = "https://github.com/runtimeverification/wasm-semantics.git" -reference = "v0.1.32" -resolved_reference = "fd9ec8c73c3f5dd773f037f01284167e6e98bc13" +reference = "v0.1.34" +resolved_reference = "ea2fbb31597b996237933ebf18926565867ad11c" subdirectory = "pykwasm" [[package]] @@ -1292,4 +1293,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "43727300e16f8051cc1c8cac72c4324d26a3a85e36bc7ab14bc2d00f822434ee" +content-hash = "abd9edf456634073fd48fa67ed42b262d6399845a8ab905370631575cbedc30f" diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml index 297d8ac0..e691746a 100644 --- a/kmultiversx/pyproject.toml +++ b/kmultiversx/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kmultiversx" -version = "0.1.35" +version = "0.1.36" description = "Python tools for Elrond semantics" authors = [ "Runtime Verification, Inc. ", @@ -20,7 +20,7 @@ mx-semantics = "kmultiversx.kdist.plugin" [tool.poetry.dependencies] python = "^3.10" -pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v0.1.32", subdirectory = "pykwasm" } +pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v0.1.34", subdirectory = "pykwasm" } pycryptodomex = "^3.18.0" hypothesis = "^6.82.6" diff --git a/kmultiversx/src/kmultiversx/kdist/plugin.py b/kmultiversx/src/kmultiversx/kdist/plugin.py index fcadde26..b12c7a33 100644 --- a/kmultiversx/src/kmultiversx/kdist/plugin.py +++ b/kmultiversx/src/kmultiversx/kdist/plugin.py @@ -80,7 +80,7 @@ def haskell_target(main_file: Path, main_module: str, syntax_module: str) -> Kom 'include_dirs': [WASM_DIR, PLUGIN_DIR], 'md_selector': 'k', 'hook_namespaces': ['KRYPTO'], - 'warning_to_error': True, + 'warnings_to_errors': True, }, ) diff --git a/package/version b/package/version index a52e0416..072d0fa3 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.35 +0.1.36