From 3be5b31ae9a0e14dc3f58ba410d57d4139330e48 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:09:58 -0500 Subject: [PATCH 1/4] pin dask higher, skip v2024.11.0 --- CHANGELOG.rst | 8 ++++++++ environment.yml | 2 +- pyproject.toml | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 432a414f5..7139eeec9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog ========= +v0.54.0 (unreleased) +-------------------- +Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), + +Breaking changes +---------------- +* The minimum required version of `dask` has been increased to `2024.8.1`. `dask` version `2024.11.0` is now excluded due to a regression in the `dask` library. + v0.53.2 (2024-10-31) -------------------- Contributors to this version: Éric Dupuis (:user:`coxipi`), Pascal Bourgault (:user:`aulemahal`), Trevor James Smith (:user:`Zeitsperre`). diff --git a/environment.yml b/environment.yml index a7d54a980..bbf902e6b 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - cf_xarray >=0.9.3 - cftime >=1.4.1 - click >=8.1 - - dask >=2.6.0 + - dask >=2024.8.1,!=2024.11.0 - filelock >=3.14.0 - jsonpickle >=3.1.0 - numba >=0.54.1 diff --git a/pyproject.toml b/pyproject.toml index 082108e7a..8695ec5e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ dependencies = [ "cf-xarray >=0.9.3", # cf-xarray is differently named on conda-forge "cftime >=1.4.1", "click >=8.1", - "dask[array] >=2.6", + "dask[array] >=2024.8.1,!=2024.11.0", "filelock >=3.14.0", "jsonpickle >=3.1.0", "numba >=0.54.1", @@ -128,7 +128,6 @@ xclim = "xclim.cli:cli" [tool.black] target-version = [ - "py39", "py310", "py311", "py312" From 491687c326aec1ec7b64f68cb1080dd1c7e99282 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:13:19 -0500 Subject: [PATCH 2/4] update CHANGELOG.rst --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7139eeec9..340f0a2f6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,7 @@ Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Breaking changes ---------------- -* The minimum required version of `dask` has been increased to `2024.8.1`. `dask` version `2024.11.0` is now excluded due to a regression in the `dask` library. +* The minimum required version of `dask` has been increased to `2024.8.1`. `dask` version `2024.11.0` is now excluded due to a regression in the `dask` library. (:pull:`1991`). v0.53.2 (2024-10-31) -------------------- From e9c69dd26f24cd920a140803a18181898f623073 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 11 Nov 2024 12:30:03 -0500 Subject: [PATCH 3/4] pin dask below 2024.11 --- CHANGELOG.rst | 2 +- environment.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 340f0a2f6..0f2da06ec 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,7 @@ Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Breaking changes ---------------- -* The minimum required version of `dask` has been increased to `2024.8.1`. `dask` version `2024.11.0` is now excluded due to a regression in the `dask` library. (:pull:`1991`). +* The minimum required version of `dask` has been increased to `2024.8.1`. `dask` versions at or above `2024.11` are not yet supported. (:issue:`1992`, :pull:`1991`). v0.53.2 (2024-10-31) -------------------- diff --git a/environment.yml b/environment.yml index bbf902e6b..7a5f08ad9 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - cf_xarray >=0.9.3 - cftime >=1.4.1 - click >=8.1 - - dask >=2024.8.1,!=2024.11.0 + - dask >=2024.8.1,<2024.11.0 - filelock >=3.14.0 - jsonpickle >=3.1.0 - numba >=0.54.1 diff --git a/pyproject.toml b/pyproject.toml index 8695ec5e5..5ab0d9c3e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ dependencies = [ "cf-xarray >=0.9.3", # cf-xarray is differently named on conda-forge "cftime >=1.4.1", "click >=8.1", - "dask[array] >=2024.8.1,!=2024.11.0", + "dask[array] >=2024.8.1,<2024.11.0", "filelock >=3.14.0", "jsonpickle >=3.1.0", "numba >=0.54.1", From 43c357c5e2037d9fa9eb5bbfbea906af80839761 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:50:49 +0000 Subject: [PATCH 4/4] Bump the actions group with 2 updates Bumps the actions group with 2 updates: [mamba-org/setup-micromamba](https://github.com/mamba-org/setup-micromamba) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `mamba-org/setup-micromamba` from 2.0.0 to 2.0.1 - [Release notes](https://github.com/mamba-org/setup-micromamba/releases) - [Commits](https://github.com/mamba-org/setup-micromamba/compare/617811f69075e3fd3ae68ca64220ad065877f246...ab6bf8bf7403e8023a094abeec19d6753bdc143e) Updates `pypa/gh-action-pypi-publish` from 1.11.0 to 1.12.2 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/fb13cb306901256ace3dab689990e13a5550ffaa...15c56dba361d8335944d31a2ecd17d700fc7bcbc) --- updated-dependencies: - dependency-name: mamba-org/setup-micromamba dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/publish-pypi.yml | 2 +- .github/workflows/tag-testpypi.yml | 2 +- .github/workflows/upstream.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc75fc2e0..5f3affc29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -269,7 +269,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup Conda (Micromamba) with Python${{ matrix.python-version }} - uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 # v2.0.0 + uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e # v2.0.1 with: cache-downloads: true cache-environment: true diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index e257a4f20..655555ffa 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -41,4 +41,4 @@ jobs: run: | python -m flit build - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # v1.11.0 + uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2 diff --git a/.github/workflows/tag-testpypi.yml b/.github/workflows/tag-testpypi.yml index ed02073b3..45b238c6b 100644 --- a/.github/workflows/tag-testpypi.yml +++ b/.github/workflows/tag-testpypi.yml @@ -41,7 +41,7 @@ jobs: run: | python -m flit build - name: Publish distribution 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # v1.11.0 + uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2 with: repository-url: https://test.pypi.org/legacy/ skip-existing: true diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml index 63f241feb..175c7be54 100644 --- a/.github/workflows/upstream.yml +++ b/.github/workflows/upstream.yml @@ -58,7 +58,7 @@ jobs: with: fetch-depth: 0 # Fetch all history for all branches and tags. - name: Setup Conda (Micromamba) with Python${{ matrix.python-version }} - uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 # v2.0.0 + uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e # v2.0.1 with: cache-downloads: true cache-environment: true