From d52fa598f52a39ed1b04c06dab9339b800591d1e Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 13 Jun 2024 14:33:20 -0600 Subject: [PATCH] Update dependency: deps/k_release (#363) * deps/k_release: Set Version 7.0.110 * Set Version: 0.2.60 * deps/k_release: Set Version 7.0.111 * deps/k_release: Set Version 7.0.112 * deps/k_release: Set Version 7.0.113 * deps/k_release: Set Version 7.0.114 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.115 * deps/k_release: Set Version 7.0.116 * deps/k_release: Set Version 7.0.118 * deps/k_release: Set Version 7.0.119 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.120 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * Removed `kompiled_kore` from `CTermSymbolic` * deps/k_release: Set Version 7.0.126 * Set Version: 0.2.61 * deps/k_release: Set Version 7.0.127 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.128 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.129 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.0.130 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.0 * deps/k_release: Set Version 7.1.1 * Updating `pyk` to `kframework` * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * fix flake * deps/k_release: Set Version 7.1.2 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.3 * kmir/{pyproject.toml,poetry.lock}: sync Poetry files * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops Co-authored-by: dkcumming Co-authored-by: Sam Balco --- .github/workflows/update-version.yml | 2 +- deps/k_release | 2 +- flake.lock | 70 ++++++++++++++++++--------- flake.nix | 39 ++++++++------- kmir/poetry.lock | 72 ++++++++++++++-------------- kmir/pyproject.toml | 4 +- kmir/src/kmir/__init__.py | 2 +- package/version | 2 +- 8 files changed, 111 insertions(+), 82 deletions(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index c00538977..83500dd52 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -26,7 +26,7 @@ jobs: run: | K_VERSION=$(cat ./deps/k_release) cd kmir - sed -i 's!pyk = { git = "https://github.com/runtimeverification/k.git", tag = "[v0-9\.]*", subdirectory = "pyk" }!pyk = { git = "https://github.com/runtimeverification/k.git", tag = "v'${K_VERSION}'", subdirectory = "pyk" }!' pyproject.toml + sed -i 's!kframework = { git = "https://github.com/runtimeverification/k.git", tag = "[v0-9\.]*", subdirectory = "pyk" }!kframework = { git = "https://github.com/runtimeverification/k.git", tag = "v'${K_VERSION}'", subdirectory = "pyk" }!' pyproject.toml poetry update -vvv git add pyproject.toml poetry.lock git commit -m 'kmir/{pyproject.toml,poetry.lock}: sync Poetry files' || true diff --git a/deps/k_release b/deps/k_release index 260db422d..1996c5044 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.0.120 +7.1.3 diff --git a/flake.lock b/flake.lock index b3fd3a452..da350cd52 100644 --- a/flake.lock +++ b/flake.lock @@ -82,17 +82,17 @@ "z3": "z3" }, "locked": { - "lastModified": 1717504162, - "narHash": "sha256-muZL1MfImaMimk+f/SwPj4xrlRvDnSpovDhAx/WqdCw=", + "lastModified": 1718284603, + "narHash": "sha256-fLAY8og1RbE9rVcrEbIATUZIpkcajN8CNxDMq5x9I+s=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "abceb59fcbc47d1bc537ff797f806c8bb8649626", + "rev": "9520aa33a9d770395cdc23cbd4c025876f548a78", "type": "github" }, "original": { "owner": "runtimeverification", + "ref": "v0.1.10", "repo": "haskell-backend", - "rev": "abceb59fcbc47d1bc537ff797f806c8bb8649626", "type": "github" } }, @@ -126,16 +126,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1717703773, - "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", + "lastModified": 1718300523, + "narHash": "sha256-SxkUm8RVeVyrU0guP5YtNRo9OaHeR7A03zVe8yBmWdg=", "owner": "runtimeverification", "repo": "k", - "rev": "e070a2048b7e6ce45748426c4868d593113af050", + "rev": "f373630f28653b60b4079cce2242e3bab90ef42c", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.120", + "ref": "v7.1.3", "repo": "k", "type": "github" } @@ -160,16 +160,16 @@ ] }, "locked": { - "lastModified": 1717613611, - "narHash": "sha256-5rDBlXOfvxYNei+mL949pV6TIE5oAfY6LKxV/AcU3Mo=", + "lastModified": 1718022605, + "narHash": "sha256-2eDL/m8nROZid2tczwlzYPsJOj3gA2k60VVL8YuFJBc=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "744a6150c4e616edcd60faf9786cc27780c364ad", + "rev": "2a33228656e168965e89d40ec77a758ccd8f1c29", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.44", + "ref": "v0.1.49", "repo": "llvm-backend", "type": "github" } @@ -246,16 +246,17 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1698675399, - "narHash": "sha256-nj+LNEeVXGP31vxoL3x7HW7+oEiyoLVDqwMg30yFBMA=", - "owner": "NixOS", + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "7378978469efa3b2b2f97d645a2a0b0e2447da2b", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" } }, @@ -309,22 +310,27 @@ "poetry2nix", "flake-utils" ], - "nixpkgs": "nixpkgs_4", - "poetry2nix": "poetry2nix" + "nixpkgs": [ + "pyk", + "rv-utils", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "rv-utils": "rv-utils_4" }, "locked": { "dir": "pyk", - "lastModified": 1717703773, - "narHash": "sha256-3eIJw8y8COwUCAqGNyv+Q0juud4F/rdIIAAioC/J2f4=", + "lastModified": 1718300523, + "narHash": "sha256-SxkUm8RVeVyrU0guP5YtNRo9OaHeR7A03zVe8yBmWdg=", "owner": "runtimeverification", "repo": "k", - "rev": "e070a2048b7e6ce45748426c4868d593113af050", + "rev": "f373630f28653b60b4079cce2242e3bab90ef42c", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.120", + "ref": "v7.1.3", "repo": "k", "type": "github" } @@ -426,6 +432,24 @@ "type": "github" } }, + "rv-utils_4": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "type": "github" + } + }, "stacklock2nix": { "locked": { "lastModified": 1705051190, diff --git a/flake.nix b/flake.nix index c497fa9a6..f82acfec8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = " A flake for KMIR Semantics"; inputs = { - k-framework.url = "github:runtimeverification/k/v7.0.120"; + k-framework.url = "github:runtimeverification/k/v7.1.3"; 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.120?dir=pyk"; + pyk.url = "github:runtimeverification/k/v7.1.3?dir=pyk"; nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; }; @@ -33,21 +33,26 @@ }; overrides = poetry2nix.overrides.withDefaults (finalPython: prevPython: { - pyk = nixpkgs-pyk.pyk-python310.overridePythonAttrs (old: { - # both kmir and pyk depend on the filelock package, however the two packages are likely - # to use different versions, based on whatever version was locked in their respecitve poetry.lock - # files. However, because all python package deps are propagated py poetry2nix into any - # subsequent packages that depend on them, we get a clash when two versions of the same package occur. - # Below, we manually filter out the filelock package locked by pyk's poetry.lock file - # and substitute in the version from mir's poetry.lock. - # This is not ideal and may not be feasible if there are more/more complex clashes. - # We could just let poetry2nix download pyk without importing it as a flake, - # but then we would lose the ability to do kup install kmir --override pyk - # and we would instead have to modify pyproject.toml to point to the version of pyk we want, then - # call kup install kmir --version . to use the modified local checkout. - propagatedBuildInputs = prev.lib.filter - (x: !(prev.lib.strings.hasInfix "filelock" x.name)) - old.propagatedBuildInputs ++ [ finalPython.filelock ]; + kframework = nixpkgs-pyk.pyk-python310.overridePythonAttrs + (old: { + # both kmir and pyk depend on the filelock package, however the two packages are likely + # to use different versions, based on whatever version was locked in their respecitve poetry.lock + # files. However, because all python package deps are propagated py poetry2nix into any + # subsequent packages that depend on them, we get a clash when two versions of the same package occur. + # Below, we manually filter out the filelock package locked by pyk's poetry.lock file + # and substitute in the version from mir's poetry.lock. + # This is not ideal and may not be feasible if there are more/more complex clashes. + # We could just let poetry2nix download pyk without importing it as a flake, + # but then we would lose the ability to do kup install kmir --override pyk + # and we would instead have to modify pyproject.toml to point to the version of pyk we want, then + # call kup install kmir --version . to use the modified local checkout. + propagatedBuildInputs = prev.lib.filter + (x: !(prev.lib.strings.hasInfix "filelock" x.name)) + old.propagatedBuildInputs ++ [ finalPython.filelock ]; + }); + pygments = prevPython.pygments.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) + ++ [ prevPython.hatchling ]; }); }); groups = [ ]; diff --git a/kmir/poetry.lock b/kmir/poetry.lock index 2a683f054..09c9b90c9 100644 --- a/kmir/poetry.lock +++ b/kmir/poetry.lock @@ -342,6 +342,34 @@ files = [ [package.extras] colors = ["colorama (>=0.4.6)"] +[[package]] +name = "kframework" +version = "7.1.3" +description = "" +category = "main" +optional = false +python-versions = "^3.10" +files = [] +develop = false + +[package.dependencies] +cmd2 = "^2.4.2" +coloredlogs = "^15.0.1" +filelock = "^3.9.0" +graphviz = "^0.20.1" +psutil = "5.9.5" +pybind11 = "^2.10.3" +pytest = "*" +textual = "^0.27.0" +tomli = "^2.0.1" +xdg-base-dirs = "^6.0.1" + +[package.source] +type = "git" +url = "https://github.com/runtimeverification/k.git" +reference = "v7.1.3" +resolved_reference = "f373630f28653b60b4079cce2242e3bab90ef42c" +subdirectory = "pyk" [[package]] name = "linkify-it-py" version = "2.0.3" @@ -496,14 +524,14 @@ files = [ [[package]] name = "packaging" -version = "24.0" +version = "24.1" description = "Core utilities for Python packages" category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, - {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, + {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"}, + {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] [[package]] @@ -647,34 +675,6 @@ files = [ [package.extras] windows-terminal = ["colorama (>=0.4.6)"] -[[package]] -name = "pyk" -version = "7.0.120" -description = "" -category = "main" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -cmd2 = "^2.4.2" -coloredlogs = "^15.0.1" -filelock = "^3.9.0" -graphviz = "^0.20.1" -psutil = "5.9.5" -pybind11 = "^2.10.3" -pytest = "*" -textual = "^0.27.0" -tomli = "^2.0.1" -xdg-base-dirs = "^6.0.1" - -[package.source] -type = "git" -url = "https://github.com/runtimeverification/k.git" -reference = "v7.0.120" -resolved_reference = "e070a2048b7e6ce45748426c4868d593113af050" -subdirectory = "pyk" [[package]] name = "pyperclip" version = "1.8.2" @@ -845,14 +845,14 @@ files = [ [[package]] name = "typing-extensions" -version = "4.12.1" +version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, - {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, + {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, + {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] [[package]] @@ -913,4 +913,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "e160e4465fc56e2908812378b034dfb2c9a5d1c66b490c544e401149839d24d2" +content-hash = "db043d93495987b7122a80958a59bd61befe1103729a7adeea05d0e3cbe8fdd9" diff --git a/kmir/pyproject.toml b/kmir/pyproject.toml index 8e2cdceb6..03e1e1e74 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.60" +version = "0.2.61" 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/k.git", tag = "v7.0.120", subdirectory = "pyk" } +kframework = { git = "https://github.com/runtimeverification/k.git", tag = "v7.1.3", subdirectory = "pyk" } [tool.poetry.group.dev.dependencies] autoflake = "*" diff --git a/kmir/src/kmir/__init__.py b/kmir/src/kmir/__init__.py index 750fd6cfb..4a61e06af 100644 --- a/kmir/src/kmir/__init__.py +++ b/kmir/src/kmir/__init__.py @@ -2,4 +2,4 @@ from .kmir import KMIR -VERSION: Final = '0.2.60' +VERSION: Final = '0.2.61' diff --git a/package/version b/package/version index 9cc5016b4..f3e748b17 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.2.60 +0.2.61