Merge branch 'main' into prepare-v0530

CHANGELOG.rst

@@ -67,6 +67,8 @@ Internal changes
  * Adjusted `mypy` checks to be more standardized.
 * Renamed annual deprecated frequency alias `"A"` to `"Y"` (:pull:`1930`).
 * The ``indices`` documentation now includes the members of ``xclim.indices.stats``. (:issue:`1913`, :pull:`1958`).
+* The default URL for fetching testing data is now set to the ``raw.githubusercontent.com`` mirror of `xclim-testdata`. (:pull:`1961`).
+* The ``upstream`` `tox` environment has been updated to not install the latest `numpy` until `numba` supports it. (:pull:`1961`).
 
 CI changes
 ^^^^^^^^^^

CI/requirements_upstream.txt

@@ -1,5 +1,5 @@
 bottleneck @ git+https://github.com/pydata/bottleneck.git@master
 cftime @ git+https://github.com/Unidata/cftime.git@master
 flox @ git+https://github.com/xarray-contrib/flox.git@main
-numpy @ git+https://github.com/numpy/numpy.git@main
+# numpy @ git+https://github.com/numpy/numpy.git@main
 xarray @ git+https://github.com/pydata/xarray.git@main

pyproject.toml

@@ -135,7 +135,7 @@ target-version = [
 ]
 
 [tool.bumpversion]
-current_version = "0.52.3-dev.15"
+current_version = "0.52.3-dev.16"
 commit = true
 commit_args = "--no-verify"
 tag = false

tests/test_indices.py

@@ -499,6 +499,7 @@ class TestStandardizedIndices:
  # Repeated tests with lower tolerance means we want a more precise comparison, so we compare
  # the current version of XClim with the version where the test was implemented
  @pytest.mark.slow
+ @pytest.mark.filterwarnings("ignore:dt.weekofyear and dt.week have been deprecated")
  @pytest.mark.parametrize(
  "freq, window, dist, method, values, diff_tol",
  [
@@ -2227,6 +2228,7 @@ def test_static_freeze_thaw_cycles(self, tasmin_series, tasmax_series):
 
 
 class TestTemperatureSeasonality:
+
  def test_simple(self, tas_series):
  a = np.zeros(365)
  a = tas_series(a + K2C, start="1971-01-01")

xclim/__init__.py

@@ -13,7 +13,7 @@
 
 __author__ = """Travis Logan"""
 __email__ = "logan.travis@ouranos.ca"
-__version__ = "0.52.3-dev.15"
+__version__ = "0.52.3-dev.16"
 
 
 with _resources.as_file(_resources.files("xclim.data")) as _module_data:

xclim/testing/utils.py

@@ -74,7 +74,9 @@
 default_testdata_version = "v2024.8.23"
 """Default version of the testing data to use when fetching datasets."""
 
-default_testdata_repo_url = "https://github.com/Ouranosinc/xclim-testdata"
+default_testdata_repo_url = (
+ "https://raw.githubusercontent.com/Ouranosinc/xclim-testdata/"
+)
 """Default URL of the testing data repository to use when fetching datasets."""
 
 try:
@@ -433,7 +435,7 @@ def load_registry(
  dict
  Dictionary of filenames and hashes.
  """
- remote_registry = audit_url(f"{repo}/raw/{branch}/data/registry.txt")
+ remote_registry = audit_url(f"{repo}/{branch}/data/registry.txt")
 
  if branch != default_testdata_version:
  custom_registry_folder = Path(
@@ -510,7 +512,7 @@ def nimbus( # noqa: PR01
  "You can install it with `pip install pooch` or `pip install xclim[dev]`."
  )
 
- remote = audit_url(f"{repo}/raw/{branch}/data")
+ remote = audit_url(f"{repo}/{branch}/data")
  return pooch.create(
  path=cache_dir,
  base_url=remote,