From 85e0c433a3f7252caff241b985cc49379f36d342 Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 29 Apr 2025 22:14:14 +0000 Subject: [PATCH 1/7] deps/k_release: Set Version 7.1.246 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index a13eeb5f..f072705e 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.245 +7.1.246 From f13be4878e98dffb2bb6ea456c52163f79b97678 Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 29 Apr 2025 22:14:28 +0000 Subject: [PATCH 2/7] Set Version: 0.1.65 --- package/version | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/version b/package/version index 9810a3b1..c472eaf6 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.64 +0.1.65 diff --git a/pyproject.toml b/pyproject.toml index a6c7c47a..c641c2c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kriscv" -version = "0.1.64" +version = "0.1.65" description = "K tooling for the RISC-V architecture" authors = [ "Runtime Verification, Inc. ", From bc80bf315b7b2709128ff7aa8670e9c33fe659eb Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 29 Apr 2025 22:16:02 +0000 Subject: [PATCH 3/7] pyproject.toml: sync pyk version 7.1.246 --- poetry.lock | 93 +++----------------------------------------------- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 89 deletions(-) diff --git a/poetry.lock b/poetry.lock index ca665f9e..0b9e6347 100644 --- a/poetry.lock +++ b/poetry.lock @@ -442,24 +442,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} -[[package]] -name = "cmd2" -version = "2.5.11" -description = "cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python" -optional = false -python-versions = ">=3.8" -groups = ["main"] -files = [ - {file = "cmd2-2.5.11-py3-none-any.whl", hash = "sha256:cbc79525e423dc2085ef7922cdc5586d1fedaecb768cdfb05e5482ee0740b755"}, - {file = "cmd2-2.5.11.tar.gz", hash = "sha256:30a0d385021fbe4a4116672845e5695bbe56eb682f9096066776394f954a7429"}, -] - -[package.dependencies] -gnureadline = {version = ">=8", markers = "platform_system == \"Darwin\""} -pyperclip = ">=1.8" -pyreadline3 = {version = ">=3.4", markers = "platform_system == \"Windows\""} -wcwidth = ">=0.2.10" - [[package]] name = "colorama" version = "0.4.6" @@ -790,47 +772,6 @@ files = [ [package.dependencies] gitdb = ">=4.0.1,<5" -[[package]] -name = "gnureadline" -version = "8.2.13" -description = "The standard Python readline extension statically linked against the GNU readline library." -optional = false -python-versions = "*" -groups = ["main"] -markers = "platform_system == \"Darwin\"" -files = [ - {file = "gnureadline-8.2.13-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0ca03501ce0939d7ecf9d075860d6f6ceb2f49f30331b4e96e4678ce03687bab"}, - {file = "gnureadline-8.2.13-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c28e33bfc56d4204693f213abeab927f65c505ce91f668a039720bc7c46b0353"}, - {file = "gnureadline-8.2.13-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6472e3a780087eecd67c03e5455aecb209de51bcae74583222976f6b816f6192"}, - {file = "gnureadline-8.2.13-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94b143ea5d22b0c1ca4a591265afe135272c69b7757e968e34fbb47a7858d1ce"}, - {file = "gnureadline-8.2.13-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:561a60b12f74ea7234036cc4fe558f3b46023be0dac5ed73541ece58cba2f88a"}, - {file = "gnureadline-8.2.13-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:daa405028b9fe92bfbb93624e13e0674a242a1c5434b70ef61a04294502fdb65"}, - {file = "gnureadline-8.2.13-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:576dac060887adc6067ee9d23fb2f0031fb2b3e560e07a6c9e666e05f0473af7"}, - {file = "gnureadline-8.2.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10fcaf561bc4ed6ab7075ab3ead188a18faaf4e6e92d916f81a09c0a670ce906"}, - {file = "gnureadline-8.2.13-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9c152a82613fa012ab4331bb9a0ffddb415e37561d376b910bf9e7d535607faf"}, - {file = "gnureadline-8.2.13-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:85e362d2d0e85e45f0affae7bbfaf998b00167c55a78d31ee0f214de9ff429d2"}, - {file = "gnureadline-8.2.13-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b69e6608cc94e110018b721a11718d480a6330e0b62cbab65a22880e84011205"}, - {file = "gnureadline-8.2.13-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0cc77fc9c8a8fcf10e0a554e49ee763219683386b8f906b7e6ef07c9e40e8420"}, - {file = "gnureadline-8.2.13-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:2d3e33d2e0dd694d623a2ca1fae6990b52f1d25955504b7293a9350fb9912940"}, - {file = "gnureadline-8.2.13-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6c550d08c4d2882a83293a724b14a262ee5078fd4fa7acdc78aa59cab26ae343"}, - {file = "gnureadline-8.2.13-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a7d6e3f5d9fd0cf8a84fb382d4e3ad2914331be4d929f17d50da01f1571c4b03"}, - {file = "gnureadline-8.2.13-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f59275168cae1b02ca1ec7586a9804bb04ce427df92f8582a80d16e96c846b78"}, - {file = "gnureadline-8.2.13-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:59c5505026646da6d5ced6a5316d6d191d011e8be422cba4abce71730ef37dc6"}, - {file = "gnureadline-8.2.13-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f1050ecf789f34d0ab0aacdb605f177725009a864e0038e70380614af92dc0d"}, - {file = "gnureadline-8.2.13-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23b43c8e9e2e6566cb3094749826181a86dba1d94b1e023b5f9923dc26e37876"}, - {file = "gnureadline-8.2.13-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4f5fc90af56a1ae6f88c9c7122fc76141c395b6c342a63800abed8c813f48b85"}, - {file = "gnureadline-8.2.13-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d708e8f655d3b556a138f13e9fcb2d8a10a6901e3125c04cad5ef7c883191fe8"}, - {file = "gnureadline-8.2.13-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:265bcf6ef7082e130160fb34b9664284affb216a22c5bffcd518b35d02bcc4e9"}, - {file = "gnureadline-8.2.13-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07231f8191adb7f204010a86a91df9df9a80944981a16576a471f59304ad6a16"}, - {file = "gnureadline-8.2.13-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:30cc1b6cb11d94554815cb91eb1dfa6a11887185aae50f253adaa393e91c6a86"}, - {file = "gnureadline-8.2.13-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50c40bfffffa82d4fcb0fde4940d4ff128ba2f876c1da09bae9d6d9ff770095e"}, - {file = "gnureadline-8.2.13-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:dcfa601d95c00aa670ec5e4bf791caf6ba0bcf266de940fb54d44c278bd302fe"}, - {file = "gnureadline-8.2.13-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c7b8d3f2a2c9b7e6feaf1f20bdb6ebb8210e207b8c5360ffe407a47efeeb3fb8"}, - {file = "gnureadline-8.2.13-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:811d85a70ac97cddeb1755282915e8a93c279dcf89513426f28617b8feff5aec"}, - {file = "gnureadline-8.2.13-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f57a3aa97c3379b2513c8bfbac0de2dfb41f695623c0b2ad337babb646b51a7"}, - {file = "gnureadline-8.2.13.tar.gz", hash = "sha256:c9b9e1e7ba99a80bb50c12027d6ce692574f77a65bf57bc97041cf81c0f49bd1"}, -] - [[package]] name = "graphviz" version = "0.20.3" @@ -985,18 +926,17 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "kframework" -version = "7.1.245" +version = "7.1.246" description = "" optional = false python-versions = "<4.0,>=3.10" groups = ["main"] files = [ - {file = "kframework-7.1.245-py3-none-any.whl", hash = "sha256:eb2169ab027c454cc64c5c0838129f88d82b86c06697a2d17e5752ed2c720dae"}, - {file = "kframework-7.1.245.tar.gz", hash = "sha256:08e4ef66d48086a59a9d1e8dd1a83211425969fe1947c13ba15c53e869b4d481"}, + {file = "kframework-7.1.246-py3-none-any.whl", hash = "sha256:b2e5396e9ac158e5f8c749e9dd41bf28ca430c073c10ee42eb948c9d059ac2b9"}, + {file = "kframework-7.1.246.tar.gz", hash = "sha256:14deb39f6d74f7008e554804406654a7fad300f0ac4a4ead524d7cc4824a8d35"}, ] [package.dependencies] -cmd2 = ">=2.4.2,<3.0.0" coloredlogs = ">=15.0.1,<16.0.0" cookiecutter = ">=2.6.0,<3.0.0" filelock = ">=3.9.0,<4.0.0" @@ -1461,17 +1401,6 @@ files = [ [package.extras] windows-terminal = ["colorama (>=0.4.6)"] -[[package]] -name = "pyperclip" -version = "1.9.0" -description = "A cross-platform clipboard module for Python. (Only handles plain text for now.)" -optional = false -python-versions = "*" -groups = ["main"] -files = [ - {file = "pyperclip-1.9.0.tar.gz", hash = "sha256:b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310"}, -] - [[package]] name = "pyreadline3" version = "3.5.4" @@ -1479,7 +1408,7 @@ description = "A python implementation of GNU readline." optional = false python-versions = ">=3.8" groups = ["main"] -markers = "sys_platform == \"win32\" or platform_system == \"Windows\"" +markers = "sys_platform == \"win32\"" files = [ {file = "pyreadline3-3.5.4-py3-none-any.whl", hash = "sha256:eaf8e6cc3c49bcccf145fc6067ba8643d1df34d604a1ec0eccbf7a18e6d3fae6"}, {file = "pyreadline3-3.5.4.tar.gz", hash = "sha256:8d57d53039a1c75adba8e50dd3d992b28143480816187ea5efbd5c78e6c885b7"}, @@ -2192,18 +2121,6 @@ h2 = ["h2 (>=4,<5)"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] -[[package]] -name = "wcwidth" -version = "0.2.13" -description = "Measures the displayed width of unicode strings in a terminal" -optional = false -python-versions = "*" -groups = ["main"] -files = [ - {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"}, - {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"}, -] - [[package]] name = "xdg-base-dirs" version = "6.0.2" @@ -2239,4 +2156,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "f991ecd4db8cc46fb783ab14d86de5ea4499102b5501d5e3d6b5d2f913f824d4" +content-hash = "3dd3e23e0288dd6207b6ecc8b98495d00201eea8623d1177de348fc35c755ea5" diff --git a/pyproject.toml b/pyproject.toml index c641c2c9..caf1c392 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ riscv-semantics = "kriscv.kdist.plugin" [tool.poetry.dependencies] python = "^3.10" -kframework = "7.1.245" +kframework = "7.1.246" pyyaml = "^6.0.1" types-pyyaml = "^6.0.12.20240311" filelock = "^3.14.0" From aa6a2f14d4c4da067118cc7741747ef0d72b8c01 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 30 Apr 2025 00:39:21 +0000 Subject: [PATCH 4/7] deps/k_release: Set Version 7.1.247 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index f072705e..25a34300 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.246 +7.1.247 From 773899c8bde20a17969a1aa01360f3a571c26443 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 30 Apr 2025 00:40:46 +0000 Subject: [PATCH 5/7] pyproject.toml: sync pyk version 7.1.247 --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0b9e6347..90d594b1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -926,14 +926,14 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "kframework" -version = "7.1.246" +version = "7.1.247" description = "" optional = false python-versions = "<4.0,>=3.10" groups = ["main"] files = [ - {file = "kframework-7.1.246-py3-none-any.whl", hash = "sha256:b2e5396e9ac158e5f8c749e9dd41bf28ca430c073c10ee42eb948c9d059ac2b9"}, - {file = "kframework-7.1.246.tar.gz", hash = "sha256:14deb39f6d74f7008e554804406654a7fad300f0ac4a4ead524d7cc4824a8d35"}, + {file = "kframework-7.1.247-py3-none-any.whl", hash = "sha256:db59b46081705889233aff834c74f2fe3b7d759b79c66f1235e6daf072206ca2"}, + {file = "kframework-7.1.247.tar.gz", hash = "sha256:4d21ed84e014ea45a8b9d78e149431d6c7759f08d451af424b2b96b20459482f"}, ] [package.dependencies] @@ -2156,4 +2156,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "3dd3e23e0288dd6207b6ecc8b98495d00201eea8623d1177de348fc35c755ea5" +content-hash = "90a5a18720b20ca310651cc9febd4745034350db4cf0471bd17f1f81c2ff92f0" diff --git a/pyproject.toml b/pyproject.toml index caf1c392..eaca622b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ riscv-semantics = "kriscv.kdist.plugin" [tool.poetry.dependencies] python = "^3.10" -kframework = "7.1.246" +kframework = "7.1.247" pyyaml = "^6.0.1" types-pyyaml = "^6.0.12.20240311" filelock = "^3.14.0" From a4c6232be1eb32bbf5c3ae5e26384fa1a29d504b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Wed, 30 Apr 2025 09:27:07 +0000 Subject: [PATCH 6/7] Fix imports --- src/kriscv/sparse_bytes.py | 4 ++-- src/kriscv/term_builder.py | 6 +++--- src/kriscv/tools.py | 2 +- src/tests/unit/test_sparse_bytes.py | 4 ++-- src/tests/unit/test_unit.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kriscv/sparse_bytes.py b/src/kriscv/sparse_bytes.py index 5663fc6f..003e98a0 100644 --- a/src/kriscv/sparse_bytes.py +++ b/src/kriscv/sparse_bytes.py @@ -5,8 +5,8 @@ from typing import NamedTuple from pyk.kast.inner import KInner -from pyk.prelude.kint import eqInt, intToken -from pyk.prelude.ml import mlEqualsTrue +from pyk.kast.prelude.kint import eqInt, intToken +from pyk.kast.prelude.ml import mlEqualsTrue from .term_builder import ( add_bytes, diff --git a/src/kriscv/term_builder.py b/src/kriscv/term_builder.py index 51995de6..511c772c 100644 --- a/src/kriscv/term_builder.py +++ b/src/kriscv/term_builder.py @@ -4,9 +4,9 @@ from typing import TYPE_CHECKING, cast from pyk.kast.inner import KApply, KInner, KSort, KVariable -from pyk.prelude.bytes import bytesToken -from pyk.prelude.collections import map_of -from pyk.prelude.kint import intToken +from pyk.kast.prelude.bytes import bytesToken +from pyk.kast.prelude.collections import map_of +from pyk.kast.prelude.kint import intToken from kriscv.term_manip import normalize_memory diff --git a/src/kriscv/tools.py b/src/kriscv/tools.py index 7544868f..3ab611a6 100644 --- a/src/kriscv/tools.py +++ b/src/kriscv/tools.py @@ -7,9 +7,9 @@ from elftools.elf.elffile import ELFFile # type: ignore from pyk.kast.inner import KSort, Subst from pyk.kast.manip import split_config_from +from pyk.kast.prelude.k import GENERATED_TOP_CELL from pyk.kore.match import kore_int from pyk.ktool.krun import KRun -from pyk.prelude.k import GENERATED_TOP_CELL from kriscv import elf_parser, term_builder from kriscv.term_manip import kore_sparse_bytes, kore_word, match_map diff --git a/src/tests/unit/test_sparse_bytes.py b/src/tests/unit/test_sparse_bytes.py index eb675398..faf28039 100644 --- a/src/tests/unit/test_sparse_bytes.py +++ b/src/tests/unit/test_sparse_bytes.py @@ -4,8 +4,8 @@ import pytest from pyk.kast.inner import KToken, KVariable -from pyk.prelude.kint import eqInt, intToken -from pyk.prelude.ml import mlEqualsTrue +from pyk.kast.prelude.kint import eqInt, intToken +from pyk.kast.prelude.ml import mlEqualsTrue import kriscv.term_builder as tb from kriscv.sparse_bytes import SparseBytes, SymBytes diff --git a/src/tests/unit/test_unit.py b/src/tests/unit/test_unit.py index 17dff22d..8955c069 100644 --- a/src/tests/unit/test_unit.py +++ b/src/tests/unit/test_unit.py @@ -7,9 +7,9 @@ # isort: on import pytest +from pyk.kast.prelude.kint import INT, intToken from pyk.kllvm.convert import llvm_to_pattern, pattern_to_llvm from pyk.kore.match import kore_int -from pyk.prelude.kint import INT, intToken from kriscv import build, term_builder from kriscv.term_builder import register From e8bc18f0d556924e19e631342a45bdf11ebc7bbc Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 30 Apr 2025 09:29:05 +0000 Subject: [PATCH 7/7] pyproject.toml: sync pyk version 7.1.247 --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 90d594b1..c5fc87f9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1852,14 +1852,14 @@ files = [ [[package]] name = "setuptools" -version = "80.0.0" +version = "80.0.1" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.9" groups = ["main", "dev"] files = [ - {file = "setuptools-80.0.0-py3-none-any.whl", hash = "sha256:a38f898dcd6e5380f4da4381a87ec90bd0a7eec23d204a5552e80ee3cab6bd27"}, - {file = "setuptools-80.0.0.tar.gz", hash = "sha256:c40a5b3729d58dd749c0f08f1a07d134fb8a0a3d7f87dc33e7c5e1f762138650"}, + {file = "setuptools-80.0.1-py3-none-any.whl", hash = "sha256:f4b49d457765b3aae7cbbeb1c71f6633a61b729408c2d1a837dae064cca82ef2"}, + {file = "setuptools-80.0.1.tar.gz", hash = "sha256:20fe373a22ef9f3925512650d1db90b1b8de01cdb6df91ab1788263139cbf9a2"}, ] [package.extras]