From e3e21b5d1bf3f12b39fd65f6e667f6dfd10206bd Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 25 Mar 2024 16:02:18 -0600 Subject: [PATCH] Update dependency: kevm-pyk/src/kevm_pyk/kproj/plugin (#2368) * kevm-pyk/src/kevm_pyk/kproj/plugin: Set Version 5aa6993fab90675d971b8b98b3430d11f1ec2a2b * Set Version: 1.0.507 * kevm-pyk/: sync poetry files pyk version v0.1.731 * deps/blockchain-k-plugin_release: sync release file version 5aa6993fab90675d971b8b98b3430d11f1ec2a2b * integrate plugin changes to blake2 build * adapt flake files manually (change list in force-push) --------- Co-authored-by: devops Co-authored-by: Jost Berthold --- deps/blockchain-k-plugin_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- kevm-pyk/poetry.lock | 16 ++++++++-------- kevm-pyk/pyproject.toml | 2 +- kevm-pyk/src/kevm_pyk/__init__.py | 2 +- kevm-pyk/src/kevm_pyk/kdist/plugin.py | 5 ++--- kevm-pyk/src/kevm_pyk/kompile.py | 4 +++- kevm-pyk/src/kevm_pyk/kproj/plugin | 2 +- package/version | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index 4840ba796c..bad7f7faf3 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -247588a696bdb7fcfc170c93a59bd86927a91b3c +5aa6993fab90675d971b8b98b3430d11f1ec2a2b diff --git a/flake.lock b/flake.lock index 6e7cecaee6..28ce8584ed 100644 --- a/flake.lock +++ b/flake.lock @@ -34,17 +34,17 @@ "xbyak": "xbyak" }, "locked": { - "lastModified": 1710952030, - "narHash": "sha256-wvGnIrYNcxKLcWcSAMmkmDEw+4MAriO9Sts+2f1PJLA=", + "lastModified": 1711321833, + "narHash": "sha256-p0HqLxjrYYYHx2BMODp0N/O2KQf0TAGenMFYmToLPrE=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "da74e13951883cecbbc23a941d0fe1bb48821afe", + "rev": "5aa6993fab90675d971b8b98b3430d11f1ec2a2b", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "da74e13951883cecbbc23a941d0fe1bb48821afe", + "rev": "5aa6993fab90675d971b8b98b3430d11f1ec2a2b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 3b807dbf5c..455d4db513 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ poetry2nix.follows = "pyk/poetry2nix"; blockchain-k-plugin = { url = - "github:runtimeverification/blockchain-k-plugin/da74e13951883cecbbc23a941d0fe1bb48821afe"; + "github:runtimeverification/blockchain-k-plugin/5aa6993fab90675d971b8b98b3430d11f1ec2a2b"; inputs.flake-utils.follows = "k-framework/flake-utils"; inputs.nixpkgs.follows = "k-framework/nixpkgs"; }; diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock index f228bff0f8..918f4d8098 100644 --- a/kevm-pyk/poetry.lock +++ b/kevm-pyk/poetry.lock @@ -883,13 +883,13 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no [[package]] name = "pytest-cov" -version = "4.1.0" +version = "5.0.0" description = "Pytest plugin for measuring coverage." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"}, - {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"}, + {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, + {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, ] [package.dependencies] @@ -897,7 +897,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]} pytest = ">=4.6" [package.extras] -testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] +testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"] [[package]] name = "pytest-mock" @@ -952,13 +952,13 @@ testing = ["filelock"] [[package]] name = "pyupgrade" -version = "3.15.1" +version = "3.15.2" description = "A tool to automatically upgrade syntax for newer versions." optional = false python-versions = ">=3.8.1" files = [ - {file = "pyupgrade-3.15.1-py2.py3-none-any.whl", hash = "sha256:c5e005de2805edcd333d1deb04553200ec69da85e4bc9db37b16345ed9e27ed9"}, - {file = "pyupgrade-3.15.1.tar.gz", hash = "sha256:7690857cae0f6253f39241dcd2e57118c333c438b78609fc3c17a5aa61227b7d"}, + {file = "pyupgrade-3.15.2-py2.py3-none-any.whl", hash = "sha256:ce309e0ff8ecb73f56a45f12570be84bbbde9540d13697cacb261a7f595fb1f5"}, + {file = "pyupgrade-3.15.2.tar.gz", hash = "sha256:c488d6896c546d25845712ef6402657123008d56c1063174e27aabe15bd6b4e5"}, ] [package.dependencies] diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 436dc5905a..ef5e090efe 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kevm-pyk" -version = "1.0.506" +version = "1.0.507" description = "" authors = [ "Runtime Verification, Inc. ", diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py index a0b7623b76..bd5a0b87c2 100644 --- 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.506' +VERSION: Final = '1.0.507' diff --git a/kevm-pyk/src/kevm_pyk/kdist/plugin.py b/kevm-pyk/src/kevm_pyk/kdist/plugin.py index 065b8e1977..601ac5be89 100644 --- a/kevm-pyk/src/kevm_pyk/kdist/plugin.py +++ b/kevm-pyk/src/kevm_pyk/kdist/plugin.py @@ -1,6 +1,5 @@ from __future__ import annotations -import shutil import sys from distutils.dir_util import copy_tree from typing import TYPE_CHECKING @@ -65,13 +64,13 @@ def build(self, output_dir: Path, deps: dict[str, Any], args: dict[str, Any], ve copy_tree(str(config.PLUGIN_DIR), '.') run_process( - ['make', 'libcryptopp', 'libff', 'plugin-c/blake2.a', '-j8'], + ['make', 'libcryptopp', 'libff', 'blake2', '-j8'], pipe_stdout=not verbose, ) copy_tree('./build/libcryptopp', str(output_dir / 'libcryptopp')) copy_tree('./build/libff', str(output_dir / 'libff')) - shutil.copy2('./plugin-c/blake2.a', output_dir / 'plugin-c' / 'blake2.a') + copy_tree('./build/blake2', str(output_dir / 'blake2')) def source(self) -> tuple[Path]: return (config.PLUGIN_DIR,) diff --git a/kevm-pyk/src/kevm_pyk/kompile.py b/kevm-pyk/src/kevm_pyk/kompile.py index a060a2ec56..3166695c07 100644 --- a/kevm-pyk/src/kevm_pyk/kompile.py +++ b/kevm-pyk/src/kevm_pyk/kompile.py @@ -219,11 +219,13 @@ def lib_ccopts(plugin_dir: Path, debug_build: bool = False) -> list[str]: libcryptopp_dir = plugin_dir / 'libcryptopp' ccopts += [f'{libcryptopp_dir}/lib/libcryptopp.a', f'-I{libcryptopp_dir}/include'] + blake2_dir = plugin_dir / 'blake2' + ccopts += [f'{blake2_dir}/lib/blake2.a'] + plugin_include = plugin_dir / 'plugin-c' ccopts += [ f'{plugin_include}/plugin_util.cpp', f'{plugin_include}/crypto.cpp', - f'{plugin_include}/blake2.a', ] if kernel == 'darwin': diff --git a/kevm-pyk/src/kevm_pyk/kproj/plugin b/kevm-pyk/src/kevm_pyk/kproj/plugin index 247588a696..5aa6993fab 160000 --- a/kevm-pyk/src/kevm_pyk/kproj/plugin +++ b/kevm-pyk/src/kevm_pyk/kproj/plugin @@ -1 +1 @@ -Subproject commit 247588a696bdb7fcfc170c93a59bd86927a91b3c +Subproject commit 5aa6993fab90675d971b8b98b3430d11f1ec2a2b diff --git a/package/version b/package/version index 2248e4535f..5726fecb05 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.506 +1.0.507