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 <devops@runtimeverification.com> Co-authored-by: dkcumming <daniel.cumming@runtimeverification.com> Co-authored-by: Sam Balco <goodlyrottenapple@gmail.com>
runtimeverification · Jun 13, 2024 · d52fa59 · d52fa59
1 parent d80d9fc
commit d52fa59
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 82 deletions.
diff --git 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
@@ -1 +1 @@
-7.0.120
+7.1.3
diff --git a/flake.lock b/flake.lock
diff --git 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 <version>
-                  # 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 <version>
+                    # 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
diff --git 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. <contact@runtimeverification.com>",
@@ -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
@@ -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
@@ -1 +1 @@
-0.2.60
+0.2.61