From 748b20ef2ee969e2a2077126255c00c4cee963d9 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 10 Jun 2024 15:02:23 -0600 Subject: [PATCH] Update dependency: deps/kwasm_release (#282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps/kwasm_release: Set Version 0.1.60 * Set Version: 0.1.75 * Install Nix for update job * kmultiversx/: sync poetry files 0.1.60 * deps/k_release: sync release file version 7.0.120 * flake.{nix,lock}: update Nix derivations * Remove obsolete assertion * Filter out exceptiongroup * Set Version: 0.1.76 --------- Co-authored-by: devops Co-authored-by: Tamás Tóth Co-authored-by: Bruce Collie --- .github/workflows/update-version.yml | 10 ++++ deps/k_release | 2 +- deps/kwasm_release | 2 +- flake.lock | 56 +++++++++---------- flake.nix | 10 ++-- kmultiversx/poetry.lock | 45 +++++++-------- kmultiversx/pyproject.toml | 4 +- .../src/tests/unit/test_generate_claim.py | 3 - package/version | 2 +- 9 files changed, 71 insertions(+), 63 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index d40f938c..8bb0b418 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -24,6 +24,16 @@ jobs: git config user.email devops@runtimeverification.com - name: 'Install Poetry' uses: Gr1N/setup-poetry@v8 + - name: 'Install Nix/Cachix' + uses: cachix/install-nix-action@v27 + with: + install_url: https://releases.nixos.org/nix/nix-2.22.1/install + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v15 + with: + name: k-framework + authToken: ${{ secrets.CACHIX_PUBLIC_TOKEN }} - name: 'Update poetry files' run: | PYKWASM_VERSION="$(cat deps/kwasm_release)" diff --git a/deps/k_release b/deps/k_release index 0fa94227..260db422 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.0.112 +7.0.120 diff --git a/deps/kwasm_release b/deps/kwasm_release index 09d8256a..1ec9b0b6 100644 --- a/deps/kwasm_release +++ b/deps/kwasm_release @@ -1 +1 @@ -0.1.59 +0.1.60 diff --git a/flake.lock b/flake.lock index fac34dde..58ecdfc5 100644 --- a/flake.lock +++ b/flake.lock @@ -322,16 +322,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1717580671, - "narHash": "sha256-ucSdll3uu4lu3FIYQ1hyLnm2BGiIydHx40orLN9VM8s=", + "lastModified": 1717703773, + "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", "owner": "runtimeverification", "repo": "k", - "rev": "e12cbe44f5e39c7daf84b62e538d59b8fa31bc28", + "rev": "e070a2048b7e6ce45748426c4868d593113af050", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.112", + "ref": "v7.0.120", "repo": "k", "type": "github" } @@ -350,16 +350,16 @@ "rv-utils": "rv-utils_7" }, "locked": { - "lastModified": 1717580671, - "narHash": "sha256-ucSdll3uu4lu3FIYQ1hyLnm2BGiIydHx40orLN9VM8s=", + "lastModified": 1717703773, + "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", "owner": "runtimeverification", "repo": "k", - "rev": "e12cbe44f5e39c7daf84b62e538d59b8fa31bc28", + "rev": "e070a2048b7e6ce45748426c4868d593113af050", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.112", + "ref": "v7.0.120", "repo": "k", "type": "github" } @@ -401,16 +401,16 @@ ] }, "locked": { - "lastModified": 1717532732, - "narHash": "sha256-0VTqGrolstZlxtd6DRmoWnJsYO+BB8i+PniGKenB34I=", + "lastModified": 1717613611, + "narHash": "sha256-5rDBlXOfvxYNei+mL949pV6TIE5oAfY6LKxV/AcU3Mo=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "caca83fbec616482760697fbf7620c45e9b560b7", + "rev": "744a6150c4e616edcd60faf9786cc27780c364ad", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.42", + "ref": "v0.1.44", "repo": "llvm-backend", "type": "github" } @@ -437,16 +437,16 @@ ] }, "locked": { - "lastModified": 1717532732, - "narHash": "sha256-0VTqGrolstZlxtd6DRmoWnJsYO+BB8i+PniGKenB34I=", + "lastModified": 1717613611, + "narHash": "sha256-5rDBlXOfvxYNei+mL949pV6TIE5oAfY6LKxV/AcU3Mo=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "caca83fbec616482760697fbf7620c45e9b560b7", + "rev": "744a6150c4e616edcd60faf9786cc27780c364ad", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.42", + "ref": "v0.1.44", "repo": "llvm-backend", "type": "github" } @@ -737,17 +737,17 @@ }, "locked": { "dir": "pyk", - "lastModified": 1717580671, - "narHash": "sha256-ucSdll3uu4lu3FIYQ1hyLnm2BGiIydHx40orLN9VM8s=", + "lastModified": 1717703773, + "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", "owner": "runtimeverification", "repo": "k", - "rev": "e12cbe44f5e39c7daf84b62e538d59b8fa31bc28", + "rev": "e070a2048b7e6ce45748426c4868d593113af050", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.112", + "ref": "v7.0.120", "repo": "k", "type": "github" } @@ -765,17 +765,17 @@ }, "locked": { "dir": "pyk", - "lastModified": 1717580671, - "narHash": "sha256-ucSdll3uu4lu3FIYQ1hyLnm2BGiIydHx40orLN9VM8s=", + "lastModified": 1717703773, + "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", "owner": "runtimeverification", "repo": "k", - "rev": "e12cbe44f5e39c7daf84b62e538d59b8fa31bc28", + "rev": "e070a2048b7e6ce45748426c4868d593113af050", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.112", + "ref": "v7.0.120", "repo": "k", "type": "github" } @@ -1159,16 +1159,16 @@ ] }, "locked": { - "lastModified": 1717594015, - "narHash": "sha256-5v6ToIgOMZePIKturVNdI6P6BY/4IycwQf6GsyA2ovU=", + "lastModified": 1717793313, + "narHash": "sha256-zebJuu6j40Vy/B0OSP/0CratXtlPwB0xPNogmavpLYs=", "owner": "runtimeverification", "repo": "wasm-semantics", - "rev": "300550f22fbb1f7b8eddf9c5df4cd334eaf73fbd", + "rev": "1371b5a28a553cd8dfce335ebb44a5c5758e98f7", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.59", + "ref": "v0.1.60", "repo": "wasm-semantics", "type": "github" } diff --git a/flake.nix b/flake.nix index b734b393..4dbb972e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "K Semantics of MultiversX"; inputs = { - wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.59"; - k-framework.url = "github:runtimeverification/k/v7.0.112"; - pyk.url = "github:runtimeverification/k/v7.0.112?dir=pyk"; + wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.60"; + k-framework.url = "github:runtimeverification/k/v7.0.120"; + pyk.url = "github:runtimeverification/k/v7.0.120?dir=pyk"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.url = "github:runtimeverification/rv-nix-tools"; @@ -116,9 +116,9 @@ pykwasm = wasm-semantics.packages.${prev.system}.kwasm-pyk; hypothesis = prevPython.hypothesis.overridePythonAttrs (old: { propagatedBuildInputs = prev.lib.filter - (x: !(prev.lib.strings.hasInfix "attrs" x.name)) + (x: !(prev.lib.strings.hasInfix "attrs" x.name || prev.lib.strings.hasInfix "exceptiongroup" x.name)) old.propagatedBuildInputs; - buildInputs = (old.buildInputs or []) ++ [ finalPython.attrs ]; + buildInputs = (old.buildInputs or []) ++ [ finalPython.attrs finalPython.exceptiongroup ]; }); }); groups = [ ]; diff --git a/kmultiversx/poetry.lock b/kmultiversx/poetry.lock index c586b403..571236bf 100644 --- a/kmultiversx/poetry.lock +++ b/kmultiversx/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "attrs" @@ -494,13 +494,13 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve [[package]] name = "hypothesis" -version = "6.103.0" +version = "6.103.1" description = "A library for property-based testing" optional = false python-versions = ">=3.8" files = [ - {file = "hypothesis-6.103.0-py3-none-any.whl", hash = "sha256:0d21a87e2d68b4937f19f1e6e681d747de65f748c9caa818308a0e3899ea8481"}, - {file = "hypothesis-6.103.0.tar.gz", hash = "sha256:7fe91917b99fc98ac150ec295775a687448c7c42c2276ab6e4a6969a4b285bb5"}, + {file = "hypothesis-6.103.1-py3-none-any.whl", hash = "sha256:d3c959fab6233e78867499e2117ae9db8dc40eeed936d71a2cfc7b6094972e74"}, + {file = "hypothesis-6.103.1.tar.gz", hash = "sha256:d299d5c21d6408eab3be670c94c974f3acf0b511c61fe81804b09091e393ee1f"}, ] [package.dependencies] @@ -761,13 +761,13 @@ files = [ [[package]] name = "packaging" -version = "24.0" +version = "24.1" description = "Core utilities for Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, - {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, + {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"}, + {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] [[package]] @@ -972,7 +972,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "7.0.112" +version = "7.0.120" description = "" optional = false python-versions = "^3.10" @@ -986,6 +986,7 @@ filelock = "^3.9.0" graphviz = "^0.20.1" psutil = "5.9.5" pybind11 = "^2.10.3" +pytest = "*" textual = "^0.27.0" tomli = "^2.0.1" xdg-base-dirs = "^6.0.1" @@ -993,13 +994,13 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/k.git" -reference = "v7.0.112" -resolved_reference = "e12cbe44f5e39c7daf84b62e538d59b8fa31bc28" +reference = "v7.0.120" +resolved_reference = "e070a2048b7e6ce45748426c4868d593113af050" subdirectory = "pyk" [[package]] name = "pykwasm" -version = "0.1.59" +version = "0.1.60" description = "" optional = false python-versions = "^3.10" @@ -1010,13 +1011,13 @@ develop = false cytoolz = "^0.12.1" numpy = "^1.24.2" py-wasm = {git = "https://github.com/runtimeverification/py-wasm.git", tag = "0.2.1"} -pyk = {git = "https://github.com/runtimeverification/k.git", tag = "v7.0.112", subdirectory = "pyk"} +pyk = {git = "https://github.com/runtimeverification/k.git", tag = "v7.0.120", subdirectory = "pyk"} [package.source] type = "git" url = "https://github.com/runtimeverification/wasm-semantics.git" -reference = "v0.1.59" -resolved_reference = "300550f22fbb1f7b8eddf9c5df4cd334eaf73fbd" +reference = "v0.1.60" +resolved_reference = "1371b5a28a553cd8dfce335ebb44a5c5758e98f7" subdirectory = "pykwasm" [[package]] @@ -1119,13 +1120,13 @@ testing = ["filelock"] [[package]] name = "pyupgrade" -version = "3.15.2" +version = "3.16.0" description = "A tool to automatically upgrade syntax for newer versions." optional = false python-versions = ">=3.8.1" files = [ - {file = "pyupgrade-3.15.2-py2.py3-none-any.whl", hash = "sha256:ce309e0ff8ecb73f56a45f12570be84bbbde9540d13697cacb261a7f595fb1f5"}, - {file = "pyupgrade-3.15.2.tar.gz", hash = "sha256:c488d6896c546d25845712ef6402657123008d56c1063174e27aabe15bd6b4e5"}, + {file = "pyupgrade-3.16.0-py2.py3-none-any.whl", hash = "sha256:7a54ee28f3024d027048d49d101e5c702e88c85edc3a1d08b636c50ebef2a97d"}, + {file = "pyupgrade-3.16.0.tar.gz", hash = "sha256:237893a05d5b117259b31b423f23cbae4bce0b7eae57ba9a52c06098c2ddd76f"}, ] [package.dependencies] @@ -1230,13 +1231,13 @@ files = [ [[package]] name = "typing-extensions" -version = "4.12.1" +version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, - {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, + {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, + {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] [[package]] @@ -1293,4 +1294,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "93900167099fd716e1484890f8f3d95b214ef1d08be40149179c3d330a74b1bb" +content-hash = "b1ea7354bcc43f28d2d766d6dada37f5f908b6a80461e77b0f59b4cd0ece55b8" diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml index d2e0ac52..19725e03 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.75" +version = "0.1.76" 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.59", subdirectory = "pykwasm" } +pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v0.1.60", subdirectory = "pykwasm" } pycryptodomex = "^3.18.0" hypothesis = "^6.82.6" diff --git a/kmultiversx/src/tests/unit/test_generate_claim.py b/kmultiversx/src/tests/unit/test_generate_claim.py index f9a6b022..1e4c3687 100644 --- a/kmultiversx/src/tests/unit/test_generate_claim.py +++ b/kmultiversx/src/tests/unit/test_generate_claim.py @@ -15,9 +15,6 @@ def test_generate_cterms_init_config(kasmer_llvm_krun: KRun) -> None: # Given conf = kasmer_llvm_krun.definition.init_config(GENERATED_TOP_CELL) - # Check that the definition can be parsed - assert kasmer_llvm_krun.kompiled_kore - sym_conf, subst = split_config_from(conf) # When diff --git a/package/version b/package/version index d9ba7470..ad069db6 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.75 +0.1.76