From 0acf40245dac2eb2e99672978ea2813a69db7891 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 23 May 2024 11:26:15 -0600 Subject: [PATCH] Update dependency: deps/k_release (#634) * deps/k_release: Set Version 7.0.71 * Set Version: 0.1.54 * pykwasm/: sync poetry files v7.0.71 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.72 * pykwasm/: sync poetry files v7.0.72 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.74 * pykwasm/: sync poetry files v7.0.74 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.75 * pykwasm/: sync poetry files v7.0.75 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.76 * pykwasm/: sync poetry files v7.0.76 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.77 * pykwasm/: sync poetry files v7.0.77 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.78 * pykwasm/: sync poetry files v7.0.78 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.79 * pykwasm/: sync poetry files v7.0.79 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.80 * pykwasm/: sync poetry files v7.0.80 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.81 * pykwasm/: sync poetry files v7.0.81 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.82 * pykwasm/: sync poetry files v7.0.82 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.83 * pykwasm/: sync poetry files v7.0.83 * flake.{nix,lock}: update Nix derivations * KompileBackend => PykBackend * deps/k_release: Set Version 7.0.84 * pykwasm/: sync poetry files v7.0.84 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.85 * pykwasm/: sync poetry files v7.0.85 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.86 * pykwasm/: sync poetry files v7.0.86 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.87 * pykwasm/: sync poetry files v7.0.87 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.88 * pykwasm/: sync poetry files v7.0.88 * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops Co-authored-by: Burak Bilge Yalcinkaya --- deps/k_release | 2 +- flake.lock | 46 ++++++++++++++--------------- flake.nix | 4 +-- package/version | 2 +- pykwasm/poetry.lock | 33 ++++++++++----------- pykwasm/pyproject.toml | 4 +-- pykwasm/src/pykwasm/kdist/plugin.py | 8 ++--- 7 files changed, 49 insertions(+), 50 deletions(-) diff --git a/deps/k_release b/deps/k_release index 826cf4cdd..05677817f 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.0.70 +7.0.88 diff --git a/flake.lock b/flake.lock index db3314787..d053680c6 100644 --- a/flake.lock +++ b/flake.lock @@ -82,17 +82,17 @@ "z3": "z3" }, "locked": { - "lastModified": 1715857203, - "narHash": "sha256-JrT/ectLjfID38zRPhg/g3oixinnBL3sChqYXqp0BpI=", + "lastModified": 1716384169, + "narHash": "sha256-38gjUPxqG3unkeReIP3zQZ8OTVbjNtzLqagaV2ShjKo=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "b27210141c06c5698201dc3f1fabc90bd09ffe59", + "rev": "e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "b27210141c06c5698201dc3f1fabc90bd09ffe59", + "rev": "e62fba2f0f774cd1ee68a41df3d648d7fe2e72e6", "type": "github" } }, @@ -126,16 +126,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1715861198, - "narHash": "sha256-DfnjlbsuhEF5Wqu/Qj6V1EFu2vznNoFv8Sp0s46hW0s=", + "lastModified": 1716471750, + "narHash": "sha256-hICyh0/tYJf5mdd6macXJ4uriRakCogdIMNNqUgyu3A=", "owner": "runtimeverification", "repo": "k", - "rev": "b8ec37891c2e3e68afe5c5a0c14e2d2d17ef2daf", + "rev": "f96245d1fe97055ce76ce55bac50a8841e2655e6", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.70", + "ref": "v7.0.88", "repo": "k", "type": "github" } @@ -160,16 +160,16 @@ ] }, "locked": { - "lastModified": 1715284351, - "narHash": "sha256-wO2MgweSgNRKzKrHwUn5Bi1O9dsL4HA3qVAmW5KscGQ=", + "lastModified": 1716400974, + "narHash": "sha256-BwZAoBwz8v/43gHT1ILHVJVX88yGLZREt8VRhs0BRtg=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "da09d4e96132e6cb6f723143bf652ac512c293ab", + "rev": "0f10a29b03061cff9389051da487d485afc67679", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.12", + "ref": "v0.1.26", "repo": "llvm-backend", "type": "github" } @@ -230,17 +230,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707163378, - "narHash": "sha256-oz+BzUDwtyircjjxv9aPYOS5gobxLCjD2il+gb/bCRo=", + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" } }, @@ -314,17 +314,17 @@ }, "locked": { "dir": "pyk", - "lastModified": 1715861198, - "narHash": "sha256-DfnjlbsuhEF5Wqu/Qj6V1EFu2vznNoFv8Sp0s46hW0s=", + "lastModified": 1716471750, + "narHash": "sha256-hICyh0/tYJf5mdd6macXJ4uriRakCogdIMNNqUgyu3A=", "owner": "runtimeverification", "repo": "k", - "rev": "b8ec37891c2e3e68afe5c5a0c14e2d2d17ef2daf", + "rev": "f96245d1fe97055ce76ce55bac50a8841e2655e6", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.70", + "ref": "v7.0.88", "repo": "k", "type": "github" } @@ -413,11 +413,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715010438, - "narHash": "sha256-Do1CWSXjmmun4HvsIymchDhe6EvVS46BTpM466bwNcc=", + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", "owner": "runtimeverification", "repo": "rv-nix-tools", - "rev": "dbffdf9266aa237da45c0b08f6750ced7c1cd686", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 15f882a55..0d4c4716e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "K Semantics of WebAssembly"; inputs = { - k-framework.url = "github:runtimeverification/k/v7.0.70"; + k-framework.url = "github:runtimeverification/k/v7.0.88"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.follows = "k-framework/rv-utils"; - pyk.url = "github:runtimeverification/k/v7.0.70?dir=pyk"; + pyk.url = "github:runtimeverification/k/v7.0.88?dir=pyk"; nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; }; diff --git a/package/version b/package/version index a4c528cd5..7b300677b 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.53 +0.1.54 diff --git a/pykwasm/poetry.lock b/pykwasm/poetry.lock index 1e620a553..397e8709f 100644 --- a/pykwasm/poetry.lock +++ b/pykwasm/poetry.lock @@ -750,13 +750,13 @@ files = [ [[package]] name = "pep8-naming" -version = "0.13.3" +version = "0.14.1" description = "Check PEP-8 naming conventions, plugin for flake8" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pep8-naming-0.13.3.tar.gz", hash = "sha256:1705f046dfcd851378aac3be1cd1551c7c1e5ff363bacad707d43007877fa971"}, - {file = "pep8_naming-0.13.3-py3-none-any.whl", hash = "sha256:1a86b8c71a03337c97181917e2b472f0f5e4ccb06844a0d6f0a33522549e7a80"}, + {file = "pep8-naming-0.14.1.tar.gz", hash = "sha256:1ef228ae80875557eb6c1549deafed4dabbf3261cfcafa12f773fe0db9be8a36"}, + {file = "pep8_naming-0.14.1-py3-none-any.whl", hash = "sha256:63f514fc777d715f935faf185dedd679ab99526a7f2f503abb61587877f7b1c5"}, ] [package.dependencies] @@ -898,7 +898,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "7.0.70" +version = "7.0.88" description = "" optional = false python-versions = "^3.10" @@ -919,8 +919,8 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/k.git" -reference = "v7.0.70" -resolved_reference = "b8ec37891c2e3e68afe5c5a0c14e2d2d17ef2daf" +reference = "v7.0.88" +resolved_reference = "f96245d1fe97055ce76ce55bac50a8841e2655e6" subdirectory = "pyk" [[package]] @@ -946,13 +946,13 @@ files = [ [[package]] name = "pytest" -version = "8.2.0" +version = "8.2.1" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.8" files = [ - {file = "pytest-8.2.0-py3-none-any.whl", hash = "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233"}, - {file = "pytest-8.2.0.tar.gz", hash = "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f"}, + {file = "pytest-8.2.1-py3-none-any.whl", hash = "sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1"}, + {file = "pytest-8.2.1.tar.gz", hash = "sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd"}, ] [package.dependencies] @@ -1055,19 +1055,18 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "69.5.1" +version = "70.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-69.5.1-py3-none-any.whl", hash = "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32"}, - {file = "setuptools-69.5.1.tar.gz", hash = "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987"}, + {file = "setuptools-70.0.0-py3-none-any.whl", hash = "sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4"}, + {file = "setuptools-70.0.0.tar.gz", hash = "sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mypy (==1.9)", "packaging (>=23.2)", "pip (>=19.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] +docs = ["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"] +testing = ["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)", "mypy (==1.9)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] [[package]] name = "textual" @@ -1187,4 +1186,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "9050726dc872eee5079d83766d0b7117fa0699d6a9012d740fddf58edb3e621a" +content-hash = "f208dbef8fcf6b5a8faadf30deff15a6b5cff8ba7f7ed5085dfbc2447209adcc" diff --git a/pykwasm/pyproject.toml b/pykwasm/pyproject.toml index bd2886453..ee8afb414 100644 --- a/pykwasm/pyproject.toml +++ b/pykwasm/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pykwasm" -version = "0.1.53" +version = "0.1.54" description = "" authors = [ "Runtime Verification, Inc. ", @@ -23,7 +23,7 @@ wasm-semantics = "pykwasm.kdist.plugin" python = "^3.10" cytoolz = "^0.12.1" numpy = "^1.24.2" -pyk = { git = "https://github.com/runtimeverification/k.git", tag="v7.0.70", subdirectory = "pyk" } +pyk = { git = "https://github.com/runtimeverification/k.git", tag="v7.0.88", subdirectory = "pyk" } py-wasm = { git = "https://github.com/runtimeverification/py-wasm.git", tag="0.2.1" } [tool.poetry.group.dev.dependencies] diff --git a/pykwasm/src/pykwasm/kdist/plugin.py b/pykwasm/src/pykwasm/kdist/plugin.py index 0ea9704ef..bda111e99 100644 --- a/pykwasm/src/pykwasm/kdist/plugin.py +++ b/pykwasm/src/pykwasm/kdist/plugin.py @@ -6,7 +6,7 @@ from pyk.kbuild.utils import k_version from pyk.kdist.api import Target -from pyk.ktool.kompile import KompileBackend, kompile +from pyk.ktool.kompile import PykBackend, kompile if TYPE_CHECKING: from collections.abc import Callable, Mapping @@ -44,7 +44,7 @@ def deps(self) -> tuple[str]: 'source': SourceTarget(), 'llvm': KompileTarget( lambda src_dir: { - 'backend': KompileBackend.LLVM, + 'backend': PykBackend.LLVM, 'main_file': src_dir / 'wasm-semantics/test.md', 'main_module': 'WASM-TEST', 'syntax_module': 'WASM-TEST-SYNTAX', @@ -57,7 +57,7 @@ def deps(self) -> tuple[str]: ), 'kwasm-lemmas': KompileTarget( lambda src_dir: { - 'backend': KompileBackend.HASKELL, + 'backend': PykBackend.HASKELL, 'main_file': src_dir / 'wasm-semantics/kwasm-lemmas.md', 'main_module': 'KWASM-LEMMAS', 'syntax_module': 'WASM-TEXT-SYNTAX', @@ -67,7 +67,7 @@ def deps(self) -> tuple[str]: ), 'wrc20': KompileTarget( lambda src_dir: { - 'backend': KompileBackend.HASKELL, + 'backend': PykBackend.HASKELL, 'main_file': src_dir / 'wasm-semantics/wrc20.md', 'main_module': 'WRC20-LEMMAS', 'syntax_module': 'WASM-TEXT-SYNTAX',