From 15523483c5cb2f0c167e4b1c1763ee2030ba36bb Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:28:04 -0400 Subject: [PATCH] Prepare for 2023.10.0 release (#1241) * Add dask<=2023.1.1 max version constraint for release * Fix typo * Update dask/distributed pinnings * Include dataframe dependencies for dask * Pin dask/distributed for release * Pin dask to 2023.9.3 * Bump to RAPIDS 23.12 * Bump dask-sql rust lib to 2023.10.0 * Unpin dask/distributed in all gpu ci files --- Cargo.lock | 2 +- Cargo.toml | 2 +- continuous_integration/environment-3.10-dev.yaml | 2 +- continuous_integration/environment-3.9-dev.yaml | 2 +- continuous_integration/gpuci/axis.yaml | 2 +- continuous_integration/gpuci/build.sh | 5 ----- continuous_integration/gpuci/environment-3.10.yaml | 11 ++++++----- continuous_integration/gpuci/environment-3.9.yaml | 11 ++++++----- continuous_integration/recipe/meta.yaml | 2 +- docker/conda.txt | 2 +- docker/main.dockerfile | 2 +- docs/environment.yml | 2 +- docs/requirements-docs.txt | 2 +- pyproject.toml | 4 ++-- 14 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3f7d8600..64459f7b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "dask-sql" -version = "2023.6.0" +version = "2023.10.0" dependencies = [ "async-trait", "datafusion-python", diff --git a/Cargo.toml b/Cargo.toml index 826a5df7f..4f7bb722c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dask-sql" repository = "https://github.com/dask-contrib/dask-sql" -version = "2023.6.0" +version = "2023.10.0" description = "Bindings for DataFusion used by Dask-SQL" readme = "README.md" license = "Apache-2.0" diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml index 4589cc1b5..100e3d0a0 100644 --- a/continuous_integration/environment-3.10-dev.yaml +++ b/continuous_integration/environment-3.10-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - c-compiler -- dask>=2022.3.0 +- dask>=2022.3.0,<=2023.9.3 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml index f807d2e87..410c504b1 100644 --- a/continuous_integration/environment-3.9-dev.yaml +++ b/continuous_integration/environment-3.9-dev.yaml @@ -4,7 +4,7 @@ channels: - nodefaults dependencies: - c-compiler -- dask>=2022.3.0 +- dask>=2022.3.0,<=2023.9.3 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 diff --git a/continuous_integration/gpuci/axis.yaml b/continuous_integration/gpuci/axis.yaml index ea1e6464a..1932b1a2d 100644 --- a/continuous_integration/gpuci/axis.yaml +++ b/continuous_integration/gpuci/axis.yaml @@ -9,6 +9,6 @@ LINUX_VER: - ubuntu18.04 RAPIDS_VER: -- "23.10" +- "23.12" excludes: diff --git a/continuous_integration/gpuci/build.sh b/continuous_integration/gpuci/build.sh index 175fc78da..a26d236b9 100644 --- a/continuous_integration/gpuci/build.sh +++ b/continuous_integration/gpuci/build.sh @@ -49,11 +49,6 @@ gpuci_retry aws s3 cp --only-show-errors "${DASK_SQL_BUCKET_NAME}parquet_2gb_sor gpuci_logger "Download query files" gpuci_retry aws s3 cp --only-show-errors "${DASK_SQL_BUCKET_NAME}queries/" tests/unit/queries/ --recursive -gpuci_logger "Install dask" -python -m pip install git+https://github.com/dask/dask -gpuci_logger "Install distributed" -python -m pip install git+https://github.com/dask/distributed - gpuci_logger "Install dask-sql" pip install -e . -vv diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index bb6d00032..8c0312788 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -8,7 +8,7 @@ channels: dependencies: - c-compiler - zlib -- dask>=2022.3.0 +- dask>=2022.3.0,<=2023.9.3 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 @@ -49,7 +49,8 @@ dependencies: - ucx-py=0.34 - xgboost=*=rapidsai_py* - libxgboost=*=rapidsai_h* -- pip -- pip: - - git+https://github.com/dask/dask - - git+https://github.com/dask/distributed +# TODO: unpin after RAPIDS 23.12 release +# - pip +# - pip: +# - git+https://github.com/dask/dask +# - git+https://github.com/dask/distributed diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml index 47ca34e24..57ee545f5 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -8,7 +8,7 @@ channels: dependencies: - c-compiler - zlib -- dask>=2022.3.0 +- dask>=2022.3.0,<=2023.9.3 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 @@ -49,7 +49,8 @@ dependencies: - ucx-py=0.34 - xgboost=*=rapidsai_py* - libxgboost=*=rapidsai_h* -- pip -- pip: - - git+https://github.com/dask/dask - - git+https://github.com/dask/distributed +# TODO: unpin after RAPIDS 23.12 release +# - pip +# - pip: +# - git+https://github.com/dask/dask +# - git+https://github.com/dask/distributed diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml index 48cc8b748..c3c2cff6c 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/continuous_integration/recipe/meta.yaml @@ -38,7 +38,7 @@ requirements: - xz # [linux64] run: - python - - dask >=2022.3.0 + - dask >=2022.3.0,<=2023.9.3 - pandas >=1.4.0 - fastapi >=0.92.0 - httpx >=0.24.1 diff --git a/docker/conda.txt b/docker/conda.txt index 5083ebd85..bc2dd29d1 100644 --- a/docker/conda.txt +++ b/docker/conda.txt @@ -1,5 +1,5 @@ python>=3.8 -dask>=2022.3.0 +dask>=2022.3.0,<=2023.9.3 pandas>=1.4.0 jpype1>=1.0.2 openjdk>=8 diff --git a/docker/main.dockerfile b/docker/main.dockerfile index 51ac27d8f..92047b261 100644 --- a/docker/main.dockerfile +++ b/docker/main.dockerfile @@ -16,7 +16,7 @@ RUN mamba install -y \ # build requirements "maturin>=1.1,<1.2" \ # core dependencies - "dask>=2022.3.0" \ + "dask>=2022.3.0,<=2023.9.3" \ "pandas>=1.4.0" \ "fastapi>=0.92.0" \ "httpx>=0.24.1" \ diff --git a/docs/environment.yml b/docs/environment.yml index ca9b23a34..4a52187c5 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -7,7 +7,7 @@ dependencies: - sphinx>=4.0.0 - sphinx-tabs - dask-sphinx-theme>=2.0.3 - - dask>=2022.3.0 + - dask>=2022.3.0,<=2023.9.3 - pandas>=1.4.0 - fugue>=0.7.3 - fastapi>=0.92.0 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index cce9cb599..741d17a3e 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,7 +1,7 @@ sphinx>=4.0.0 sphinx-tabs dask-sphinx-theme>=3.0.0 -dask>=2022.3.0 +dask>=2022.3.0,<=2023.9.3 pandas>=1.4.0 fugue>=0.7.3 fastapi>=0.92.0 diff --git a/pyproject.toml b/pyproject.toml index 3caa92ddb..b70157800 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,8 @@ classifiers = [ readme = "README.md" requires-python = ">=3.8" dependencies = [ - "dask[dataframe]>=2022.3.0", - "distributed>=2022.3.0", + "dask[dataframe]>=2022.3.0,<=2023.9.3", + "distributed>=2022.3.0,<=2023.9.3", "pandas>=1.4.0", "fastapi>=0.92.0", "httpx>=0.24.1",