From 136a305c1a44bfe7acea9bff8956c0de8f1a4dac Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 20 Nov 2023 01:27:51 -0700 Subject: [PATCH] Update dependency: deps/kevm_release (#181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps/kevm_release: Set Version 1.0.360 * Sync Poetry files: kevm-pyk version 1.0.360 * flake.{nix,lock}: update Nix derivations * Drop the `plugin_dir` argument * Set shell options for `nix` job * Set Version: 0.1.64 * deps/kevm_release: Set Version 1.0.361 * Sync Poetry files: kevm-pyk version 1.0.361 * deps/k_release: sync release file version 6.1.14 * flake.{nix,lock}: update Nix derivations * add missing deps * Set Version: 0.1.65 --------- Co-authored-by: devops Co-authored-by: Tamás Tóth Co-authored-by: Samuel Balco --- .github/workflows/test-pr.yml | 1 + deps/k_release | 2 +- deps/kevm_release | 2 +- flake.lock | 38 +++++++++++++++++------------------ flake.nix | 4 +++- package/version | 2 +- poetry.lock | 24 +++++++++++----------- pyproject.toml | 4 ++-- src/kontrol/__init__.py | 2 +- src/kontrol/kompile.py | 3 --- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index b04198003..d3635634f 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -218,6 +218,7 @@ jobs: NIX_PATH: 'nixpkgs=http://nixos.org/channels/nixos-22.05/nixexprs.tar.xz' GC_DONT_GC: '1' run: | + set -euxo pipefail nix --version JQ=$(nix-build '' -A jq --no-link)/bin/jq KONTROL_BIN=$(nix build .#kontrol.solc_0_8_13 --print-build-logs --json | $JQ -r '.[].outputs | to_entries[].value')/bin diff --git a/deps/k_release b/deps/k_release index 0c1fa2fc4..d8b1b0bc5 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.1.10 +6.1.14 diff --git a/deps/kevm_release b/deps/kevm_release index 99d98ea69..b3206bd30 100644 --- a/deps/kevm_release +++ b/deps/kevm_release @@ -1 +1 @@ -1.0.357 +1.0.361 diff --git a/flake.lock b/flake.lock index 8491f9e9f..b56964212 100644 --- a/flake.lock +++ b/flake.lock @@ -72,17 +72,17 @@ ] }, "locked": { - "lastModified": 1699536445, - "narHash": "sha256-ghF12CD5ho23qFf9hIOH+0mVJ49s4RvSLEEfFsay9FU=", + "lastModified": 1699829156, + "narHash": "sha256-aZCXnm0rybhW5DSvbZmwDBwKEZD5DAvpezpRd9VoJw4=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "175f10b16ad50dd2bb50fcfe68cbcacd79760317", + "rev": "09ea14a2196589264eba4aed1ba5d6de40bcebd4", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "175f10b16ad50dd2bb50fcfe68cbcacd79760317", + "rev": "09ea14a2196589264eba4aed1ba5d6de40bcebd4", "type": "github" } }, @@ -284,16 +284,16 @@ "rv-utils": "rv-utils" }, "locked": { - "lastModified": 1699909407, - "narHash": "sha256-MVqxGM65EY8KfOHwXnA3UDMB8MqQ5GOKpw95F9SafCg=", + "lastModified": 1699988860, + "narHash": "sha256-pOhkmsPtSmRG6y92McegQdKtCmHe0ij1BTu3P0Xi6Do=", "owner": "runtimeverification", "repo": "k", - "rev": "7faf239a91615c7d15b1cb7650401cbe15ed9a7c", + "rev": "bc5dc73b0e941708769f668e30d30fcdbeb892fe", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v6.1.10", + "ref": "v6.1.14", "repo": "k", "type": "github" } @@ -337,16 +337,16 @@ ] }, "locked": { - "lastModified": 1700042547, - "narHash": "sha256-EewvdErmcSJFpUBg+tCXSvOzVeEtYPg3YZwGp7ItGis=", + "lastModified": 1700172138, + "narHash": "sha256-SmOW86Ri/X8brk30BVOQrXOOe5nkYXmGzltvy5nI4kQ=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "449fbfa9dfd13e7f13e105822ea5bca10b63d450", + "rev": "60783f12409f4588779c350ce6d718c2abb5c289", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.357", + "ref": "v1.0.361", "repo": "evm-semantics", "type": "github" } @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1699905783, - "narHash": "sha256-flKLsCM7pjyioY14TTza9LqXhYGW2AQt2EfeYiXm8Vg=", + "lastModified": 1699980180, + "narHash": "sha256-9jEw45jUSau+rcIyzA9fsmDshWjaUQiskh1b15OOQzc=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "29bb01e45da52e13549f4f9a38dac91aacb6d0bd", + "rev": "4339deb023054a38647a56c5f47966294286cb19", "type": "github" }, "original": { @@ -543,16 +543,16 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1699947831, - "narHash": "sha256-5lJTvaTTB2/eY9au/ubhI6QRfZ3ELv4oN5W1DugdUyk=", + "lastModified": 1700037862, + "narHash": "sha256-PMhaGQSUoVeeuxHinOY2iKuPs87jZ4+QK55zl0k/UpQ=", "owner": "runtimeverification", "repo": "pyk", - "rev": "ea1e4ebac62b67ab1f3cedd821faa8610d6db935", + "rev": "65dc68a488bff876e60a0595ae002412ca65face", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.500", + "ref": "v0.1.501", "repo": "pyk", "type": "github" } diff --git a/flake.nix b/flake.nix index 770a4d3e3..2432543c1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.357"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.361"; nixpkgs.follows = "kevm/nixpkgs"; nixpkgs-pyk.follows = "kevm/nixpkgs-pyk"; k-framework.follows = "kevm/k-framework"; @@ -88,6 +88,8 @@ libtool openssl.dev gmp + pkg-config + procps ]; nativeBuildInputs = [ prev.makeWrapper ]; diff --git a/package/version b/package/version index 9810a3b11..c472eaf6c 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.64 +0.1.65 diff --git a/poetry.lock b/poetry.lock index 50228b199..ab7c71e33 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "attrs" @@ -430,7 +430,7 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] [[package]] name = "kevm-pyk" -version = "1.0.357" +version = "1.0.361" description = "" optional = false python-versions = "^3.10" @@ -439,15 +439,15 @@ develop = false [package.dependencies] pathos = "*" -pyk = {git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.500"} +pyk = {git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.501"} tomlkit = "^0.11.6" xdg-base-dirs = "^6.0.0" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.357" -resolved_reference = "449fbfa9dfd13e7f13e105822ea5bca10b63d450" +reference = "v1.0.361" +resolved_reference = "60783f12409f4588779c350ce6d718c2abb5c289" subdirectory = "kevm-pyk" [[package]] @@ -809,7 +809,7 @@ plugins = ["importlib-metadata"] [[package]] name = "pyk" -version = "0.1.500" +version = "0.1.501" description = "" optional = false python-versions = "^3.10" @@ -829,8 +829,8 @@ tomli = "^2.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.500" -resolved_reference = "ea1e4ebac62b67ab1f3cedd821faa8610d6db935" +reference = "v0.1.501" +resolved_reference = "65dc68a488bff876e60a0595ae002412ca65face" [[package]] name = "pyperclip" @@ -946,13 +946,13 @@ tokenize-rt = ">=5.2.0" [[package]] name = "rich" -version = "13.6.0" +version = "13.7.0" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.6.0-py3-none-any.whl", hash = "sha256:2b38e2fe9ca72c9a00170a1a2d20c63c790d0e10ef1fe35eba76e1e7b1d7d245"}, - {file = "rich-13.6.0.tar.gz", hash = "sha256:5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef"}, + {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"}, + {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"}, ] [package.dependencies] @@ -1080,4 +1080,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "56a76f0b6a9c3c85cd23e4b46fe3d677eacd4fa8119f7c4f96052883002e887a" +content-hash = "2ec5d1ba262fab3234a6772f81f3c7157e4883e2e0f4bc05a7403f69cd4ae70f" diff --git a/pyproject.toml b/pyproject.toml index 8c7b8f605..8900f0c1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.64" +version = "0.1.65" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", @@ -12,7 +12,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" -kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.357", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.361", subdirectory = "kevm-pyk" } [tool.poetry.group.dev.dependencies] autoflake = "*" diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index 42109a70e..856e11c5c 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.64' +VERSION: Final = '0.1.65' diff --git a/src/kontrol/kompile.py b/src/kontrol/kompile.py index a263f249e..49c5248c2 100644 --- a/src/kontrol/kompile.py +++ b/src/kontrol/kompile.py @@ -136,8 +136,6 @@ def update_kompilation_digest() -> None: _LOGGER.info('Updated Kompilation digest') if not kompilation_up_to_date() or rekompile or not kompiled_timestamp.exists(): - plugin_dir = kdist.get('evm-semantics.plugin') - kevm_kompile( target=target, output_dir=foundry.kompiled, @@ -150,7 +148,6 @@ def update_kompilation_digest() -> None: llvm_library=foundry.llvm_library, debug=debug, verbose=verbose, - plugin_dir=plugin_dir, ) update_kompilation_digest()