diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml index 6c2bb848e34c..17b79c872b14 100644 --- a/.github/workflows/check-generated-files.yml +++ b/.github/workflows/check-generated-files.yml @@ -50,23 +50,8 @@ jobs: - name: check consistency with pyproject.toml run: poetry check --lock - - name: check that the `all` extra matches the current lock file - run: | - set -euo pipefail - - js="$(mktemp --suffix=.pyproject.json)" - docker run --rm -i sclevine/yj -tj < pyproject.toml > "$js" - - old="$(mktemp --suffix=.old)" - jq -rM '.tool.poetry.extras.all | unique | sort' < "$js" > "$old" - - new="$(mktemp --suffix=.new)" - jq -rM '.tool.poetry.extras | with_entries(select(.key != "all")) | [.[]] | add | unique | sort' < "$js" > "$new" - - diff --unified "$old" "$new" - - name: generate requirements-dev.txt - run: poetry export --extras all --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt + run: poetry export --all-extras --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt - name: check requirements-dev.txt run: git diff --exit-code requirements-dev.txt diff --git a/flake.nix b/flake.nix index 950ac3c210ed..7706093546cd 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ default = pkgs.ibis312; - inherit (pkgs) update-lock-files gen-all-extras gen-examples check-release-notes-spelling; + inherit (pkgs) update-lock-files gen-examples check-release-notes-spelling; }; devShells = rec { diff --git a/justfile b/justfile index 174986a8e940..6b2151f42871 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ lock: exit 1 fi poetry lock --no-update - poetry export --extras all --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt + poetry export --all-extras --with dev --with test --with docs --without-hashes --no-ansi > requirements-dev.txt # show all backends @list-backends: diff --git a/nix/overlay.nix b/nix/overlay.nix index 72661c22d1c8..de617bebb1fe 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -92,13 +92,4 @@ in python "$PWD/ibis/examples/gen_registry.py" "''${@}" ''; }; - - gen-all-extras = pkgs.writeShellApplication { - name = "gen-all-extras"; - runtimeInputs = with pkgs; [ yj jq ]; - text = '' - echo -n 'all = ' - yj -tj < pyproject.toml | jq -rM '.tool.poetry.extras | with_entries(select(.key != "all")) | [.[]] | add | unique | sort' - ''; - }; } diff --git a/poetry.lock b/poetry.lock index 6d510db73e68..bfa4b63f97df 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "aiohttp" @@ -7302,7 +7302,6 @@ cffi = {version = ">=1.11", markers = "platform_python_implementation == \"PyPy\ cffi = ["cffi (>=1.11)"] [extras] -all = ["black", "clickhouse-connect", "dask", "datafusion", "db-dtypes", "deltalake", "duckdb", "fsspec", "geopandas", "google-cloud-bigquery", "google-cloud-bigquery-storage", "graphviz", "impyla", "oracledb", "packaging", "pins", "polars", "psycopg2", "pydata-google-auth", "pydruid", "pyexasol", "pymysql", "pyodbc", "pyspark", "regex", "shapely", "snowflake-connector-python", "trino"] bigquery = ["db-dtypes", "google-cloud-bigquery", "google-cloud-bigquery-storage", "pydata-google-auth"] clickhouse = ["clickhouse-connect"] dask = ["dask", "regex"] @@ -7332,4 +7331,4 @@ visualization = ["graphviz"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "4187fa71283c284cda0c6f5770c5a17a58bbf3442e854ae8d8bb44d01ced475a" +content-hash = "09107743fe3df5b8f1681a46555a767bbd5eddb4d46e4f53ed5ea9abe8bf05d7" diff --git a/pyproject.toml b/pyproject.toml index e01ed8140b86..ad12cbbbfe13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -140,37 +140,6 @@ leafmap = { version = ">=0.29.6,<0.31", python = ">=3.10,<3.13" } lonboard = { version = "==0.4.0", python = ">=3.10,<3.13" } [tool.poetry.extras] -# generate the `all` extra using nix run '.#gen-all-extras' -all = [ - "black", - "clickhouse-connect", - "dask", - "datafusion", - "db-dtypes", - "deltalake", - "duckdb", - "fsspec", - "geopandas", - "google-cloud-bigquery", - "google-cloud-bigquery-storage", - "graphviz", - "impyla", - "oracledb", - "packaging", - "pins", - "polars", - "psycopg2", - "pydata-google-auth", - "pydruid", - "pyexasol", - "pymysql", - "pyodbc", - "pyspark", - "regex", - "shapely", - "snowflake-connector-python", - "trino", -] bigquery = [ "db-dtypes", "google-cloud-bigquery",