Resolve "FutureWarning: xarray.merge will change" (#179)

Author: btschwertfeger

.github/workflows/_codecov.yaml

@@ -50,7 +50,7 @@ jobs:
         run: python -m pip install . -r requirements-dev.txt
 
       - name: Generate coverage report
-        run: pytest --retries 1 --cov --cov-report=xml
+        run: pytest --retries 1 -n auto --cov --cov-report=xml
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1

.github/workflows/_test.yaml

@@ -41,4 +41,4 @@ jobs:
         run: python -m pip install --user . -r requirements-dev.txt
 
       - name: Run unit tests
-        run: pytest -vv --retries 1 tests
+        run: pytest -vv --retries 1 -n auto tests

Makefile

@@ -10,7 +10,7 @@ UV := uv
 PYTHON := python
 PYTEST := $(UV) run pytest
 TESTS := tests
-PYTEST_OPTS := -vv --junit-xml=pytest.xml
+PYTEST_OPTS := -vv -x -n auto --junit-xml=pytest.xml
 PYTEST_COV_OPTS := $(PYTEST_OPTS) --cov=cmethods --cov-report=xml:coverage.xml --cov-report=term
 
 ## ======= M A K E F I L E - T A R G E T S =====================================

cmethods/core.py

@@ -246,7 +246,7 @@ def adjust(
             **kwargs,
         )
 
-        result = monthly_result if result is None else xr.merge([result, monthly_result])
+        result = monthly_result if result is None else xr.merge([result, monthly_result], compat="no_conflicts", join="outer")
 
     return _add_cmethods_metadata(result, method, **metadata_kwargs)
 

requirements-dev.txt

@@ -3,6 +3,7 @@ matplotlib
 pytest
 pytest-cov
 pytest-retry
+pytest-xdist
 scikit-learn
 scipy
 venv-kernel