From 4dfc19f87989b44ca7fc4ad0cea80eb2e8e49d9b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:51:12 -0400 Subject: [PATCH] chore(deps): bump nixpkgs back to the latest version (#8887) Bump nix flakes back to the latest version, which now contains the xz downgrade. --- .github/workflows/check-generated-files.yml | 2 +- .github/workflows/ibis-backends-cloud.yml | 2 +- .github/workflows/ibis-backends.yml | 8 ++++---- .github/workflows/ibis-benchmarks.yml | 2 +- .github/workflows/ibis-main.yml | 6 +++--- .github/workflows/nix-skip-helper.yml | 1 + .github/workflows/nix.yml | 1 + .github/workflows/pre-release.yml | 2 +- docs/contribute/01_environment.qmd | 2 +- flake.lock | 8 ++++---- flake.nix | 4 ++-- justfile | 2 +- nix/overlay.nix | 2 +- 13 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 3712801cb48d..6c2bb848e34c 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -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 diff --git a/.github/workflows/ibis-backends-cloud.yml b/.github/workflows/ibis-backends-cloud.yml index ff4600522a61..02547d2a14b5 100644 --- a/.github/workflows/ibis-backends-cloud.yml +++ b/.github/workflows/ibis-backends-cloud.yml @@ -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 diff --git a/.github/workflows/ibis-backends.yml b/.github/workflows/ibis-backends.yml index dc10f57d0709..3cf14ec5c013 100644 --- a/.github/workflows/ibis-backends.yml +++ b/.github/workflows/ibis-backends.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/ibis-benchmarks.yml b/.github/workflows/ibis-benchmarks.yml index 0e6cbd266af4..ec2a509db054 100644 --- a/.github/workflows/ibis-benchmarks.yml +++ b/.github/workflows/ibis-benchmarks.yml @@ -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 diff --git a/.github/workflows/ibis-main.yml b/.github/workflows/ibis-main.yml index 82f712e9378c..dfadf5232498 100644 --- a/.github/workflows/ibis-main.yml +++ b/.github/workflows/ibis-main.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/nix-skip-helper.yml b/.github/workflows/nix-skip-helper.yml index 7c09f2c2b9f0..aca9879f1871 100644 --- a/.github/workflows/nix-skip-helper.yml +++ b/.github/workflows/nix-skip-helper.yml @@ -36,5 +36,6 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" steps: - run: echo "No build required" diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index c9747dc72c2c..95bb6e52dfa8 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -37,6 +37,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 4b77c93daede..ab7b53beca70 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -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 diff --git a/docs/contribute/01_environment.qmd b/docs/contribute/01_environment.qmd index a79e463bc9ed..b8f463f848c6 100644 --- a/docs/contribute/01_environment.qmd +++ b/docs/contribute/01_environment.qmd @@ -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 ``` diff --git a/flake.lock b/flake.lock index 6dafe0c40a3f..213d4981c6da 100644 --- a/flake.lock +++ b/flake.lock @@ -61,16 +61,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1712178806, + "narHash": "sha256-gHlWooOsAkA4sr9fH8c+rgH9uHSiugD+t15KqGNdyto=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "d9b45d7e7200adb65aae6c9b2fe01a6202f8882d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ee723547e7ad..950ac3c210ed 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; @@ -138,7 +138,7 @@ ibis311 = mkDevShell pkgs.ibisDevEnv311; ibis312 = mkDevShell pkgs.ibisDevEnv312; - default = ibis311; + default = ibis312; preCommit = pkgs.mkShell { name = "preCommit"; diff --git a/justfile b/justfile index 29b0206aef4f..174986a8e940 100644 --- a/justfile +++ b/justfile @@ -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}" diff --git a/nix/overlay.nix b/nix/overlay.nix index debe9399ebb5..72661c22d1c8 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -36,7 +36,7 @@ in ibisDevEnv312 = mkPoetryDevEnv pkgs.python312; ibisSmallDevEnv = mkPoetryEnv { - python = pkgs.python311; + python = pkgs.python312; groups = [ "dev" ]; extras = [ ]; };