merge

.github/workflows/main.yml

@@ -75,6 +75,8 @@ jobs:
         run: tox -e ${{ matrix.tox-env }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: run-{{ matrix.tox-env }}
+          COVERALLS_SERVICE_NAME: github
 
   test-pypi:
     needs: lint

CHANGES.rst

@@ -23,6 +23,8 @@ Bug fixes
 * Calling a ``sdba.map_blocks``-wrapped function with data chunked along the reduced dimensions will raise an error. This forbids chunking the trained dataset along the distribution dimensions, for example. (:issue:`1481`, :pull:`1482`).
 * Optimization of indicators ``huglin_index`` and ``biologically_effective_degree_days`` when used with dask and flox. As a side effect, the indice functions (i.e. under ``xc.indices``) no longer mask incomplete periods. The indicators' output is unchanged under the default "check_missing" setting (:issue:`1494`, :pull:`1495`).
 * Fixed ``xclim.indices.run_length.lazy_indexing`` which would sometimes trigger the loading of auxiliary coordinates. (:issue:`1483`, :pull:`1484`).
+* Indicators ``snd_season_length`` and ``snw_season_length`` will return 0 instead of NaN if all inputs have a (non-NaN) zero snow depth (or water-equivalent thickness). (:pull:`1492`, :issue:`1491`)
+* Fixed a bug in the `pytest` configuration that could prevent testing data caching from occurring in systems where the platform-dependent cache directory is not found in the user's home. (:issue:`1468`, :pull:`1473`).
 
 Breaking changes
 ^^^^^^^^^^^^^^^^

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.45.11-beta
+current_version = 0.45.13-beta
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?

tests/conftest.py

@@ -450,7 +450,7 @@ def gather_session_data(threadsafe_data_dir, worker_id, xdoctest_namespace):
         if worker_id in "master":
             helpers.populate_testing_data(branch=helpers.TESTDATA_BRANCH)
         else:
-            _default_cache_dir.mkdir(exist_ok=True)
+            _default_cache_dir.mkdir(exist_ok=True, parents=True)
             test_data_being_written = FileLock(_default_cache_dir.joinpath(".lock"))
             with test_data_being_written as fl:
                 # This flag prevents multiple calls from re-attempting to download testing data in the same pytest run

tests/test_indices.py

@@ -2682,20 +2682,21 @@ def test_nan_slices(self, snd_series, snw_series):
 
 
 class TestSnowCover:
-    def test_snow_season_length(self, snd_series, snw_series):
-        a = np.ones(366) / 100.0
-        a[10:20] = 0.3
+    @pytest.mark.parametrize("length", [0, 10])
+    def test_snow_season_length(self, snd_series, snw_series, length):
+        a = np.zeros(366)
+        a[10 : 10 + length] = 0.3
         snd = snd_series(a)
         # kg m-2 = 1000 kg m-3 * 1 m
         snw = snw_series(1000 * a)
 
         out = xci.snd_season_length(snd)
         assert len(out) == 2
-        assert out[0] == 10
+        assert out[0] == length
 
         out = xci.snw_season_length(snw)
         assert len(out) == 2
-        assert out[0] == 10
+        assert out[0] == length
 
     def test_continous_snow_season_start(self, snd_series, snw_series):
         a = np.arange(366) / 100.0

tests/test_snow.py

@@ -25,11 +25,14 @@ def test_simple(self, snd_series):
 
 
 class TestSnowWaterCoverDuration:
-    def test_simple(self, snw_series):
-        snw = snw_series(np.ones(110) * 1000, start="2001-01-01")
+    @pytest.mark.parametrize(
+        "factor,exp", ([1000, [31, 28, 31, np.NaN]], [0, [0, 0, 0, np.NaN]])
+    )
+    def test_simple(self, snw_series, factor, exp):
+        snw = snw_series(np.ones(110) * factor, start="2001-01-01")
         out = land.snw_season_length(snw, freq="M")
         assert out.units == "days"
-        np.testing.assert_array_equal(out, [31, 28, 31, np.nan])
+        np.testing.assert_array_equal(out, exp)
 
 
 class TestContinuousSnowDepthCoverStartEnd:

xclim/__init__.py

@@ -11,7 +11,7 @@
 
 __author__ = """Travis Logan"""
 __email__ = "[email protected]"
-__version__ = "0.45.11-beta"
+__version__ = "0.45.13-beta"
 
 
 # Load official locales

xclim/indices/_threshold.py

@@ -2069,7 +2069,7 @@ def snd_season_length(
     xarray.DataArray, [time]
         Number of days where snow depth is greater than or equal to threshold.
     """
-    valid = at_least_n_valid(snd.where(snd > 0), n=1, freq=freq)
+    valid = at_least_n_valid(snd, n=1, freq=freq)
     thresh = convert_units_to(thresh, snd)
     out = threshold_count(snd, op, thresh, freq)
     return to_agg_units(out, snd, "count").where(~valid)
@@ -2106,7 +2106,7 @@ def snw_season_length(
     xarray.DataArray, [time]
         Number of days where snow water is greater than or equal to threshold.
     """
-    valid = at_least_n_valid(snw.where(snw > 0), n=1, freq=freq)
+    valid = at_least_n_valid(snw, n=1, freq=freq)
     thresh = convert_units_to(thresh, snw)
     out = threshold_count(snw, op, thresh, freq)
     return to_agg_units(out, snw, "count").where(~valid)

xclim/indices/helpers.py

@@ -296,7 +296,7 @@ def cosine_of_solar_zenith_angle(
         _wrap_radians(h_e),
         stat == "average",
         input_core_dims=[[]] * 6,
-        dask="parallel",
+        dask="parallelized",
     )
 
 

xclim/testing/utils.py

@@ -232,7 +232,7 @@ def _get(
     if not local_file.is_file():
         # This will always leave this directory on disk.
         # We may want to add an option to remove it.
-        local_file.parent.mkdir(parents=True, exist_ok=True)
+        local_file.parent.mkdir(exist_ok=True, parents=True)
 
         url = "/".join((github_url, "raw", branch, fullname.as_posix()))
         logger.info(f"Fetching remote file: {fullname.as_posix()}")