Migrate from poetry to uv (#733)

* cruft update + resolve conflicts in pyproject.toml manually

* remove poetry.lock, create uv.lock

* Makefile: poetry to uv

* update `Dockerfile`

* Update `test-pr.yml`

* Set Version: 0.1.133

* Fix `Dockerfile`

* move `pykwasm/nix` to `nix`, delete `pykwasm/flake.nix`

* `flake.nix`: poetry to uv

* refactor and fix nix derivation

* remove old nix patches

* adapt `uv.lock` to match nix & CU uv version

* update `uv2nix` and `pyproject-build-systems` in CI

* `update-version.yml`: fix kframework update command

* `Makefile`: use `uv --project <PROJECT>` option

* fix kframework update command: `==` => `>=`

---------

Co-authored-by: devops <[email protected]>
Co-authored-by: Julian Kuners <[email protected]>

Author: 3 people

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

@@ -16,8 +16,12 @@ runs:
 
       TAG=runtimeverificationinc/${CONTAINER_NAME}
       K_COMMIT=$(cat ./deps/k_release)
+      UV_VERSION=$(cat deps/uv_release)
 
-      docker build . --tag ${TAG} --build-arg K_COMMIT=${K_COMMIT}
+      docker build . \
+        --tag ${TAG} \
+        --build-arg K_COMMIT=${K_COMMIT} \
+        --build-arg UV_VERSION=$(UV_VERSION)
 
       docker run                 \
         --name ${CONTAINER_NAME} \

.github/workflows/test-pr.yml

@@ -41,10 +41,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: 'Install Poetry'
-        uses: Gr1N/setup-poetry@v8
-      - name: 'Build pykwasm'
-        run: poetry -C pykwasm install
+      - name: 'Get uv release'
+        id: uv_release
+        run: |
+          echo uv_version=$(cat deps/uv_release) >> "${GITHUB_OUTPUT}"
+      - name: 'Install uv'
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: ${{ steps.uv_release.outputs.uv_version }}
       - name: 'Run code quality checks'
         run: make -C pykwasm check
       - name: 'Run pyupgrade'
@@ -66,10 +70,8 @@ jobs:
         uses: ./.github/actions/with-docker
         with:
           container-name: kwasm-ci-conformance-${{ github.sha }}
-      - name: 'Build pykwasm'
-        run: docker exec -u user kwasm-ci-conformance-${GITHUB_SHA} poetry -C pykwasm install
-      - name: 'Build LLVM definition'
-        run: docker exec -u user kwasm-ci-conformance-${GITHUB_SHA} poetry -C pykwasm run kdist -v build wasm-semantics.llvm
+      - name: 'Build KWasm definitions'
+        run: docker exec -u user kwasm-ci-conformance-${GITHUB_SHA} make build
       - name: 'Run integration tests'
         run: docker exec -u user kwasm-ci-conformance-${GITHUB_SHA} make -C pykwasm cov-integration
       - name: 'Run simple tests'
@@ -97,10 +99,8 @@ jobs:
         uses: ./.github/actions/with-docker
         with:
           container-name: kwasm-ci-prove-${{ github.sha }}
-      - name: 'Build pykwasm'
-        run: docker exec -u user kwasm-ci-prove-${GITHUB_SHA} poetry -C pykwasm install
-      - name: 'Build Haskell definitions'
-        run: docker exec -u user kwasm-ci-prove-${GITHUB_SHA} poetry -C pykwasm run kdist -v build wasm-semantics.{kwasm-lemmas,wrc20} -j2
+      - name: 'Build KWasm definitions'
+        run: docker exec -u user kwasm-ci-prove-${GITHUB_SHA} make build
       - name: 'Run prover tests'
         run: docker exec -u user kwasm-ci-prove-${GITHUB_SHA} make -j6 test-prove
       - name: 'Tear down Docker'

.github/workflows/update-version.yml

@@ -4,6 +4,8 @@ on:
     branches:
       - '_update-deps/runtimeverification/k'
       - '_update-deps/runtimeverification/rv-nix-tools'
+      - '_update-deps-cron/uv2nix'
+      - '_update-deps-cron/pyproject-build-systems'
 
 # Stop in progress workflows on the same branch and same workflow to use latest committed code
 concurrency:
@@ -24,8 +26,6 @@ jobs:
       - run: |
           git config user.name devops
           git config user.email [email protected]
-      - name: 'Install Poetry'
-        uses: Gr1N/setup-poetry@v8
       - name: 'Install Nix'
         uses: cachix/install-nix-action@v22
         with:
@@ -39,17 +39,35 @@ jobs:
         with:
           name: k-framework
           authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}'
-      - name: 'Update pyk release tag'
+      # note: we install the same version of `uv` as used by `uv2nix` in order to match the nix derivation
+      - name: 'Update uv release tag'
+        id: uv_release
+        run: |
+          UV2NIX_VERSION=$(cat deps/uv2nix)
+          UV_VERSION=$(curl -s https://raw.githubusercontent.com/pyproject-nix/uv2nix/$(cat deps/uv2nix)/pkgs/uv-bin/srcs.json | jq -r .version)
+          [[ "$UV_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
+          echo $UV_VERSION > deps/uv_release
+          git add deps/uv_release && git commit -m "Sync uv version: uv ${UV_VERSION}" || true
+          echo uv_version=$UV_VERSION >> "${GITHUB_OUTPUT}"
+      - name: 'Install uv'
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: ${{ steps.uv_release.outputs.uv_version }}
+      - name: 'Update uv files'
         run: |
           K_VERSION=$(cat deps/k_release)
-          sed -i 's!kframework = "^[v0-9\.]*"!kframework = "'^${K_VERSION}'"!' pykwasm/pyproject.toml
-          poetry -C pykwasm update
-          git add pykwasm/ && git commit -m "pykwasm/: sync poetry files ${K_VERSION}" || true
+          sed -i 's!    "kframework>=[0-9\.]*",!    "kframework>='${K_VERSION}'",!'    pykwasm/pyproject.toml
+          uv lock --upgrade
+          git add pykwasm/ && git commit -m "pykwasm/: sync uv files ${K_VERSION}" || true
       - name: 'Update Nix flake inputs'
         run: |
           K_VERSION=v"$(cat deps/k_release)"
+          UV2NIX_VERSION=$(cat deps/uv2nix)
+          PYPROJECT_BUILD_SYSTEMS_VERSION=$(cat deps/pyproject-build-systems)
           RV_NIX_TOOLS_VERSION=$(cat deps/rv-nix-tools)
           sed -i 's!    k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"!    k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
+          sed -i 's!    uv2nix.url = "github:pyproject-nix/uv2nix/[a-z0-9\.]*"!    uv2nix.url = "github:pyproject-nix/uv2nix/'"${UV2NIX_VERSION}"'"!' flake.nix
+          sed -i 's!    pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/[a-z0-9\.]*"!    pyproject-build-systems.url = "github:pyproject-nix/build-system-pkgs/'"${PYPROJECT_BUILD_SYSTEMS_VERSION}"'"!' flake.nix
           sed -i 's!    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/[a-z0-9\.]*"!    rv-nix-tools.url = "github:runtimeverification/rv-nix-tools/'"${RV_NIX_TOOLS_VERSION}"'"!' flake.nix
           nix flake update
           git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true

Dockerfile

@@ -1,23 +1,10 @@
-ARG Z3_VERSION
-ARG K_COMMIT
-
-ARG Z3_VERSION=4.12.1
-FROM runtimeverificationinc/z3:ubuntu-jammy-${Z3_VERSION} as Z3
-
 ARG K_COMMIT
 FROM runtimeverificationinc/kframework-k:ubuntu-jammy-${K_COMMIT}
 
-COPY --from=Z3 /usr/bin/z3 /usr/bin/z3
-
 RUN    apt-get update              \
     && apt-get upgrade --yes       \
     && apt-get install --yes       \
-                       cmake       \
-                       curl        \
-                       pandoc      \
-                       python3     \
-                       python3-pip \
-                       wabt
+                       curl wabt
 
 ARG USER_ID=1000
 ARG GROUP_ID=1000
@@ -26,12 +13,8 @@ RUN groupadd -g $GROUP_ID user && useradd -m -u $USER_ID -s /bin/sh -g user user
 USER user:user
 WORKDIR /home/user
 
-RUN    curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.3 python3 -
-
-RUN pip3 install --user  \
-           cytoolz       \
-           numpy
-
-ENV PATH=/home/user/.local/bin:$PATH
+ENV PATH=/home/user/.local/bin:${PATH}
 
-RUN poetry --version
+ARG UV_VERSION
+RUN    curl -LsSf https://astral.sh/uv/$UV_VERSION/install.sh | sh \
+    && uv --version

Makefile

@@ -1,3 +1,7 @@
+UV     := uv
+UV_RUN := $(UV) run --
+
+
 .PHONY: all                                                                \
         test test-execution test-simple test-prove                         \
         test-conformance test-conformance-parse test-conformance-supported \
@@ -11,28 +15,24 @@ all: build
 # -------------------
 
 ifneq ($(NIX),1)
-POETRY     := poetry -C pykwasm
-POETRY_RUN := $(POETRY) run --
-KDIST      := $(POETRY_RUN) kdist
+UV     := uv --project pykwasm
+UV_RUN := $(UV) run --
+KDIST      := $(UV_RUN) kdist
 endif
 
-.PHONY: pykwasm
-pykwasm:
-	$(POETRY) install
-
 .PHONY: build
-build: pykwasm
-	$(KDIST) -v build -j3
+build:
+	$(KDIST) -v build -j3 wasm-semantics.*
 
 .PHONY: clean
-clean: pykwasm
+clean:
 	$(KDIST) clean
 
 
 # Testing
 # -------
 
-TEST  := $(POETRY_RUN) kwasm
+TEST  := $(UV_RUN) kwasm
 CHECK := git --no-pager diff --no-index --ignore-all-space -R
 
 TEST_CONCRETE_BACKEND := llvm

deps/pyk_release

@@ -0,0 +1 @@
+7dba6dbc73120e15b558754c26024f6c93015dd7

deps/pyproject-build-systems

@@ -0,0 +1 @@
+680e2f8e637bc79b84268949d2f2b2f5e5f1d81c

deps/uv2nix

@@ -0,0 +1 @@
+0.7.2