From d74815d00066ff347b4b4ad95ffe962cff9f1948 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Sun, 3 Mar 2024 20:18:00 -0700 Subject: [PATCH] Update dependency: deps/pyk_release (#335) * deps/pyk_release: Set Version v0.1.673 * Set Version: 0.2.34 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.674 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * deps/k_release: sync release file version 6.3.23 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.675 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * deps/k_release: sync release file version 6.3.24 * flake.{nix,lock}: update Nix derivations * Check that failure_info is APRFailureInfo * kmir/{pyproject.toml,poetry.lock}: sync Poetry files --------- Co-authored-by: devops Co-authored-by: dkcumming --- deps/k_release | 2 +- deps/pyk_release | 2 +- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 4 ++-- kmir/poetry.lock | 20 ++++++++++---------- kmir/pyproject.toml | 4 ++-- kmir/src/kmir/__init__.py | 2 +- kmir/src/kmir/__main__.py | 3 ++- package/version | 2 +- 9 files changed, 38 insertions(+), 37 deletions(-) diff --git a/deps/k_release b/deps/k_release index 822f87b8d..6d721abfa 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.21 +6.3.24 diff --git a/deps/pyk_release b/deps/pyk_release index 9c77d081a..79035a89d 100644 --- a/deps/pyk_release +++ b/deps/pyk_release @@ -1 +1 @@ -v0.1.672 +v0.1.675 diff --git a/flake.lock b/flake.lock index 0fd44b700..8a31bd0f6 100644 --- a/flake.lock +++ b/flake.lock @@ -18,17 +18,17 @@ ] }, "locked": { - "lastModified": 1709082085, - "narHash": "sha256-eRMMmqw0EB2qKXKTVmRycD1X4kTMFrjZH1/EqunEGkg=", + "lastModified": 1709250127, + "narHash": "sha256-FQt90pGfL9rfEvPpME5JLg/1HMsObNZRTo1F7CrCpK4=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "a3d89c2f3af1ccbe56ca88d25bcf6c697c333c21", + "rev": "1f693f02af6f706bcb061b573f1ac50d41e5233e", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "a3d89c2f3af1ccbe56ca88d25bcf6c697c333c21", + "rev": "1f693f02af6f706bcb061b573f1ac50d41e5233e", "type": "github" } }, @@ -53,11 +53,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -160,16 +160,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1709202416, - "narHash": "sha256-xT0Di9njqOVWgnnbYf0AKWCqwvWVwTbRjb3+YSIcIOs=", + "lastModified": 1709312633, + "narHash": "sha256-bkJuVlZhrF2Ea7XgCGSiicxdILGIY8aao3hsvzWf5/M=", "owner": "runtimeverification", "repo": "k", - "rev": "34b7008104f727e9654838ef99af7bea1ed7e617", + "rev": "c24672e46abf11a319df75eb6d61dbd48739357b", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v6.3.21", + "ref": "v6.3.24", "repo": "k", "type": "github" } @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1709121853, - "narHash": "sha256-t66d/iMvidCe8Spd31mV9xl6TtDC+HEcdaNlAQ31Qck=", + "lastModified": 1709310427, + "narHash": "sha256-eUPqJl67cxdeDbZHoAk/w3l0qQXDj+twSt0aIPYX5z8=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "7b744a2fb5e0f752b6c8c5afbfe79904c3c637cf", + "rev": "87edd7989d8521a9218bc73328cca1b321c87ec3", "type": "github" }, "original": { @@ -395,16 +395,16 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1709226261, - "narHash": "sha256-jVoHJ7ebEV6gsHxmxnrbBf5mMLem8uYayeqtgAc7Bsc=", + "lastModified": 1709322253, + "narHash": "sha256-xgkzlbAw5TylREK5+rY3A2GeOR4o+RKIg4lPoabYNT8=", "owner": "runtimeverification", "repo": "pyk", - "rev": "addf8d9e7f82c549d3cf63e80c15a309703ec892", + "rev": "223cd775151e96051fc560849a9c4e2e7fb01a2e", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.672", + "ref": "v0.1.675", "repo": "pyk", "type": "github" } diff --git a/flake.nix b/flake.nix index ef3526d23..95b1734d6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = " A flake for KMIR Semantics"; inputs = { - k-framework.url = "github:runtimeverification/k/v6.3.21"; + k-framework.url = "github:runtimeverification/k/v6.3.24"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.follows = "k-framework/rv-utils"; - pyk.url = "github:runtimeverification/pyk/v0.1.672"; + pyk.url = "github:runtimeverification/pyk/v0.1.675"; nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; }; diff --git a/kmir/poetry.lock b/kmir/poetry.lock index fce2e0c9c..1c2db222d 100644 --- a/kmir/poetry.lock +++ b/kmir/poetry.lock @@ -649,7 +649,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "0.1.672" +version = "0.1.675" description = "" category = "main" optional = false @@ -671,8 +671,8 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.672" -resolved_reference = "addf8d9e7f82c549d3cf63e80c15a309703ec892" +reference = "v0.1.675" +resolved_reference = "223cd775151e96051fc560849a9c4e2e7fb01a2e" [[package]] name = "pyperclip" @@ -699,14 +699,14 @@ files = [ [[package]] name = "pytest" -version = "8.0.2" +version = "8.1.0" description = "pytest: simple powerful testing with Python" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "pytest-8.0.2-py3-none-any.whl", hash = "sha256:edfaaef32ce5172d5466b5127b42e0d6d35ebbe4453f0e3505d96afd93f6b096"}, - {file = "pytest-8.0.2.tar.gz", hash = "sha256:d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd"}, + {file = "pytest-8.1.0-py3-none-any.whl", hash = "sha256:ee32db7af8de4629a455806befa90559f307424c07b8413ccfc30bf5b221dd7e"}, + {file = "pytest-8.1.0.tar.gz", hash = "sha256:f8fa04ab8f98d185113ae60ea6d79c22f8143b14bc1caeced44a0ab844928323"}, ] [package.dependencies] @@ -714,11 +714,11 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=1.3.0,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +pluggy = ">=1.4,<2.0" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +testing = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-mock" @@ -913,4 +913,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "9bbf50bcd3b8767992ad788f1055de59aa5db3763faec2f44d4ac5706e845493" +content-hash = "7742d858150186f378a3ceb2eb7f4eb5719710916fa75c7d9bec55e27e5c1c43" diff --git a/kmir/pyproject.toml b/kmir/pyproject.toml index cdf0880bf..6ab7aa8d9 100644 --- a/kmir/pyproject.toml +++ b/kmir/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kmir" -version = "0.2.33" +version = "0.2.34" description = "" authors = [ "Runtime Verification, Inc. ", @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" filelock = "3.9.0" -pyk = { git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.672" } +pyk = { git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.675" } pytest-timeout = "2.1.0" [tool.poetry.group.dev.dependencies] diff --git a/kmir/src/kmir/__init__.py b/kmir/src/kmir/__init__.py index 8598edd73..9f6bee95b 100644 --- a/kmir/src/kmir/__init__.py +++ b/kmir/src/kmir/__init__.py @@ -5,4 +5,4 @@ from .prove import prove, show_proof, view_proof from .run import run -VERSION: Final = '0.2.33' +VERSION: Final = '0.2.34' diff --git a/kmir/src/kmir/__main__.py b/kmir/src/kmir/__main__.py index 84e00193a..06d508a7d 100644 --- a/kmir/src/kmir/__main__.py +++ b/kmir/src/kmir/__main__.py @@ -5,6 +5,7 @@ from typing import Any, Final, Iterable, Optional from pyk.proof import APRProof +from pyk.proof.reachability import APRFailureInfo from pyk.utils import BugReport, check_dir_path, check_file_path from . import VERSION @@ -153,7 +154,7 @@ def exec_prove( for proof in failed: print(f'PROOF FAILED: {proof.id}') - if isinstance(proof, APRProof) and proof.failure_info is not None: + if isinstance(proof, APRProof) and isinstance(proof.failure_info, APRFailureInfo): failure_info = '\n'.join(proof.failure_info.print()) print(f'{failure_info}') diff --git a/package/version b/package/version index d9955e456..69ca21255 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.2.33 +0.2.34