Skip to content

Commit 291a70f

Browse files
palinatolmachrv-auditorjuliankuners
authored
Pin uv version in CI to 0.7.2 (#1023)
* Pin uv version to 0.6.17 in CI workflows * Fix `uv` to 0.7.2 in CI, format workflow files * Sync uv files: kevm-pyk version 1.0.814 * flake.{nix,lock}: update Nix derivations * Cleanup, remove `env` * Code quality fix * fix revision of `pyproject-build-systems` and `uv2nix` in `flake.nix` * Minor comment cleanup in `flake.nix` --------- Co-authored-by: devops <[email protected]> Co-authored-by: Julian Kuners <[email protected]>
1 parent 0c1d1d7 commit 291a70f

File tree

7 files changed

+619
-613
lines changed

7 files changed

+619
-613
lines changed

.github/workflows/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ WORKDIR /home/${USER}/workspace
5050

5151
ENV PATH=/home/${USER}/.cargo/bin:/home/${USER}/.local/bin:/usr/local/bin/:${PATH}
5252

53-
RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
54-
&& uv --version
53+
RUN curl -LsSf https://astral.sh/uv/0.7.2/install.sh | sh && uv --version
5554

5655
RUN cargo install svm-rs --version 0.3.0 --locked \
5756
&& svm install 0.8.13 \

.github/workflows/test-pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717
uses: actions/checkout@v4
1818
- name: 'Install uv'
1919
uses: astral-sh/setup-uv@v5
20+
with:
21+
version: 0.7.2
2022
- name: 'Run code quality checks'
2123
run: make check
2224
- name: 'Run pyupgrade'
@@ -31,6 +33,8 @@ jobs:
3133
uses: actions/checkout@v4
3234
- name: 'Install uv'
3335
uses: astral-sh/setup-uv@v5
36+
with:
37+
version: 0.7.2
3438
- name: 'Run unit tests'
3539
run: make cov-unit
3640

.github/workflows/update-version.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
1514
update-versions:
1615
name: 'Update Dependency Versions'
1716
runs-on: ubuntu-latest
@@ -28,6 +27,8 @@ jobs:
2827
git config user.email [email protected]
2928
- name: 'Install uv'
3029
uses: astral-sh/setup-uv@v5
30+
with:
31+
version: 0.7.2
3132
- name: 'Update kevm-pyk release tag'
3233
run: |
3334
KEVM_VERSION="$(cat deps/kevm_release)"

flake.lock

Lines changed: 17 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,22 @@
1818
inputs.nixpkgs.follows = "nixpkgs";
1919
inputs.flake-utils.follows = "flake-utils";
2020
};
21-
pyproject-nix = {
22-
url = "github:pyproject-nix/pyproject.nix";
23-
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
24-
# inputs.uv2nix.follows = "nixpkgs";
25-
};
26-
pyproject-build-systems = {
27-
url = "github:pyproject-nix/build-system-pkgs";
28-
inputs.pyproject-nix.follows = "pyproject-nix";
29-
inputs.uv2nix.follows = "uv2nix";
30-
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
31-
# inputs.uv2nix.follows = "nixpkgs";
32-
};
3321
uv2nix = {
34-
url = "github:pyproject-nix/uv2nix";
35-
inputs.pyproject-nix.follows = "pyproject-nix";
22+
url = "github:pyproject-nix/uv2nix/680e2f8e637bc79b84268949d2f2b2f5e5f1d81c"; #
3623
# stale nixpkgs is missing the alias `lib.match` -> `builtins.match`
3724
# therefore point uv2nix to a patched nixpkgs, which introduces this alias
3825
# this is a temporary solution until nixpkgs us up-to-date again
3926
inputs.nixpkgs.url = "github:runtimeverification/nixpkgs/libmatch";
40-
# inputs.uv2nix.follows = "nixpkgs";
27+
# inputs.nixpkgs.follows = "nixpkgs";
28+
# uv2nix already makes their input flakes follow their nixpkgs
29+
};
30+
pyproject-build-systems = {
31+
url = "github:pyproject-nix/build-system-pkgs/7dba6dbc73120e15b558754c26024f6c93015dd7";
32+
inputs.nixpkgs.follows = "uv2nix/nixpkgs";
33+
inputs.uv2nix.follows = "uv2nix";
34+
inputs.pyproject-nix.follows = "uv2nix/pyproject-nix";
4135
};
36+
pyproject-nix.follows = "uv2nix/pyproject-nix";
4237
};
4338
outputs = {
4439
self,

src/kontrol/prove.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ def create_kcfg_explore() -> KCFGExplore:
499499
)
500500

501501
def update_status_bar(test_id: str, result: Any) -> None:
502-
nonlocal done_tests, failed_tests, passed_tests, progress
502+
nonlocal done_tests, failed_tests, passed_tests
503503
if not display_status_bar or progress is None:
504504
return
505505
done_tests += 1

0 commit comments

Comments
 (0)