Merge branch 'master' into dependabot/github_actions/actions/checkout-4.1.7

Author: btschwertfeger

.github/workflows/cicd.yaml

@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.2
+    rev: v0.4.9
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.0
     hooks:
       - id: flake8
         args: ["--select=E9,F63,F7,F82", "--show-source", "--statistics"]
@@ -20,13 +20,13 @@ repos:
   #         - --install-types
   #         - --non-interactive
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         additional_dependencies:
           - tomli
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       # all available hooks can be found here: https://github.com/pre-commit/pre-commit-hooks/blob/main/.pre-commit-hooks.yaml
       - id: check-yaml

CHANGELOG.md

@@ -1,14 +1,63 @@
 # Changelog
 
-## [Unreleased](https://github.com/btschwertfeger/python-cmethods/tree/HEAD)
+## [v2.2.5](https://github.com/btschwertfeger/python-cmethods/tree/v2.2.5) (2024-05-28)
 
-[Full Changelog](https://github.com/btschwertfeger/python-cmethods/compare/v2.2.1...HEAD)
+[Full Changelog](https://github.com/btschwertfeger/python-cmethods/compare/v2.2.4...v2.2.5)
 
 **Merged pull requests:**
 
+- Bump codecov/codecov-action from 4.4.0 to 4.4.1 [\#108](https://github.com/btschwertfeger/python-cmethods/pull/108) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Adjust the DQM formula [\#107](https://github.com/btschwertfeger/python-cmethods/pull/107) ([btschwertfeger](https://github.com/btschwertfeger))
+- Fix the --version flag [\#106](https://github.com/btschwertfeger/python-cmethods/pull/106) ([btschwertfeger](https://github.com/btschwertfeger))
+- Bump codecov/codecov-action from 4.3.1 to 4.4.0 [\#105](https://github.com/btschwertfeger/python-cmethods/pull/105) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump dependabot/fetch-metadata from 1.1.1 to 2.1.0 [\#104](https://github.com/btschwertfeger/python-cmethods/pull/104) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/checkout from 4.1.5 to 4.1.6 [\#103](https://github.com/btschwertfeger/python-cmethods/pull/103) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v2.2.4](https://github.com/btschwertfeger/python-cmethods/tree/v2.2.4) (2024-05-20)
+
+[Full Changelog](https://github.com/btschwertfeger/python-cmethods/compare/v2.2.3...v2.2.4)
+
+**Fixed bugs:**
+
+- QDM not working with longer simp length [\#101](https://github.com/btschwertfeger/python-cmethods/issues/101)
+
+**Merged pull requests:**
+
+- Resolve "QDM not working with longer simp length" [\#102](https://github.com/btschwertfeger/python-cmethods/pull/102) ([btschwertfeger](https://github.com/btschwertfeger))
+
+## [v2.2.3](https://github.com/btschwertfeger/python-cmethods/tree/v2.2.3) (2024-05-17)
+
+[Full Changelog](https://github.com/btschwertfeger/python-cmethods/compare/v2.2.2...v2.2.3)
+
+**Fixed bugs:**
+
+- A very small error [\#95](https://github.com/btschwertfeger/python-cmethods/issues/95)
+- The behavior for data sets with different temporal resolution are not uniform [\#99](https://github.com/btschwertfeger/python-cmethods/issues/99)
+
+**Merged pull requests:**
+
+- Bump actions/checkout from 4.1.4 to 4.1.5 [\#98](https://github.com/btschwertfeger/python-cmethods/pull/98) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump ossf/scorecard-action from 2.3.1 to 2.3.3 [\#97](https://github.com/btschwertfeger/python-cmethods/pull/97) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Resolve "The behavior for data sets with different temporal resolution are not uniform" [\#100](https://github.com/btschwertfeger/python-cmethods/pull/100) ([btschwertfeger](https://github.com/btschwertfeger))
+- Extend the documentation [\#96](https://github.com/btschwertfeger/python-cmethods/pull/96) ([btschwertfeger](https://github.com/btschwertfeger))
+
+## [v2.2.2](https://github.com/btschwertfeger/python-cmethods/tree/v2.2.2) (2024-05-07)
+
+[Full Changelog](https://github.com/btschwertfeger/python-cmethods/compare/v2.2.1...v2.2.2)
+
+**Implemented enhancements:**
+
+- Add python-cmethods to the conda registry [\#17](https://github.com/btschwertfeger/python-cmethods/issues/17)
+
+**Merged pull requests:**
+
+- Bump codecov/codecov-action from 4.3.0 to 4.3.1 [\#93](https://github.com/btschwertfeger/python-cmethods/pull/93) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/upload-artifact from 4.3.2 to 4.3.3 [\#91](https://github.com/btschwertfeger/python-cmethods/pull/91) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump actions/checkout from 4.1.2 to 4.1.4 [\#90](https://github.com/btschwertfeger/python-cmethods/pull/90) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump actions/upload-artifact from 4.3.1 to 4.3.2 [\#89](https://github.com/btschwertfeger/python-cmethods/pull/89) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump codecov/codecov-action from 4.2.0 to 4.3.0 [\#87](https://github.com/btschwertfeger/python-cmethods/pull/87) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update the publishing process [\#94](https://github.com/btschwertfeger/python-cmethods/pull/94) ([btschwertfeger](https://github.com/btschwertfeger))
+- Fix CI - Failing due to missing hdf5 and netcdf headers [\#92](https://github.com/btschwertfeger/python-cmethods/pull/92) ([btschwertfeger](https://github.com/btschwertfeger))
 
 ## [v2.2.1](https://github.com/btschwertfeger/python-cmethods/tree/v2.2.1) (2024-04-10)
 

README.md

@@ -3,7 +3,7 @@
 <div align="center">
 
 [![GitHub](https://badgen.net/badge/icon/github?icon=github&label)](https://github.com/btschwertfeger/python-cmethods)
-[![Generic badge](https://img.shields.io/badge/python-3.8_|_3.9_|_3.10_|_3.11|_3.12-blue.svg)](https://shields.io/)
+[![Generic badge](https://img.shields.io/badge/python-3.9_|_3.10_|_3.11|_3.12-blue.svg)](https://shields.io/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-orange.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![PyPI Downloads](https://pepy.tech/badge/python-cmethods)](https://pepy.tech/project/python-cmethods)
 
@@ -141,8 +141,8 @@ https://python-cmethods.readthedocs.io/en/stable/
 
 ## 3. Installation
 
-> For optimal compatibility on macOS, ensure that 'hdf5' and 'netcdf' are
-> pre-installed using Homebrew (`brew install hdf5 netcdf`).
+> If the installation fails due to missing HDF5 headers, ensure that 'hdf5' and
+> 'netcdf' are pre-installed, e.g. on macOS using: `brew install hdf5 netcdf`.
 
 ```bash
 python3 -m pip install python-cmethods

doc/getting_started.rst

@@ -9,15 +9,15 @@ Getting Started
 Installation
 ------------
 
-(For optimal compatibility on macOS, ensure that 'hdf5' and 'netcdf' are
-pre-installed using Homebrew (``brew install hdf5 netcdf``).)
-
 The `python-cmethods`_ module can be installed using the package manager pip:
 
 .. code-block:: bash
 
     python3 -m pip install python-cmethods
 
+If the installation fails due to missing HDF5 headers, ensure that 'hdf5' and
+'netcdf' are pre-installed, e.g. on macOS using: ``brew install hdf5 netcdf``.
+
 The package is also available via conda-forge. See
 `python_cmethods-conda`_ for more information.
 

doc/links.rst

@@ -32,7 +32,7 @@
 .. |License badge| image:: https://img.shields.io/badge/License-GPLv3-orange.svg
    :target: https://www.gnu.org/licenses/gpl-3.0
 
-.. |PyVersions badge| image:: https://img.shields.io/badge/python-3.8_|_3.9_|_3.10_|_3.11|_3.12-blue.svg
+.. |PyVersions badge| image:: https://img.shields.io/badge/python-3.9_|_3.10_|_3.11|_3.12-blue.svg
    :target: https://github.com/btschwertfeger/python-cmethods
 
 .. |Downloads badge| image:: https://static.pepy.tech/personalized-badge/python-cmethods?period=total&units=abbreviation&left_color=grey&right_color=orange&left_text=downloads

pyproject.toml

@@ -14,7 +14,7 @@ maintainers = [
 description = "A collection of bias correction techniques written in Python - for climate sciences."
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
   "xarray>=2022.11.0",
   "netCDF4>=1.6.1",
@@ -39,7 +39,6 @@ keywords = [
 classifiers = [
   "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",

tests/test_misc.py

@@ -30,28 +30,40 @@ def test_not_implemented_errors(
 ) -> None:
     caplog.set_level(logging.INFO)
 
-    with pytest.raises(
-        NotImplementedError,
-        match=re.escape(r"kind='/' not available for linear_scaling."),
-    ), pytest.warns(UserWarning, match="Do not call linear_scaling"):
+    with (
+        pytest.raises(
+            NotImplementedError,
+            match=re.escape(r"kind='/' not available for linear_scaling."),
+        ),
+        pytest.warns(UserWarning, match="Do not call linear_scaling"),
+    ):
         linear_scaling(obs=[], simh=[], simp=[], kind="/")
 
-    with pytest.raises(
-        NotImplementedError,
-        match=re.escape(r"kind='/' not available for variance_scaling."),
-    ), pytest.warns(UserWarning, match="Do not call variance_scaling"):
+    with (
+        pytest.raises(
+            NotImplementedError,
+            match=re.escape(r"kind='/' not available for variance_scaling."),
+        ),
+        pytest.warns(UserWarning, match="Do not call variance_scaling"),
+    ):
         variance_scaling(obs=[], simh=[], simp=[], kind="/")
 
-    with pytest.raises(
-        NotImplementedError,
-        match=re.escape(r"kind='/' not available for delta_method. "),
-    ), pytest.warns(UserWarning, match="Do not call delta_method"):
+    with (
+        pytest.raises(
+            NotImplementedError,
+            match=re.escape(r"kind='/' not available for delta_method. "),
+        ),
+        pytest.warns(UserWarning, match="Do not call delta_method"),
+    ):
         delta_method(obs=[], simh=[], simp=[], kind="/")
 
-    with pytest.raises(
-        NotImplementedError,
-        match=re.escape(r"kind='/' for quantile_mapping is not available."),
-    ), pytest.warns(UserWarning, match="Do not call quantile_mapping"):
+    with (
+        pytest.raises(
+            NotImplementedError,
+            match=re.escape(r"kind='/' for quantile_mapping is not available."),
+        ),
+        pytest.warns(UserWarning, match="Do not call quantile_mapping"),
+    ):
         quantile_mapping(
             obs=np.array(datasets["+"]["obsh"][:, 0, 0]),
             simh=np.array(datasets["+"]["simh"][:, 0, 0]),
@@ -71,10 +83,13 @@ def test_not_implemented_errors(
             n_quantiles=100,
         )
 
-    with pytest.raises(
-        NotImplementedError,
-        match=re.escape(r"kind='/' not available for quantile_delta_mapping."),
-    ), pytest.warns(UserWarning, match="Do not call quantile_delta_mapping"):
+    with (
+        pytest.raises(
+            NotImplementedError,
+            match=re.escape(r"kind='/' not available for quantile_delta_mapping."),
+        ),
+        pytest.warns(UserWarning, match="Do not call quantile_delta_mapping"),
+    ):
         quantile_delta_mapping(
             obs=np.array(datasets["+"]["obsh"][:, 0, 0]),
             simh=np.array(datasets["+"]["simh"][:, 0, 0]),

tests/test_utils.py

@@ -85,7 +85,7 @@ def test_quantile_delta_mapping_all_nan() -> None:
 
 def test_nan_or_equal() -> None:
     assert nan_or_equal(0, 0)
-    assert nan_or_equal(np.NaN, np.NaN)
+    assert nan_or_equal(np.nan, np.nan)
     assert not nan_or_equal(0, 1)