Skip to content

Commit

Permalink
chore(deps): move uv in nix environment to vendored version from `u…
Browse files Browse the repository at this point in the history
…v2nix` (#10625)
  • Loading branch information
cpcloud authored Dec 28, 2024
1 parent 5e8855d commit 3b72b7c
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 22 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docs-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ jobs:
key: docs-${{ github.event.pull_request.base.sha }}
path: docs/**/.jupyter_cache

- name: run quarto check
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check

- name: build docs
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-build-all

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ibis-docs-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ jobs:
key: docs-${{ github.event.before }}
path: docs/**/.jupyter_cache

- name: run quarto check
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check

- name: build api docs
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose

Expand Down
25 changes: 22 additions & 3 deletions .github/workflows/ibis-docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,28 @@ jobs:
# that for extensions
run: nix develop '.#ibis311' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest

check:
runs-on: ubuntu-latest
steps:
- name: install nix
uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: setup cachix
uses: cachix/cachix-action@v15
with:
name: ibis
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: nix-community

- name: checkout
uses: actions/checkout@v4

- name: run quarto check
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check

build:
runs-on: ubuntu-latest
steps:
Expand All @@ -66,9 +88,6 @@ jobs:
key: docs-${{ github.event.pull_request.base.sha }}
path: docs/**/.jupyter_cache

- name: run quarto check
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check

- name: generate api docs
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose

Expand Down
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
# Get repository root using git. This is expanded at runtime by the editable `.pth` machinery.
export REPO_ROOT=$(git rev-parse --show-toplevel)
# Prevent uv from downloading managed Python's
export UV_PYTHON_DOWNLOADS=never
'';

preCommitDeps = with pkgs; [
Expand Down
1 change: 1 addition & 0 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ in
);

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

changelog = pkgs.writeShellApplication {
name = "changelog";
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3b72b7c

Please sign in to comment.