From b996e77d70613dab0a884ffc29eaff539a15f453 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:43:52 -0500 Subject: [PATCH] Prepare for 2024.1.0-rc0 release (#1297) * Pin dask/distributed * Bump version to 2024.1.0-rc0 * Bump GPU envs and docs to CTK 11.8 * Use conda nightlies for dask/distributed in GPU envs --- Cargo.lock | 2 +- Cargo.toml | 2 +- continuous_integration/docker/conda.txt | 2 +- continuous_integration/docker/main.dockerfile | 2 +- continuous_integration/environment-3.10.yaml | 2 +- continuous_integration/environment-3.11.yaml | 2 +- continuous_integration/environment-3.12.yaml | 2 +- continuous_integration/gpuci/environment-3.10.yaml | 9 +++------ continuous_integration/gpuci/environment-3.9.yaml | 9 +++------ continuous_integration/recipe/meta.yaml | 2 +- docs/environment.yml | 2 +- docs/requirements-docs.txt | 2 +- docs/source/installation.rst | 2 +- pyproject.toml | 4 ++-- 14 files changed, 19 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c433e1fb..c818d4e9b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -700,7 +700,7 @@ dependencies = [ [[package]] name = "dask-sql" -version = "2023.11.0" +version = "2024.1.0-rc0" dependencies = [ "async-trait", "datafusion-python", diff --git a/Cargo.toml b/Cargo.toml index 9a3d9c739..33848b14e 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.11.0" +version = "2024.1.0-rc0" description = "Bindings for DataFusion used by Dask-SQL" readme = "README.md" license = "Apache-2.0" diff --git a/continuous_integration/docker/conda.txt b/continuous_integration/docker/conda.txt index 270c2febd..9efd3d3f9 100644 --- a/continuous_integration/docker/conda.txt +++ b/continuous_integration/docker/conda.txt @@ -1,5 +1,5 @@ python>=3.9 -dask>=2022.3.0 +dask>=2022.3.0,<=2024.1.0 pandas>=1.4.0 jpype1>=1.0.2 openjdk>=8 diff --git a/continuous_integration/docker/main.dockerfile b/continuous_integration/docker/main.dockerfile index 78cd46938..ddd529d56 100644 --- a/continuous_integration/docker/main.dockerfile +++ b/continuous_integration/docker/main.dockerfile @@ -16,7 +16,7 @@ RUN mamba install -y \ # build requirements "maturin>=1.3,<1.4" \ # core dependencies - "dask>=2022.3.0" \ + "dask>=2022.3.0,<=2024.1.0" \ "pandas>=1.4.0" \ "fastapi>=0.92.0" \ "httpx>=0.24.1" \ diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 912e2c54e..e265ca177 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - c-compiler -- dask>=2022.3.0 +- dask>=2022.3.0,<=2024.1.0 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index cd77ac8d5..ff5f30dbb 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - c-compiler -- dask>=2022.3.0 +- dask>=2022.3.0,<=2024.1.0 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index 53b52e629..baac175bf 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: - c-compiler -- dask>=2022.3.0 +- dask>=2022.3.0,<=2024.1.0 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index 6d567d498..8de05e900 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -2,13 +2,14 @@ name: dask-sql channels: - rapidsai - rapidsai-nightly +- dask/label/dev - conda-forge - nvidia - nodefaults dependencies: - c-compiler - zlib -- dask>=2022.3.0 +- dask>=2022.3.0,<=2024.1.0 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 @@ -40,7 +41,7 @@ dependencies: - tzlocal>=2.1 - uvicorn>=0.13.4 # GPU-specific requirements -- cudatoolkit=11.5 +- cudatoolkit=11.8 - cudf=24.02 - cuml=24.02 - dask-cudf=24.02 @@ -49,7 +50,3 @@ dependencies: - ucx-py=0.36 - xgboost=*=rapidsai_py* - libxgboost=*=rapidsai_h* -- 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 1e2c50efb..017c88216 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -2,13 +2,14 @@ name: dask-sql channels: - rapidsai - rapidsai-nightly +- dask/label/dev - conda-forge - nvidia - nodefaults dependencies: - c-compiler - zlib -- dask>=2022.3.0 +- dask>=2022.3.0,<=2024.1.0 - fastapi>=0.92.0 - fugue>=0.7.3 - httpx>=0.24.1 @@ -40,7 +41,7 @@ dependencies: - tzlocal>=2.1 - uvicorn>=0.13.4 # GPU-specific requirements -- cudatoolkit=11.5 +- cudatoolkit=11.8 - cudf=24.02 - cuml=24.02 - dask-cudf=24.02 @@ -49,7 +50,3 @@ dependencies: - ucx-py=0.36 - xgboost=*=rapidsai_py* - libxgboost=*=rapidsai_h* -- 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 60a5aa299..a462bcb47 100644 --- a/continuous_integration/recipe/meta.yaml +++ b/continuous_integration/recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: - xz # [linux64] run: - python - - dask >=2022.3.0 + - dask >=2022.3.0,<=2024.1.0 - pandas >=1.4.0 - fastapi >=0.92.0 - httpx >=0.24.1 diff --git a/docs/environment.yml b/docs/environment.yml index 2d0e08ba0..c597cf309 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -6,7 +6,7 @@ dependencies: - sphinx>=4.0.0 - sphinx-tabs - dask-sphinx-theme>=2.0.3 - - dask>=2022.3.0 + - dask>=2022.3.0,<=2024.1.0 - pandas>=1.4.0 - fugue>=0.7.3 # FIXME: https://github.com/fugue-project/fugue/issues/526 diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index 1f2052a92..50716eb3b 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,<=2024.1.0 pandas>=1.4.0 fugue>=0.7.3 # FIXME: https://github.com/fugue-project/fugue/issues/526 diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 4404facbb..d4bfd65c8 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -35,7 +35,7 @@ More details can be found on the `RAPIDS Getting Started =2022.3.0", - "distributed>=2022.3.0", + "dask[dataframe]>=2022.3.0,<=2024.1.0", + "distributed>=2022.3.0,<=2024.1.0", "pandas>=1.4.0", "fastapi>=0.92.0", "httpx>=0.24.1",