Skip to content

Commit

Permalink
chore(deps): bump nixpkgs back to the latest version (ibis-project#8887)
Browse files Browse the repository at this point in the history
Bump nix flakes back to the latest version, which now contains the xz
downgrade.
  • Loading branch information
cpcloud committed Apr 4, 2024
1 parent 27c9d0f commit 4dfc19f
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
github_token: ${{ steps.generate_token.outputs.token }}

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ibis-backends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -416,7 +416,7 @@ jobs:
run: docker compose up --wait ${{ join(matrix.backend.services, ' ') }}

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry==1.7.1'
run: python -m pip install --upgrade pip 'poetry==1.8.2'

- name: remove lonboard
# it requires a version of pandas that min versions are not compatible with
Expand Down Expand Up @@ -643,7 +643,7 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: python -m pip install --upgrade pip 'poetry==1.7.1'
run: python -m pip install --upgrade pip 'poetry==1.8.2'

- name: remove lonboard
# it requires a version of pandas that pyspark is not compatible with
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ibis-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ibis-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.7.1'
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nix-skip-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
steps:
- run: echo "No build required"
1 change: 1 addition & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: python -m pip install --upgrade pip

- name: install poetry
run: python -m pip install 'poetry==1.7.1' poetry-dynamic-versioning
run: python -m pip install 'poetry==1.8.2' poetry-dynamic-versioning

- name: compute ibis version
id: get_version
Expand Down
2 changes: 1 addition & 1 deletion docs/contribute/01_environment.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ For a better development experience see the `conda/mamba` or `nix` setup instruc
1. Install development dependencies

```sh
pip install 'poetry==1.7.1'
pip install 'poetry==1.8.2'
pip install -r requirements-dev.txt
```

Expand Down
8 changes: 4 additions & 4 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};

nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";

poetry2nix = {
url = "github:nix-community/poetry2nix";
Expand Down Expand Up @@ -138,7 +138,7 @@
ibis311 = mkDevShell pkgs.ibisDevEnv311;
ibis312 = mkDevShell pkgs.ibisDevEnv312;

default = ibis311;
default = ibis312;

preCommit = pkgs.mkShell {
name = "preCommit";
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ clean:
# lock dependencies without updating existing versions
lock:
#!/usr/bin/env bash
required_version="1.7.1"
required_version="1.8.2"
version="$(poetry --version)"
if ! grep -qF "${required_version}" <<< "${version}"; then
>&2 echo "poetry version must be ${required_version}, got ${version}"
Expand Down
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ in
ibisDevEnv312 = mkPoetryDevEnv pkgs.python312;

ibisSmallDevEnv = mkPoetryEnv {
python = pkgs.python311;
python = pkgs.python312;
groups = [ "dev" ];
extras = [ ];
};
Expand Down

0 comments on commit 4dfc19f

Please sign in to comment.