From 45c8871ead056bf955af9525e363ea073b1f968e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 14:40:54 +0000 Subject: [PATCH 1/3] Bump the g0 group with 12 updates Bumps the g0 group with 12 updates: | Package | From | To | | --- | --- | --- | | [numpy](https://github.com/numpy/numpy) | `1.26.2` | `1.26.4` | | [dask-ml](https://github.com/dask/dask-ml) | `2023.3.24` | `2024.3.20` | | [pyarrow](https://github.com/apache/arrow) | `15.0.0` | `15.0.2` | | [jupyterlab](https://github.com/jupyterlab/jupyterlab) | `4.0.9` | `4.1.5` | | [lz4](https://github.com/python-lz4/python-lz4) | `4.3.2` | `4.3.3` | | [ipywidgets](https://github.com/jupyter-widgets/ipywidgets) | `8.1.1` | `8.1.2` | | [numba](https://github.com/numba/numba) | `0.59.0` | `0.59.1` | | [pyspark[sql]](https://github.com/apache/spark) | `3.4.1` | `3.5.1` | | [protobuf](https://github.com/protocolbuffers/protobuf) | `4.25.2` | `5.26.0` | | [polars](https://github.com/pola-rs/polars) | `0.20.13` | `0.20.16` | | [dask-snowflake](https://github.com/coiled/dask-snowflake) | `0.3.1` | `0.3.2` | | [snowflake-sqlalchemy](https://github.com/snowflakedb/snowflake-sqlalchemy) | `1.0.8` | `1.5.1` | Updates `numpy` from 1.26.2 to 1.26.4 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.26.2...v1.26.4) Updates `dask-ml` from 2023.3.24 to 2024.3.20 - [Release notes](https://github.com/dask/dask-ml/releases) - [Commits](https://github.com/dask/dask-ml/compare/v2023.3.24...v2024.3.20) Updates `pyarrow` from 15.0.0 to 15.0.2 - [Commits](https://github.com/apache/arrow/compare/go/v15.0.0...go/v15.0.2) Updates `jupyterlab` from 4.0.9 to 4.1.5 - [Release notes](https://github.com/jupyterlab/jupyterlab/releases) - [Changelog](https://github.com/jupyterlab/jupyterlab/blob/@jupyterlab/lsp@4.1.5/CHANGELOG.md) - [Commits](https://github.com/jupyterlab/jupyterlab/compare/@jupyterlab/lsp@4.0.9...@jupyterlab/lsp@4.1.5) Updates `lz4` from 4.3.2 to 4.3.3 - [Release notes](https://github.com/python-lz4/python-lz4/releases) - [Commits](https://github.com/python-lz4/python-lz4/compare/v4.3.2...v4.3.3) Updates `ipywidgets` from 8.1.1 to 8.1.2 - [Release notes](https://github.com/jupyter-widgets/ipywidgets/releases) - [Commits](https://github.com/jupyter-widgets/ipywidgets/compare/8.1.1...8.1.2) Updates `numba` from 0.59.0 to 0.59.1 - [Release notes](https://github.com/numba/numba/releases) - [Commits](https://github.com/numba/numba/compare/0.59.0...0.59.1) Updates `pyspark[sql]` from 3.4.1 to 3.5.1 - [Commits](https://github.com/apache/spark/compare/v3.4.1...v3.5.1) Updates `protobuf` from 4.25.2 to 5.26.0 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.25.2...v5.26.0) Updates `polars` from 0.20.13 to 0.20.16 - [Release notes](https://github.com/pola-rs/polars/releases) - [Commits](https://github.com/pola-rs/polars/compare/py-0.20.13...py-0.20.16) Updates `dask-snowflake` from 0.3.1 to 0.3.2 - [Release notes](https://github.com/coiled/dask-snowflake/releases) - [Commits](https://github.com/coiled/dask-snowflake/compare/0.3.1...0.3.2) Updates `snowflake-sqlalchemy` from 1.0.8 to 1.5.1 - [Release notes](https://github.com/snowflakedb/snowflake-sqlalchemy/releases) - [Commits](https://github.com/snowflakedb/snowflake-sqlalchemy/compare/v1.0.8...v1.5.1) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: dask-ml dependency-type: direct:production update-type: version-update:semver-major dependency-group: g0 - dependency-name: pyarrow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: jupyterlab dependency-type: direct:production update-type: version-update:semver-minor dependency-group: g0 - dependency-name: lz4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: ipywidgets dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: numba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: pyspark[sql] dependency-type: direct:production update-type: version-update:semver-minor dependency-group: g0 - dependency-name: protobuf dependency-type: direct:production update-type: version-update:semver-major dependency-group: g0 - dependency-name: polars dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: dask-snowflake dependency-type: direct:production update-type: version-update:semver-patch dependency-group: g0 - dependency-name: snowflake-sqlalchemy dependency-type: direct:production update-type: version-update:semver-minor dependency-group: g0 ... Signed-off-by: dependabot[bot] --- ci/requirements-1general-deps.in | 14 +++++++------- ci/requirements-1snowflake.in | 4 ++-- ci/requirements-1tpch-non-dask.in | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/requirements-1general-deps.in b/ci/requirements-1general-deps.in index dec8a96b41..285f8f1073 100644 --- a/ci/requirements-1general-deps.in +++ b/ci/requirements-1general-deps.in @@ -1,16 +1,16 @@ coiled>=0.2.54 -numpy==1.26.2 +numpy==1.26.4 pandas==2.2.1 dask-labextension==7.0.0 -dask-ml==2023.3.24 +dask-ml==2024.3.20 fsspec==2023.12.1 s3fs==2023.12.1 gcsfs==2023.12.1 -pyarrow==15.0.0 -jupyterlab==4.0.9 -lz4==4.3.2 -ipywidgets==8.1.1 -numba==0.59.0 +pyarrow==15.0.2 +jupyterlab==4.1.5 +lz4==4.3.3 +ipywidgets==8.1.2 +numba==0.59.1 scikit-learn==1.4.1.post1 ipycytoscape==1.3.3 click==8.1.7 diff --git a/ci/requirements-1snowflake.in b/ci/requirements-1snowflake.in index 3bc1867552..a45e1479eb 100644 --- a/ci/requirements-1snowflake.in +++ b/ci/requirements-1snowflake.in @@ -1,3 +1,3 @@ -dask-snowflake==0.3.1 +dask-snowflake==0.3.2 snowflake-connector-python==3.7.1 -snowflake-sqlalchemy==1.0.8 +snowflake-sqlalchemy==1.5.1 diff --git a/ci/requirements-1tpch-non-dask.in b/ci/requirements-1tpch-non-dask.in index 16bcb60865..ef44bca75c 100644 --- a/ci/requirements-1tpch-non-dask.in +++ b/ci/requirements-1tpch-non-dask.in @@ -6,11 +6,11 @@ coiled>=1.13.1.dev1 # PySpark # See https://spark.apache.org/docs/latest/api/python/getting_started/install.html#dependencies # NOTE: needs openjdk~=11.0 (installed with conda) -pyspark[sql]==3.4.1 # FIXME https://github.com/coiled/benchmarks/issues/1221 +pyspark[sql]==3.5.1 # FIXME https://github.com/coiled/benchmarks/issues/1221 grpcio==1.62.1 grpcio-status==1.62.1 -protobuf==4.25.2 +protobuf==5.26.0 # Other TPCH tests -polars==0.20.13 +polars==0.20.16 duckdb==0.10.1 From b908eb50f2cda70c55106606b952608ae8aa9b8f Mon Sep 17 00:00:00 2001 From: crusaderky Date: Fri, 22 Mar 2024 15:20:53 +0000 Subject: [PATCH 2/3] Don't upgrade PySpark --- .github/dependabot.yml | 2 +- ci/requirements-1tpch-non-dask.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ee11811be6..06243ff42d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,5 +23,5 @@ updates: - patch ignore: # https://github.com/coiled/benchmarks/issues/1221 - - dependency-name: pyspark + - dependency-name: pyspark[sql] versions: ["3.5.x"] diff --git a/ci/requirements-1tpch-non-dask.in b/ci/requirements-1tpch-non-dask.in index ef44bca75c..6c16615971 100644 --- a/ci/requirements-1tpch-non-dask.in +++ b/ci/requirements-1tpch-non-dask.in @@ -6,7 +6,7 @@ coiled>=1.13.1.dev1 # PySpark # See https://spark.apache.org/docs/latest/api/python/getting_started/install.html#dependencies # NOTE: needs openjdk~=11.0 (installed with conda) -pyspark[sql]==3.5.1 # FIXME https://github.com/coiled/benchmarks/issues/1221 +pyspark[sql]==3.4.1 # FIXME DO NOT UPGRADE: https://github.com/coiled/benchmarks/issues/1221 grpcio==1.62.1 grpcio-status==1.62.1 protobuf==5.26.0 From d927d5a274e0e2abb7279c1f01d948d563c6b975 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Fri, 22 Mar 2024 17:09:30 +0000 Subject: [PATCH 3/3] Fix snowflake --- ci/requirements-1snowflake.in | 36 +++++++++++++++++++++++++++++++++++ ci/requirements-2snowflake.in | 3 +-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ci/requirements-1snowflake.in b/ci/requirements-1snowflake.in index a45e1479eb..858eb497e7 100644 --- a/ci/requirements-1snowflake.in +++ b/ci/requirements-1snowflake.in @@ -1,3 +1,39 @@ dask-snowflake==0.3.2 snowflake-connector-python==3.7.1 snowflake-sqlalchemy==1.5.1 + +# https://github.com/coiled/dask-snowflake/blob/main/requirements.txt +pandas<2.2 +sqlalchemy<2 + +# Everything below is a copy-paste from requirements-1general-deps.in +coiled>=1.13.1 # First version to be able to set memory factors +numpy==1.26.4 +dask-labextension==7.0.0 +dask-ml==2024.3.20 +fsspec==2023.12.1 +s3fs==2023.12.1 +gcsfs==2023.12.1 +pyarrow==15.0.2 +jupyterlab==4.1.5 +lz4==4.3.3 +ipywidgets==8.1.2 +numba==0.59.1 +scikit-learn==1.4.1.post1 +ipycytoscape==1.3.3 +click==8.1.7 +xarray==2024.2.0 +zarr==2.17.1 +cftime==1.6.3 +msgpack==1.0.8 +cloudpickle==3.0.0 +tornado==6.4 +toolz==0.12.1 +zict==3.0.0 +xgboost==2.0.3 +optuna==3.6.0 +optuna-integration==3.6.0 +scipy==1.12.0 +pynvml==11.5.0 +bokeh==3.4.0 +gilknocker==0.4.1 diff --git a/ci/requirements-2snowflake.in b/ci/requirements-2snowflake.in index a05ade2f5b..b69b3daec5 100644 --- a/ci/requirements-2snowflake.in +++ b/ci/requirements-2snowflake.in @@ -1,4 +1,3 @@ --r requirements-1general-deps.in +-r requirements-1snowflake.in -r requirements-1test.in -r requirements-1dask-git-tip.in --r requirements-1snowflake.in