Skip to content

Commit 3b72b7c

Browse files
authored
chore(deps): move uv in nix environment to vendored version from uv2nix (#10625)
1 parent 5e8855d commit 3b72b7c

8 files changed

+39
-22
lines changed

.github/workflows/docs-preview.yml

-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ jobs:
7676
key: docs-${{ github.event.pull_request.base.sha }}
7777
path: docs/**/.jupyter_cache
7878

79-
- name: run quarto check
80-
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check
81-
8279
- name: build docs
8380
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-build-all
8481

.github/workflows/ibis-docs-main.yml

-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ jobs:
6868
key: docs-${{ github.event.before }}
6969
path: docs/**/.jupyter_cache
7070

71-
- name: run quarto check
72-
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check
73-
7471
- name: build api docs
7572
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose
7673

.github/workflows/ibis-docs-pr.yml

+22-3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,28 @@ jobs:
4141
# that for extensions
4242
run: nix develop '.#ibis311' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
4343

44+
check:
45+
runs-on: ubuntu-latest
46+
steps:
47+
- name: install nix
48+
uses: cachix/install-nix-action@v30
49+
with:
50+
extra_nix_config: |
51+
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
52+
53+
- name: setup cachix
54+
uses: cachix/cachix-action@v15
55+
with:
56+
name: ibis
57+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
58+
extraPullNames: nix-community
59+
60+
- name: checkout
61+
uses: actions/checkout@v4
62+
63+
- name: run quarto check
64+
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check
65+
4466
build:
4567
runs-on: ubuntu-latest
4668
steps:
@@ -66,9 +88,6 @@ jobs:
6688
key: docs-${{ github.event.pull_request.base.sha }}
6789
path: docs/**/.jupyter_cache
6890

69-
- name: run quarto check
70-
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check
71-
7291
- name: generate api docs
7392
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose
7493

flake.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+3
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
9494
# Get repository root using git. This is expanded at runtime by the editable `.pth` machinery.
9595
export REPO_ROOT=$(git rev-parse --show-toplevel)
96+
97+
# Prevent uv from downloading managed Python's
98+
export UV_PYTHON_DOWNLOADS=never
9699
'';
97100

98101
preCommitDeps = with pkgs; [

nix/overlay.nix

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ in
124124
);
125125

126126
quarto = pkgs.callPackage ./quarto { };
127+
uv = uv2nix.packages.${pkgs.system}.uv-bin;
127128

128129
changelog = pkgs.writeShellApplication {
129130
name = "changelog";

requirements-dev.txt

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

uv.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)