From 6f73408f71c42571853789e3496a2ed8bfae5ec4 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 28 Aug 2024 18:49:09 +0000 Subject: [PATCH 1/4] kevm-pyk/src/kevm_pyk/kproj/plugin: Set Version 300c9cf567eba4c8c88675ff67ebd859795ee169 --- kevm-pyk/src/kevm_pyk/kproj/plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kevm-pyk/src/kevm_pyk/kproj/plugin b/kevm-pyk/src/kevm_pyk/kproj/plugin index 69fdf830e3..300c9cf567 160000 --- a/kevm-pyk/src/kevm_pyk/kproj/plugin +++ b/kevm-pyk/src/kevm_pyk/kproj/plugin @@ -1 +1 @@ -Subproject commit 69fdf830e3a98a8aa1118f84bd83723f1149468e +Subproject commit 300c9cf567eba4c8c88675ff67ebd859795ee169 From 97c69565f0e08191f0bca4c153166fafee65cfc4 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 28 Aug 2024 18:50:39 +0000 Subject: [PATCH 2/4] kevm-pyk/: sync poetry files pyk version 7.1.121 --- kevm-pyk/poetry.lock | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock index 8bd2b20adf..48eedb601d 100644 --- a/kevm-pyk/poetry.lock +++ b/kevm-pyk/poetry.lock @@ -1035,19 +1035,23 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "73.0.1" +version = "74.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-73.0.1-py3-none-any.whl", hash = "sha256:b208925fcb9f7af924ed2dc04708ea89791e24bde0d3020b27df0e116088b34e"}, - {file = "setuptools-73.0.1.tar.gz", hash = "sha256:d59a3e788ab7e012ab2c4baed1b376da6366883ee20d7a5fc426816e3d7b1193"}, + {file = "setuptools-74.0.0-py3-none-any.whl", hash = "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f"}, + {file = "setuptools-74.0.0.tar.gz", hash = "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"}, ] [package.extras] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"] core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.text (>=3.7)", "more-itertools (>=8.8)", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] +cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] -test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.11.*)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (<0.4)", "pytest-ruff (>=0.2.1)", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +enabler = ["pytest-enabler (>=2.2)"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"] [[package]] name = "sortedcontainers" From 714d152d8421a960646410e82bb25ae81ed23b75 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 28 Aug 2024 18:50:39 +0000 Subject: [PATCH 3/4] deps/blockchain-k-plugin_release: sync release file version 300c9cf567eba4c8c88675ff67ebd859795ee169 --- deps/blockchain-k-plugin_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index 734ff31069..046ce7b641 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -69fdf830e3a98a8aa1118f84bd83723f1149468e +300c9cf567eba4c8c88675ff67ebd859795ee169 From fb6b676c0e7bc1b96ee5d4d7e7b8394f94796857 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 28 Aug 2024 18:51:02 +0000 Subject: [PATCH 4/4] flake.{nix,lock}: update Nix derivations --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e07e2b5115..5b44de1617 100644 --- a/flake.lock +++ b/flake.lock @@ -45,17 +45,17 @@ "xbyak": "xbyak" }, "locked": { - "lastModified": 1724770888, - "narHash": "sha256-FZG6Cag4J7uWzKQztEXfPC5mLV6v68h3G9r9BWTdimQ=", + "lastModified": 1724870545, + "narHash": "sha256-OVT3nyAQI59zQSALEOazE8q7WYRyDc7SbL7ilMAPjHc=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "69fdf830e3a98a8aa1118f84bd83723f1149468e", + "rev": "300c9cf567eba4c8c88675ff67ebd859795ee169", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "69fdf830e3a98a8aa1118f84bd83723f1149468e", + "rev": "300c9cf567eba4c8c88675ff67ebd859795ee169", "type": "github" } }, @@ -334,16 +334,16 @@ ] }, "locked": { - "lastModified": 1724766177, - "narHash": "sha256-P/Pi+bDJqd2FAHp6xR2MVY5kZ4qzfrJ0YTvVFRo/etk=", + "lastModified": 1724866053, + "narHash": "sha256-NtHMCcG5pRszS7+vSrwGDE8B3QoW7+JxbVYaxxwZ+Zw=", "owner": "runtimeverification", "repo": "k", - "rev": "809d59eb819dcb14ac5fb0eb9abe1c05eae38fde", + "rev": "85c8bcbea25dcef0945ed3ece01bdd8bb7a946a5", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.122", + "ref": "v7.1.123", "repo": "k", "type": "github" } diff --git a/flake.nix b/flake.nix index 992db2550d..8955e1d5c4 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ poetry2nix.follows = "pyk/poetry2nix"; blockchain-k-plugin = { url = - "github:runtimeverification/blockchain-k-plugin/69fdf830e3a98a8aa1118f84bd83723f1149468e"; + "github:runtimeverification/blockchain-k-plugin/300c9cf567eba4c8c88675ff67ebd859795ee169"; inputs.flake-utils.follows = "k-framework/flake-utils"; inputs.nixpkgs.follows = "k-framework/nixpkgs"; };