From 82886e4ae98e227e8e697c0f159f3c3f0b2be0b4 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:52:03 -0400 Subject: [PATCH 1/3] pin pint below v0.24 --- environment.yml | 5 ++--- pyproject.toml | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/environment.yml b/environment.yml index e88940081..cd1ee94b1 100644 --- a/environment.yml +++ b/environment.yml @@ -5,18 +5,17 @@ channels: - defaults dependencies: - python >=3.9 - - astroid - boltons >=20.1 - bottleneck >=1.3.1 - cf_xarray >=0.6.1 - cftime >=1.4.1 - - Click >=8.1 + - click >=8.1 - dask >=2.6.0 - jsonpickle - numba - numpy >=1.20.0 - pandas >=2.2.0 - - pint >=0.9 + - pint >=0.10,<0.24 - poppler >=0.67 - pyarrow # Strongly encouraged for Pandas v2.2.0+ - pyyaml diff --git a/pyproject.toml b/pyproject.toml index 6ba54f844..efb8066bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,13 +36,13 @@ dependencies = [ # cf-xarray is differently named on conda-forge "cf-xarray>=0.6.1", "cftime>=1.4.1", - "Click>=8.1", + "click>=8.1", "dask[array]>=2.6", "jsonpickle", "numba", "numpy>=1.20.0", "pandas>=2.2", - "pint>=0.10", + "pint>=0.10,<0.24", "pyarrow", # Strongly encouraged for pandas v2.2.0+ "pyyaml", "scikit-learn>=0.21.3", @@ -88,7 +88,7 @@ dev = [ "tox-gh >=1.3.1", "vulture ==2.11", "xdoctest", - "yamllint==1.35.1", + "yamllint ==1.35.1", # Documentation and examples "distributed >=2.0", "furo >=2023.9.10", @@ -156,7 +156,7 @@ values = [ [tool.codespell] skip = 'xclim/data/*.json,docs/_build,docs/notebooks/xclim_training/*.ipynb,docs/references.bib,__pycache__,*.gz,*.nc,*.png,*.svg,*.whl' -ignore-words-list = "absolue,astroid,bloc,bui,callendar,degreee,environnement,hanel,inferrable,lond,nam,nd,ressources,sie,vas" +ignore-words-list = "absolue,bloc,bui,callendar,degreee,environnement,hanel,inferrable,lond,nam,nd,ressources,sie,vas" [tool.coverage.run] relative_files = true From cff641ebb98cde961b580699dc0716ae0bcec75a Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:54:11 -0400 Subject: [PATCH 2/3] update CHANGES.rst --- CHANGES.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 60120c214..d13c48519 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,6 +6,10 @@ v0.50.0 (unreleased) -------------------- Contributors to this version: Trevor James Smith (:user:`Zeitsperre`). +Breaking changes +^^^^^^^^^^^^^^^^ +* `pint` has been pinned below v0.24 until `xclim` can be updated to support the latest version. (:issue:`1771`, :pull:`1772`). + Internal changes ^^^^^^^^^^^^^^^^ * Synchronized tooling versions across ``pyproject.toml`` and ``tox.ini`` and pinned them to the latest stable releases in GitHub Workflows. (:pull:`1744`). From 1613f8f41f9dea8907f0c4fd342358903e839737 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 7 Jun 2024 17:02:49 -0400 Subject: [PATCH 3/3] update dependency-review.yml --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 385dcc84a..8306560ab 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -29,4 +29,4 @@ jobs: uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: 'Dependency Review' - uses: actions/dependency-review-action@0659a74c94536054bfa5aeb92241f70d680cc78e + uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3