Merge remote-tracking branch 'origin/master' into docker-tweaks

Author: jberthold

.github/actions/with-docker/action.yml

@@ -40,4 +40,4 @@ runs:
         ${TAG}
 
       docker cp . ${CONTAINER_NAME}:/home/${USER}/workspace
-      docker exec --user root ${CONTAINER_NAME} chown -R ${USER}:${GROUP} /home/${USER}
+      docker exec --user root ${CONTAINER_NAME} chown -R ${USER}:${GROUP} /home/${USER}/workspace

deps/k_release

@@ -1 +1 @@
-7.1.245
+7.1.248

flake.lock

@@ -1,7 +1,7 @@
 {
   description = "kmir - ";
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v7.1.245";
+    k-framework.url = "github:runtimeverification/k/v7.1.248";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";

flake.nix

@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kmir"
-version = "0.3.128"
+version = "0.3.129"
 description = ""
 requires-python = "~=3.10"
 dependencies = [
-    "kframework==v7.1.245",
+    "kframework==v7.1.248",
 ]
 
 [[project.authors]]

kmir/pyproject.toml

@@ -1,3 +1,3 @@
 from typing import Final
 
-VERSION: Final = '0.3.128'
+VERSION: Final = '0.3.129'

kmir/src/kmir/__init__.py

@@ -8,7 +8,7 @@
 from pyk.kast.att import Atts
 from pyk.kast.inner import KApply, KSort, KToken
 from pyk.kast.outer import KTerminal
-from pyk.prelude.utils import token
+from pyk.kast.prelude.utils import token
 
 if TYPE_CHECKING:
     from pathlib import Path

kmir/src/kmir/parse/parser.py

@@ -4,8 +4,8 @@
 
 from pyk.kast.inner import KSort, Subst
 from pyk.kast.outer import read_kast_definition
+from pyk.kast.prelude.string import stringToken
 from pyk.ktool.krun import KRun
-from pyk.prelude.string import stringToken
 
 from .kparse import KParse
 

kmir/src/kmir/tools.py

@@ -1 +1 @@
-0.3.128
+0.3.129